xemacs-beta: src/sysdep.c comparison

comparison src/sysdep.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	84b14dcb0985
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 #include <config.h>
 #ifdef WINDOWSNT
 #include <direct.h>
-#ifndef __MINGW32__
+#ifdef __MINGW32__
+#include <mingw32/process.h>
+#else
 /* <process.h> should not conflict with "process.h", as per ANSI definition.
-This is not true though with visual c though. The trick below works with
+This is not true with visual c though. The trick below works with
-VC4.2b and with VC5.0. It assumes that VC is installed in a kind of
+VC4.2b, 5.0 and 6.0. It assumes that VC is installed in a kind of
-standard way, so include files get to what/ever/path/include.
+standard way, so include path ends with /include.
 Unfortunately, this must go before lisp.h, since process.h defines abort()
 which will conflict with the macro defined in lisp.h
 */
 #include <../include/process.h>
-#else
+#endif /* __MINGW32__ */
-#include <mingw32/process.h>
-#endif
 #endif /* WINDOWSNT */
 #include "lisp.h"
 #include <stdlib.h>
 #include <sys/times.h>
 #endif
 #ifdef WINDOWSNT
 #include <sys/utime.h>
-#include <windows.h>
 #include "ntheap.h"
 #endif
 /* ------------------------------- */
 /*         TTY definitions         */
 	     nothing to do.  APA */
 	  warn_when_safe (Qprocess, Qwarning,
 			  "failure to obtain process exit value");
 	}
 }
 if (pHandle != NULL && !CloseHandle(pHandle))
 {
 warn_when_safe (Qprocess, Qwarning,
 		      "failure to close unknown process");
 }
 #elif defined (EMACS_BLOCK_SIGNAL) && !defined (BROKEN_WAIT_FOR_SIGNAL) && defined (SIGCHLD)
 s.main.c_cc[VSUSP] = _POSIX_VDISABLE;
 s.main.c_lflag &= ~ISIG;
 #endif /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
 s.main.c_cc[VEOL] = _POSIX_VDISABLE;
 #if defined (CBAUD)
-/* <mdiers> ### This is not portable. ###
+/* <mdiers> #### This is not portable. ###
 POSIX does not specify CBAUD, and 4.4BSD does not have it.
 Instead, POSIX suggests to use cfset{i,o}speed().
 [cf. D. Lewine, POSIX Programmer's Guide, Chapter 8: Terminal
 I/O, O'Reilly 1991] */
 s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
 we have an unlocked terminal at the start. */
 #ifdef TCXONC
 if (!TTY_FLAGS (con).flow_control) ioctl (input_fd, TCXONC, 1);
 #endif
-#ifndef APOLLO
 #ifdef TIOCSTART
 if (!TTY_FLAGS (con).flow_control) ioctl (input_fd, TIOCSTART, 0);
-#endif
 #endif
 #if defined (HAVE_TERMIOS) || defined (HPUX9)
 #ifdef TCOON
 if (!TTY_FLAGS (con).flow_control) tcflow (input_fd, TCOON);
 /************************************************************************/
 /*                    limits of text/data segments                      */
 /************************************************************************/
-#ifndef CANNOT_DUMP
+#if !defined(CANNOT_DUMP) && !defined(PDUMP)
 #define NEED_STARTS
 #endif
 #ifndef SYSTEM_MALLOC
 #ifndef NEED_STARTS
 *	doing an unexec.  After unexec the return value is undefined.
 *	See crt0.c for further explanation and _start.
 *
 */
+#if !defined(HAVE_TEXT_START) && !defined(PDUMP)
 #ifdef __cplusplus
 extern "C" int _start (void);
 #else
 extern int _start (void);
 #endif
-#ifndef HAVE_TEXT_START
 char *
 start_of_text (void)
 {
 #ifdef TEXT_START
 return ((char *) TEXT_START);
 #else /* not GOULD */
 return ((char *) _start);
 #endif /* GOULD */
 #endif /* TEXT_START */
 }
-#endif /* not HAVE_TEXT_START */
+#endif /* !defined(HAVE_TEXT_START) && !defined(PDUMP) */
 /*
 *	Return the address of the start of the data segment prior to
 *	doing an unexec.  After unexec the return value is undefined.
 *	See crt0.c for further information and definition of data_start.
 #endif /* ORDINARY_LINK */
 #endif /* DATA_START */
 }
 #endif /* NEED_STARTS (not CANNOT_DUMP or not SYSTEM_MALLOC) */
