xemacs-beta: src/ntproc.c comparison

comparison src/ntproc.c @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1

author	cvs
date	Mon, 13 Aug 2007 11:03:08 +0200
parents	a4f53d9b3154
children	6240c7796c7a

comparison

equal deleted inserted replaced

-:bd866891f083
+:cc15677e0335
 #include "nt.h"
 #include "ntheap.h" /* From 19.34.6 */
 #include "systime.h"
 #include "syssignal.h"
 #include "syswait.h"
-#include "buffer.h"
 #include "process.h"
 /*#include "w32term.h"*/ /* From 19.34.6: sync in ? --marcpa */
 /* #### I'm not going to play with shit. */
 #pragma warning (disable:4013 4024 4090)
 /* Control whether spawnve quotes arguments as necessary to ensure
 correct parsing by child process.  Because not all uses of spawnve
-are careful about constructing argv arrays, we make this behavior
+are careful about constructing argv arrays, we make this behaviour
 conditional (off by default). */
 Lisp_Object Vwin32_quote_process_args;
 /* Control whether create_child causes the process' window to be
 hidden.  The default is nil. */
 Initialize:
 xzero (*cp);
 cp->fd = -1;
 cp->pid = -1;
-if (cp->procinfo.hProcess)
-CloseHandle(cp->procinfo.hProcess);
 cp->procinfo.hProcess = NULL;
 cp->status = STATUS_READ_ERROR;
 /* use manual reset event so that select() will function properly */
 cp->char_avail = CreateEvent (NULL, TRUE, FALSE, NULL);
 child_process *cp;
 /* Our identity */
 cp = (child_process *)arg;
-/* <matts@tibco.com> - I think the test below is wrong - we don't
+/* We have to wait for the go-ahead before we can start */
-want to wait for someone to signal char_consumed, as we haven't
-read anything for them to consume yet! */
-/*
 if (cp == NULL ||
 WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0)
-*/
+return 1;
-if (cp == NULL)
-{
-return 1;
-}
 for (;;)
 {
 int rc;
 		     GetLastError (), cp->fd));
 	  return 1;
 	}
 if (rc == STATUS_READ_ERROR)
-{
+	return 1;
-/* We are finished, so clean up handles and set to NULL so
-that CHILD_ACTIVE will see what is going on */
-if (cp->char_avail) {
-CloseHandle (cp->char_avail);
-cp->char_avail = NULL;
-}
-if (cp->thrd) {
-CloseHandle (cp->thrd);
-cp->thrd = NULL;
-}
-if (cp->char_consumed) {
-CloseHandle(cp->char_consumed);
-cp->char_consumed = NULL;
-}
-if (cp->procinfo.hProcess)
-{
-CloseHandle (cp->procinfo.hProcess);
-cp->procinfo.hProcess=NULL;
-}
-return 1;
-}
 /* If the read died, the child has died so let the thread die */
 if (rc == STATUS_READ_FAILED)
 	break;
 	  DebPrint (("reader_thread.WaitForSingleObject failed with "
 		     "%lu for fd %ld\n", GetLastError (), cp->fd));
 	  break;
 }
 }
-/* We are finished, so clean up handles and set to NULL so that
-CHILD_ACTIVE will see what is going on */
-if (cp->char_avail) {
-CloseHandle (cp->char_avail);
-cp->char_avail = NULL;
-}
-if (cp->thrd) {
-CloseHandle (cp->thrd);
-cp->thrd = NULL;
-}
-if (cp->char_consumed) {
-CloseHandle(cp->char_consumed);
-cp->char_consumed = NULL;
-}
-if (cp->procinfo.hProcess)
-{
-CloseHandle (cp->procinfo.hProcess);
-cp->procinfo.hProcess=NULL;
-}
 return 0;
 }
 /* To avoid Emacs changing directory, we just record here the directory
 the new process should start in.  This is set just before calling
 		      &start, &cp->procinfo))
 goto EH_Fail;
 cp->pid = (int) cp->procinfo.dwProcessId;
-CloseHandle (cp->procinfo.hThread);
+/* Hack for Windows 95, which assigns large (ie negative) pids */
-CloseHandle (cp->procinfo.hProcess);
+if (cp->pid < 0)
-cp->procinfo.hThread=NULL;
+cp->pid = -cp->pid;
-cp->procinfo.hProcess=NULL;
 /* pid must fit in a Lisp_Int */
