xemacs-beta: src/sysdep.c comparison

comparison src/sysdep.c @ 410:de805c49cfc1 r21-2-35

Import from CVS: tag r21-2-35

author	cvs
date	Mon, 13 Aug 2007 11:19:21 +0200
parents	b8cc9ab3f761
children	697ef44129c6

comparison

equal deleted inserted replaced

-:301b9ebbdf3b
+:de805c49cfc1
 #define DONT_ENCAPSULATE
 #include <config.h>
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
-#include <direct.h>
+#ifdef MINGW
-#ifdef __MINGW32__
 #include <mingw32/process.h>
 #else
 /* <process.h> should not conflict with "process.h", as per ANSI definition.
 This is not true with visual c though. The trick below works with
 VC4.2b, 5.0 and 6.0. It assumes that VC is installed in a kind of
 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>
-#endif /* __MINGW32__ */
+#endif /* MINGW */
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 #include "lisp.h"
-#include <stdlib.h>
 /* ------------------------------- */
 /*          basic includes         */
 /* ------------------------------- */
 #endif
 #include "sysfile.h"
 #include "syswait.h"
 #include "sysdir.h"
 #include "systime.h"
-#if defined(WINDOWSNT) || defined(__CYGWIN32__)
+#if defined(WIN32_NATIVE) || defined(CYGWIN)
 #include "syssignal.h"
 #endif
-#ifndef WINDOWSNT
+#include "sysproc.h"
+#ifndef WIN32_NATIVE
 #include <sys/times.h>
 #endif
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 #include <sys/utime.h>
 #include "ntheap.h"