-#ifndef CANNOT_DUMP
+#if !defined(CANNOT_DUMP) && !defined(PDUMP)
 /* Some systems that cannot dump also cannot implement these.  */
 /*
 *	Return the address of the end of the text segment prior to
 *	doing an unexec.  After unexec the return value is undefined.
 extern int edata;
 return ((char *) &edata);
 #endif
 }
-#endif /* not CANNOT_DUMP */
+#endif /* !defined(CANNOT_DUMP) && !defined(PDUMP) */
 /************************************************************************/
 /*                          get the system name                         */
 /************************************************************************/
 void
 init_system_name (void)
 {
 #if defined (WINDOWSNT)
 char hostname [MAX_COMPUTERNAME_LENGTH + 1];
-size_t size = sizeof(hostname);
+size_t size = sizeof (hostname);
 GetComputerName (hostname, &size);
 Vsystem_name = build_string (hostname);
 #elif !defined (HAVE_GETHOSTNAME)
 struct utsname uts;
 uname (&uts);
 #  ifndef CANNOT_DUMP
 if (initialized)
 #  endif /* not CANNOT_DUMP */
 if (!strchr (hostname, '.'))
 {
+#  if !(defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO))
 	struct hostent *hp = NULL;
 	int count;
-#  ifdef TRY_AGAIN
+#   ifdef TRY_AGAIN
 	for (count = 0; count < 10; count++)
 	  {
 	    h_errno = 0;
-#  endif
+#   endif
 	    /* Some systems can't handle SIGALARM/SIGIO in gethostbyname(). */
 	    stop_interrupts ();
 	    hp = gethostbyname (hostname);
 	    start_interrupts ();
-#  ifdef TRY_AGAIN
+#   ifdef TRY_AGAIN
 	    if (! (hp == 0 && h_errno == TRY_AGAIN))
 	      break;
 	    Fsleep_for (make_int (1));
 	  }
-#  endif
+#   endif
 	if (hp)
 	  {
 	    CONST char *fqdn = (CONST char *) hp->h_name;
 	    if (!strchr (fqdn, '.'))
 		  fqdn = *alias;
 	      }
 	    hostname = (char *) alloca (strlen (fqdn) + 1);
 	    strcpy (hostname, fqdn);
 	  }
+#  else /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
+	struct addrinfo hints, *res;
+	xzero (hints);
+	hints.ai_flags = AI_CANONNAME;
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = 0;
+	if (!getaddrinfo (hostname, NULL, &hints, &res))
+	  {
+	    hostname = (char *) alloca (strlen (res->ai_canonname) + 1);
+	    strcpy (hostname, res->ai_canonname);
+	    freeaddrinfo (res);
+	  }
+#  endif  /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
 }
 # endif /* HAVE_SOCKETS */
 Vsystem_name = build_string (hostname);
 #endif /* HAVE_GETHOSTNAME  */
 {
 mswindows_set_errno (unsigned long win32_error)
 {
 int i;
 /* check the table for the OS error code */
-for (i = 0; i < sizeof(errtable)/sizeof(errtable[0]); ++i)
+for (i = 0; i < countof (errtable); ++i)
 {
 if (win32_error == errtable[i].oscode)
 	{
 	  errno = errtable[i].errnocode;
 	  return;
 /************************************************************************/
 /*                    Encapsulations of system calls                    */
 /************************************************************************/
 #define PATHNAME_CONVERT_OUT(path) \
-GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA ((CONST Bufbyte *) path, path)
+TO_EXTERNAL_FORMAT (C_STRING, (path), C_STRING_ALLOCA, (path), Qfile_name);
 /***************** low-level calls ****************/
 /*
 *	On USG systems the system calls are INTERRUPTIBLE by signals
 va_start (ap, oflag);
 mode = va_arg (ap, int);
 va_end (ap);
-PATHNAME_CONVERT_OUT (path);
+#ifdef WINDOWSNT
-#if defined (WINDOWSNT)
 /* Make all handles non-inheritable */
-return open (path, oflag | _O_NOINHERIT, mode);
+oflag |= _O_NOINHERIT;
-#elif defined (INTERRUPTIBLE_OPEN)
+#endif
+#ifdef INTERRUPTIBLE_OPEN
 {
 int rtnval;
 while ((rtnval = open (path, oflag, mode)) == -1
 	   && (errno == EINTR))
 DO_NOTHING;
 /* Must copy PATH, because it might be the data of a Lisp_String,
 which could be relocated by GC when checking for QUIT.  */
 memcpy (nonreloc, path, len + 1);
 PATHNAME_CONVERT_OUT (nonreloc);
+#ifdef WINDOWSNT
+/* Make all handles non-inheritable */
+oflag |= _O_NOINHERIT;
+#endif
 for (;;)
 {
 int rtnval = open (nonreloc, oflag, mode);
 if (!(rtnval == -1 && errno == EINTR))
 Dynarr_reset (internal_DIRENTRY);
 Dynarr_add_many (internal_DIRENTRY, (Bufbyte *) rtnval,
 offsetof (DIRENTRY, d_name));
-internal_name =
+TO_INTERNAL_FORMAT (DATA, (external_name, external_len),
-convert_from_external_format (external_name, external_len,
+			  ALLOCA, (internal_name, internal_len),
-&internal_len, FORMAT_FILENAME);
+			  Qfile_name);
 Dynarr_add_many (internal_DIRENTRY, internal_name, internal_len);
 Dynarr_add (internal_DIRENTRY, 0); /* zero-terminate */
 return (DIRENTRY *) Dynarr_atp (internal_DIRENTRY, 0);
 }

Mercurial > hg > xemacs-beta

comparison src/sysdep.c @ 440:8de8e3f6228a r21-2-28