+#ifdef USE_UNION_TYPE
+cp->pid = (cp->pid & ((1U << VALBITS) - 1));
+#else
+cp->pid = (cp->pid & VALMASK);
+#endif
 *pPid = cp->pid;
 return TRUE;
 	{
 	  UNGCPRO;
 	  errno = EINVAL;
 	  return -1;
 	}
-GET_C_STRING_FILENAME_DATA_ALLOCA (full, cmdname);
+cmdname = XSTRING_DATA (full);
-}
+/* #### KLUDGE */
-else
+*(char**)(argv[0]) = cmdname;
-{
-(char*)cmdname = alloca (strlen (argv[0]) + 1);
-strcpy ((char*)cmdname, argv[0]);
 }
 UNGCPRO;
 /* make sure argv[0] and cmdname are both in DOS format */
+strcpy (cmdname = alloca (strlen (cmdname) + 1), argv[0]);
 unixtodos_filename (cmdname);
 /* #### KLUDGE */
-((CONST char**)argv)[0] = cmdname;
+*(char**)(argv[0]) = cmdname;
 /* Determine whether program is a 16-bit DOS executable, or a Win32
 executable that is implicitly linked to the Cygnus dll (implying it
 was compiled with the Cygnus GNU toolchain and hence relies on
 cygwin.dll to parse the command line - we use this to decide how to
 	  last = p + strlen (p) - 1;
 	  *parg++ = '"';
 #if 0
 	  /* This version does not escape quotes if they occur at the
 	     beginning or end of the arg - this could lead to incorrect
-	     behavior when the arg itself represents a command line
+	     behaviour when the arg itself represents a command line
 	     containing quoted args.  I believe this was originally done
 	     as a hack to make some things work, before
 	     `win32-quote-process-args' was added.  */
 	  while (*p)
 	    {
 void
 syms_of_ntproc ()
 {
+Qhigh = intern ("high");
+Qlow = intern ("low");
 DEFSUBR (Fwin32_short_file_name);
 DEFSUBR (Fwin32_long_file_name);
 DEFSUBR (Fwin32_set_process_priority);
 DEFSUBR (Fwin32_get_locale_info);
 DEFSUBR (Fwin32_get_current_locale_id);
 DEFSUBR (Fwin32_get_default_locale_id);
 DEFSUBR (Fwin32_get_valid_locale_ids);
 DEFSUBR (Fwin32_set_current_locale);
-}
-void
-vars_of_ntproc (void)
-{
-Qhigh = intern ("high");
-Qlow = intern ("low");
 DEFVAR_LISP ("win32-quote-process-args", &Vwin32_quote_process_args /*
 Non-nil enables quoting of process arguments to ensure correct parsing.
 Because Windows does not directly pass argv arrays to child processes,
 programs have to reconstruct the argv array by parsing the command
 allowing only only DOS subprocess to run at a time (whether started directly
 or indirectly by Emacs), and preventing Emacs from cleanly terminating the
 subprocess group, but may allow Emacs to interrupt a subprocess that doesn't
 otherwise respond to interrupts from Emacs.
 */ );
-Vwin32_start_process_share_console = Qt;
+Vwin32_start_process_share_console = Qnil;
 DEFVAR_LISP ("win32-pipe-read-delay", &Vwin32_pipe_read_delay /*
 Forced delay before reading subprocess output.
 This is done to improve the buffering of subprocess output, by
 avoiding the inefficiency of frequently reading small amounts of data.
 the truename of a file can be slow.
 */ );
 Vwin32_generate_fake_inodes = Qnil;
 #endif
 }
 /* end of ntproc.c */

Mercurial > hg > xemacs-beta

comparison src/ntproc.c @ 371:cc15677e0335 r21-2b1