+#include "nt.h"
 #endif
 /* ------------------------------- */
 /*         TTY definitions         */
 /* ------------------------------- */
 #endif /* BSD */
 #endif /* NO_SUBPROCESSES */
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 void wait_for_termination (HANDLE pHandle)
 #else
 void wait_for_termination (int pid)
 #endif
 {
 - EINVAL (incorrect arguments),
 which are both program bugs.
 Since implementations may add their own error indicators on top,
 we ignore it by default.  */
-#elif defined (WINDOWSNT)
+#elif defined (WIN32_NATIVE)
 int ret = 0, status = 0;
 if (pHandle == NULL)
 {
 warn_when_safe (Qprocess, Qwarning, "Cannot wait for unknown process to terminate");
 return;
 	   sigpause()/sigsuspend(), then your OS doesn't implement
 	   this properly (this applies under hpux9, for example).
 	   Try defining BROKEN_WAIT_FOR_SIGNAL. */
 	EMACS_WAIT_FOR_SIGNAL (SIGCHLD);
 }
-#else /* not HAVE_WAITPID and not WINDOWSNT and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */
+#else /* not HAVE_WAITPID and not WIN32_NATIVE and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */
 /* This approach is kind of cheesy but is guaranteed(?!) to work
 for all systems. */
 while (1)
 {
 QUIT;
 and nonzero means something different.  */
 ioctl (channel, TIOCFLUSH, &zero);
 #endif
 }
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 /*  Set up the terminal at the other end of a pseudo-terminal that
 we will be controlling an inferior through.
 It should not echo or do line-editing, since that is done
 in Emacs.  No padding needed for insertion into an Emacs buffer.  */
 int zero = 0;
 ioctl (out, FIOASYNC, &zero);
 }
 #endif /* RTU */
 }
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 #endif /* not NO_SUBPROCESSES */
 #if !defined (SIGTSTP) && !defined (USG_JOBCTRL)
 signal (saved_handlers->code, saved_handlers->handler);
 saved_handlers++;
 }
 }
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 pid_t
 sys_getpid (void)
 {
 return abs (getpid ());
 }
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 /* Fork a subshell.  */
 static void
 sys_subshell (void)
 {
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 int pid;
 #endif
 struct save_signal saved_handlers[5];
 Lisp_Object dir;
 unsigned char *str = 0;
 if (!IS_ANY_SEP (str[len - 1]))
 str[len++] = DIRECTORY_SEP;
 str[len] = 0;
 xyzzy:
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 pid = fork ();
 if (pid == -1)
 error ("Can't spawn subshell");
 if (pid == 0)
-#endif /* not WINDOWSNT */
+#endif /* not WIN32_NATIVE */
 {
 char *sh = 0;
 if (sh == 0)
 	sh = (char *) egetenv ("SHELL");
 /* Use our buffer's default directory for the subshell.  */
 if (str)
 sys_chdir (str);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 /* Waits for process completion */
 if (_spawnlp (_P_WAIT, sh, sh, NULL) != 0)
 error ("Can't spawn subshell");
 else
 save_signal_handlers (saved_handlers);
 synch_process_alive = 1;
 wait_for_termination (pid);
 restore_signal_handlers (saved_handlers);
-#endif /* not WINDOWSNT */
+#endif /* not WIN32_NATIVE */
 }
 #endif /* !defined (SIGTSTP) && !defined (USG_JOBCTRL) */
 #ifdef HAVE_TTY
 assert (DEVICE_TTY_P (d));
 {
 int input_fd = CONSOLE_TTY_DATA (con)->infd;
-#if defined (WINDOWSNT)
+#if defined (WIN32_NATIVE)
 DEVICE_TTY_DATA (d)->ospeed = 15;
 #elif defined (HAVE_TERMIOS)
 struct termios sg;
 sg.c_cflag = B9600;
 /* ------------------------------------------------------ */
 /* It's wrong to encase these into #ifdef HAVE_TTY because we need
 them for child TTY processes.  */
 /* However, this does break NT support while we don't do child TTY processes */
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 /* Set *TC to the parameters associated with the terminal FD.
 Return zero if all's well, or -1 if we ran into an error we
 couldn't deal with.  */
 int
 #elif defined HAVE_TERMIO
 /* The SYSV-style interface?  */
 if (ioctl (fd, TCGETA, &settings->main) < 0)
 return -1;
-#elif !defined (WINDOWSNT)
+#elif !defined (WIN32_NATIVE)
 /* I give up - I hope you have the BSD ioctls.  */
 if (ioctl (fd, TIOCGETP, &settings->main) < 0)
 return -1;
 #endif /* HAVE_TCATTR */
 #elif defined HAVE_TERMIO
 /* The SYSV-style interface?  */
 if (ioctl (fd, flushp ? TCSETAF : TCSETAW, &settings->main) < 0)
 return -1;
-#elif !defined (WINDOWSNT)
+#elif !defined (WIN32_NATIVE)
 /* I give up - I hope you have the BSD ioctls.  */
 if (ioctl (fd, (flushp) ? TIOCSETP : TIOCSETN, &settings->main) < 0)
 return -1;
 #endif /* HAVE_TCATTR */
 /* We have survived the tempest.  */
 return 0;
 }
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 /* ------------------------------------------------------ */
 /*                 Initializing a device                  */
 /* ------------------------------------------------------ */
 or via TELNET or the like, but does no harm elsewhere.  */
 tty.main.c_iflag &= ~IGNBRK;
 tty.main.c_iflag &= ~BRKINT;
 #endif /* AIX */
 #else /* if not HAVE_TERMIO */
-#if !defined (WINDOWSNT)
+#if !defined (WIN32_NATIVE)
 con->tty_erase_char = make_char (tty.main.sg_erase);
 tty.main.sg_flags &= ~(ECHO | CRMOD | XTABS);
 if (TTY_FLAGS (con).meta_key)
 tty.main.sg_flags |= ANYP;
 /* #### should we be using RAW mode here? */
 tty.main.sg_flags |= /* interrupt_input ? RAW : */ CBREAK;
-#endif /* not WINDOWSNT */
+#endif /* not WIN32_NATIVE */
 #endif /* not HAVE_TERMIO */
 /* If going to use CBREAK mode, we must request C-g to interrupt
 and turn off start and stop chars, etc.  If not going to use
 CBREAK mode, do this anyway so as to turn off local flow
 *
 */
 #if !defined(HAVE_TEXT_START) && !defined(PDUMP)
-#ifdef __cplusplus
+EXTERN_C int _start (void);
-extern "C" int _start (void);
-#else
-extern int _start (void);
-#endif
 char *
 start_of_text (void)
 {
 #ifdef TEXT_START
-return ((char *) TEXT_START);
+return (char *) TEXT_START;
 #else
-#ifdef GOULD
+return (char *) _start;
-extern csrt ();
-return ((char *) csrt);
-#else /* not GOULD */
-return ((char *) _start);
-#endif /* GOULD */
 #endif /* TEXT_START */
 }
 #endif /* !defined(HAVE_TEXT_START) && !defined(PDUMP) */
 /*
 *	at the normal shared text boundary and the startofdata variable
 *	will be patched by unexec to the correct value.
 *
 */
-#if defined(ORDINARY_LINK) && !defined(__MINGW32__)
+#if defined(ORDINARY_LINK) && !defined(MINGW)
 extern char **environ;
 #endif
 void *
 start_of_data (void)
 /* init_system_name sets up the string for the Lisp function
 system-name to return. */
 extern Lisp_Object Vsystem_name;
-#ifdef HAVE_SOCKETS
-# include <sys/socket.h>
-# include <netdb.h>
-#endif /* HAVE_SOCKETS */
 void
 init_system_name (void)
 {
-#if defined (WINDOWSNT)
+#if defined (WIN32_NATIVE)
 char hostname [MAX_COMPUTERNAME_LENGTH + 1];
 size_t size = sizeof (hostname);
 GetComputerName (hostname, &size);
 Vsystem_name = build_string (hostname);
 #elif !defined (HAVE_GETHOSTNAME)
 return ((const char *) GETTEXT ("Unknown error"));
 }
 #endif /* ! HAVE_STRERROR */
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 struct errentry {
 unsigned long oscode;  /* Win32 error */
 int errnocode;         /* unix errno */
 };
 mswindows_set_last_errno (void)
 {
 mswindows_set_errno (GetLastError ());
 }
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 /************************************************************************/
 /*                    Encapsulations of system calls                    */
 /************************************************************************/
 mode = va_arg (ap, int);
 va_end (ap);
 PATHNAME_CONVERT_OUT (path);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 /* Make all handles non-inheritable */
 oflag |= _O_NOINHERIT;
 #endif
 #ifdef INTERRUPTIBLE_OPEN
 which could be relocated by GC when checking for QUIT.  */
 memcpy (nonreloc, path, len + 1);
 PATHNAME_CONVERT_OUT (nonreloc);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 /* Make all handles non-inheritable */
 oflag |= _O_NOINHERIT;
 #endif
 for (;;)
 #ifdef ENCAPSULATE_FOPEN
 FILE *
 sys_fopen (const char *path, const char *type)
 {
 PATHNAME_CONVERT_OUT (path);
-#if defined (WINDOWSNT)
+#if defined (WIN32_NATIVE)
 {
 int fd;
 int oflag;
 const char * type_save = type;
 #ifdef ENCAPSULATE_MKDIR
 int
 sys_mkdir (const char *path, mode_t mode)
 {
 PATHNAME_CONVERT_OUT (path);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 return mkdir (path);
 #else
 return mkdir (path, mode);
 #endif
 }
 /* #### currently we don't do conversions on the incoming data */
 return readlink (path, buf, bufsiz);
 }
 #endif /* ENCAPSULATE_READLINK */
 #ifdef ENCAPSULATE_FSTAT
 int
 sys_fstat (int fd, struct stat *buf)
 {
+#ifdef WIN32_NATIVE
+return mswindows_fstat (fd, buf);
+#else
 return fstat (fd, buf);
+#endif
 }
 #endif /* ENCAPSULATE_FSTAT */
 #ifdef ENCAPSULATE_STAT
 int
 sys_stat (const char *path, struct stat *buf)
 {
 PATHNAME_CONVERT_OUT (path);
+#ifdef WIN32_NATIVE
+return mswindows_stat (path, buf);
+#else
 return stat (path, buf);
+#endif
 }
 #endif /* ENCAPSULATE_STAT */
 /****************** file-manipulation calls *****************/
 #ifdef ENCAPSULATE_CHMOD
 int
 int
 sys_rename (const char *old, const char *new)
 {
 PATHNAME_CONVERT_OUT (old);
 PATHNAME_CONVERT_OUT (new);
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 /* Windows rename fails if NEW exists */
 if (rename (old, new) == 0)
 return 0;
 if (errno != EEXIST)
 return -1;
 unlink (new);
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 return rename (old, new);
 }
 #endif /* ENCAPSULATE_RENAME */
 for increased accuracy. */
 static int
 get_process_times_1 (long *user_ticks, long *system_ticks)
 {
-#if defined (_SC_CLK_TCK) || defined (CLK_TCK) && !defined(WINDOWSNT)
+#if defined (_SC_CLK_TCK) || defined (CLK_TCK) && !defined(WIN32_NATIVE)
 /* We have the POSIX times() function available. */
 struct tms tttt;
 times (&tttt);
 *user_ticks = (long) tttt.tms_utime;
 *system_ticks = (long) tttt.tms_stime;
 /*               Strings corresponding to defined signals               */
 /************************************************************************/
 #if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
-#if defined(WINDOWSNT) || defined(__CYGWIN32__)
+#if defined(WIN32_NATIVE) || defined(CYGWIN)
 const char *sys_siglist[] =
 {
 "bum signal!!",
 "hangup",
 "interrupt",

Mercurial > hg > xemacs-beta

comparison src/sysdep.c @ 410:de805c49cfc1 r21-2-35