xemacs-beta: src/sysdep.c comparison

comparison src/sysdep.c @ 290:c9fe270a4101 r21-0b43

Import from CVS: tag r21-0b43

author	cvs
date	Mon, 13 Aug 2007 10:36:47 +0200
parents	e11d67e05968
children	7c94d56991e1

comparison

equal deleted inserted replaced

-:6e6992ccc4b6
+:c9fe270a4101
 and nonzero means something different.  */
 ioctl (channel, TIOCFLUSH, &zero);
 #endif
 }
-#ifndef MSDOS
 #ifndef WINDOWSNT
 /*  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.  */
 ioctl (out, FIOASYNC, &zero);
 }
 #endif /* RTU */
 }
 #endif /* WINDOWSNT */
-#endif /* not MSDOS */
 #endif /* not NO_SUBPROCESSES */
 #if !defined (SIGTSTP) && !defined (USG_JOBCTRL)
 /* Fork a subshell.  */
 static void
 sys_subshell (void)
 {
-#ifdef MSDOS
-int st;
-char oldwd[MAXPATHLEN+1]; /* Fixed length is safe on MSDOS.  */
-#endif /* MSDOS */
 int pid;
 struct save_signal saved_handlers[5];
 Lisp_Object dir;
 unsigned char *str = 0;
 int len;
 #endif /* not WINDOWSNT */
 {
 char *sh = 0;
-#ifdef MSDOS    /* MW, Aug 1993 */
-getwd (oldwd);
-if (sh == 0)
-	sh = (char *) egetenv ("SUSPEND");	/* KFS, 1994-12-14 */
-#endif
 if (sh == 0)
 	sh = (char *) egetenv ("SHELL");
 if (sh == 0)
 	sh = "sh";
 #ifdef SET_EMACS_PRIORITY
 if (emacs_priority != 0)
 nice (-emacs_priority);   /* Give the new shell the default priority */
 #endif
-#ifdef MSDOS
-st = system (sh);
-sys_chdir (oldwd);
-#if 0	/* This is also reported if last command executed in subshell failed, KFS */
-if (st)
-	report_file_error ("Can't execute subshell",
-			   Fcons (build_string (sh), Qnil));
-#endif
-#else /* not MSDOS */
 #ifdef WINDOWSNT
 /* Waits for process completion */
 pid = _spawnlp (_P_WAIT, sh, sh, NULL);
 if (pid == -1)
 write (1, "Can't execute subshell", 22);
-#if 0
-/* This relates to the GNU Emacs console port, not required under X ? */
-take_console ();
-#endif
 #else   /* not WINDOWSNT */
 execlp (sh, sh, 0);
 write (1, "Can't execute subshell", 22);
 _exit (1);
 #endif /* not WINDOWSNT */
-#endif /* not MSDOS */
 }
 save_signal_handlers (saved_handlers);
 synch_process_alive = 1;
-#ifndef MSDOS
 wait_for_termination (pid);
-#endif
 restore_signal_handlers (saved_handlers);
 }
 #endif /* !defined (SIGTSTP) && !defined (USG_JOBCTRL) */
 /* Suspend the Emacs process; give terminal to its superior.  */
 void
 sys_suspend (void)
 {
-#if defined (SIGTSTP) && !defined (MSDOS)
+#if defined (SIGTSTP)
 {
 int pgrp = EMACS_GET_PROCESS_GROUP ();
 EMACS_KILLPG (pgrp, SIGTSTP);
 }
 {
 /* I don't doubt that it is possible to suspend processes on
 * VMS machines or thost that use USG_JOBCTRL,
 * but I don't know how to do it, so...
 */
-#if defined (SIGTSTP) && !defined (MSDOS)
+#if defined (SIGTSTP)
 kill(process, SIGTSTP);
 #endif
 }
 #ifdef HAVE_TTY
 assert (DEVICE_TTY_P (d));
 {
 int input_fd = CONSOLE_TTY_DATA (con)->infd;
-#if defined (MSDOS) || defined(WIN32)
+#if defined (WINDOWSNT)
 DEVICE_TTY_DATA (d)->ospeed = 15;
 #elif defined (HAVE_TERMIOS)
 struct termios sg;
 sg.c_cflag = B9600;
 #elif defined HAVE_TERMIO
 /* The SYSV-style interface?  */
 if (ioctl (fd, TCGETA, &settings->main) < 0)
 return -1;
-#elif !defined MSDOS && !defined(WIN32)
+#elif !defined (WINDOWSNT)
 /* 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(MSDOS) && !defined(WIN32)
+#elif !defined (WINDOWSNT)
 /* I give up - I hope you have the BSD ioctls.  */
 if (ioctl (fd, (flushp) ? TIOCSETP : TIOCSETN, &settings->main) < 0)
 return -1;
 #endif /* HAVE_TCATTR */
 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(MSDOS) && !defined(WIN32)
+#if !defined (WINDOWSNT)
 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 MSDOS or WIN32 */
+#endif /* not WINDOWSNT */
 #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
 #endif /* not HAVE_TERMIO */
 #ifdef HAVE_LTCHARS
 tty.ltchars = new_ltchars;
 #endif /* HAVE_LTCHARS */
-#ifdef MSDOS
-internal_terminal_init ();
-dos_ttraw ();
-#endif
 EMACS_SET_TTY (input_fd, &tty, 0);
 /* This code added to insure that, if flow-control is not to be used,
 we have an unlocked terminal at the start. */
 {
 	*widthp = size.ts_cols;
 	*heightp = size.ts_lines;
 }
 }
-#elif defined MSDOS
-*widthp = FrameCols ();
-*heightp = FrameRows ();
 #else /* system doesn't know size */
 *widthp = 0;
 *heightp = 0;
 #endif
 while (EMACS_SET_TTY (input_fd, &CONSOLE_TTY_DATA (con)->old_tty, 0)
 	 < 0 && errno == EINTR)
 ;
-#ifdef MSDOS
-dos_ttcooked ();
-#endif
 #ifdef SET_LINE_DISCIPLINE
 /* Ultrix's termios *ignores* any line discipline except TERMIODISC.
 A different old line discipline is therefore not restored, yet.
 Restore the old line discipline by hand.  */
 /************************************************************************/
 #define PATHNAME_CONVERT_OUT(path) \
 GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA ((CONST Bufbyte *) path, path)
-/***** MSDOS versions are in msdos.c *****/
 /***************** low-level calls ****************/
 /*
 *	On USG systems the system calls are INTERRUPTIBLE by signals
 *	that the user program has elected to catch.  Thus the system call
 va_start (ap, oflag);
 mode = va_arg (ap, int);
 va_end (ap);
 PATHNAME_CONVERT_OUT (path);
-#ifdef INTERRUPTIBLE_OPEN
+#if defined (WINDOWSNT)
+/* Make all handles non-inheritable */
+return open (path, oflag | _O_NOINHERIT, mode);
+#elif defined (INTERRUPTIBLE_OPEN)
 {
 int rtnval;
 while ((rtnval = open (path, oflag, mode)) == -1
 	   && (errno == EINTR));
 return rtnval;
 }
 #else
 return open (path, oflag, mode);
 #endif
 }
 #endif /* ENCAPSULATE_OPEN */
 /* Like sys_open, only when open() is interrupted by EINTR, check for
 #ifdef ENCAPSULATE_FOPEN
 FILE *
 sys_fopen (CONST char *path, CONST char *type)
 {
 PATHNAME_CONVERT_OUT (path);
-#ifdef INTERRUPTIBLE_OPEN
+#if defined (WINDOWSNT)
+{
+int fd;
+int oflag;
+const char * type_save = type;
+/* Force all file handles to be non-inheritable.  This is necessary to
+ensure child processes don't unwittingly inherit handles that might
+prevent future file access. */
+if (type[0] == 'r')
+oflag = O_RDONLY;
+else if (type[0] == 'w' || type[0] == 'a')
+oflag = O_WRONLY | O_CREAT | O_TRUNC;
+else
+return 0;
+/* Only do simplistic option parsing. */
+while (*++type)
+if (type[0] == '+')
+	{
+	  oflag &= ~(O_RDONLY | O_WRONLY);
+	  oflag |= O_RDWR;
+	}
+else if (type[0] == 'b')
+	{
+	  oflag &= ~O_TEXT;
+	  oflag |= O_BINARY;
+	}
+else if (type[0] == 't')
+	{
+	  oflag &= ~O_BINARY;
+	  oflag |= O_TEXT;
+	}
+else break;
+fd = open (path, oflag | _O_NOINHERIT, 0644);
+if (fd < 0)
+return NULL;
+return _fdopen (fd, type_save);
+}
+#elif defined (INTERRUPTIBLE_OPEN)
 {
 FILE *rtnval;
 while (!(rtnval = fopen (path, type)) && (errno == EINTR));
 return rtnval;
 }
 #ifdef ENCAPSULATE_CHDIR
 int
 sys_chdir (CONST char *path)
 {
 PATHNAME_CONVERT_OUT (path);
-#ifdef MSDOS
-return dos_chdir (path);
-#else
 return chdir (path);
-#endif
 }
 #endif /* ENCAPSULATE_CHDIR */
 #ifdef ENCAPSULATE_MKDIR
 int
 sys_mkdir (CONST char *path, mode_t mode)
 {
 PATHNAME_CONVERT_OUT (path);
+#ifdef WINDOWSNT
+return mkdir (path);
+#else
 return mkdir (path, mode);
+#endif
 }
 #endif /* ENCAPSULATE_MKDIR */
 #ifdef ENCAPSULATE_OPENDIR
 int
 sys_rename (CONST char *old, CONST char *new)
 {
 PATHNAME_CONVERT_OUT (old);
 PATHNAME_CONVERT_OUT (new);
+#ifdef WINDOWSNT
+/* Windows rename fails if NEW exists */
+if (rename (old, new) == 0)
+return 0;
+if (errno != EEXIST)
+return -1;
+unlink (new);
+#endif /* WINDOWSNT */
 return rename (old, new);
 }
 #endif /* ENCAPSULATE_RENAME */
 *system_time = (((double) (curr_system_ticks - orig_system_ticks))
 		      / ticks_per_second);
 }
 else
 {
-/* MS-DOS or equally lame OS */
+/* A lame OS */
 *user_time = *real_time;
 *system_time = 0;
 }
 }

Mercurial > hg > xemacs-beta

comparison src/sysdep.c @ 290:c9fe270a4101 r21-0b43