xemacs-beta: src/process.c comparison

comparison src/process.c @ 48:56c54cf7c5b6 r19-16b90

Import from CVS: tag r19-16b90

author	cvs
date	Mon, 13 Aug 2007 08:56:04 +0200
parents	8d2a9b52c682
children	131b0175ea99

comparison

equal deleted inserted replaced

-:11c6df210d7f
+:56c54cf7c5b6
 close_descriptor_pair (forkin, forkout);
 report_file_error ("Doing vfork", Qnil);
 }
 p->pid = make_int (pid);
+/* #### dmoore - why is this commented out, otherwise we leave
+subtty = forkin, but then we close forkin just below. */
 /* p->subtty = -1; */
 #ifdef WINDOWSNT
 register_child (pid, inchannel);
 #endif /* WINDOWSNT */
 INCODE and OUTCODE specify the coding-system objects used in input/output
 from/to the process.
 */
 (int nargs, Lisp_Object *args))
 {
+/* This function can call lisp */
 /* !!#### This function has not been Mule-ized */
-/* This function can GC */
 Lisp_Object buffer, name, program, proc, current_dir;
 Lisp_Object tem;
 int speccount = specpdl_depth ();
+struct gcpro gcpro1, gcpro2, gcpro3;
 #ifdef VMS
 char *new_argv;
 int len;
 #else
 char **new_argv;
 #endif
 int i;
+name = args[0];
 buffer = args[1];
+program = args[2];
+current_dir = Qnil;
+/* Protect against various file handlers doing GCs below. */
+GCPRO3 (buffer, program, current_dir);
 if (!NILP (buffer))
 buffer = Fget_buffer_create (buffer);
-CHECK_STRING (args[0]);    /* name */
+CHECK_STRING (name);
-CHECK_STRING (args[2]);    /* program */
+CHECK_STRING (program);
 /* Make sure that the child will be able to chdir to the current
 buffer's current directory, or its unhandled equivalent.  We
 can't just have the child check for an error when it does the
 chdir, since it's in a vfork.
-We have to GCPRO around this because Fexpand_file_name and
+Note: these assignments and calls are like this in order to insure
-Funhandled_file_name_directory might call a file name handling
+"caller protects args" GC semantics. */
-function.  The argument list is protected by the caller, so all
+current_dir = current_buffer->directory;
-we really have to worry about is buffer.  */
+current_dir = Funhandled_file_name_directory (current_dir);
-{
+current_dir = expand_and_dir_to_file (current_dir, Qnil);
-struct gcpro gcpro1, gcpro2; /* Caller gc-protects args[] */
-current_dir = current_buffer->directory;
-GCPRO2 (buffer, current_dir);
-current_dir =
-expand_and_dir_to_file (Funhandled_file_name_directory (current_dir),
-			      Qnil);
 #if 0	/* This loser breaks ange-ftp */
-if (NILP (Ffile_accessible_directory_p (current_dir)))
+/* dmoore - if you re-enable this code, you have to gcprotect
-report_file_error ("Setting current directory",
+current_buffer through the above calls. */
-			 list1 (current_buffer->directory));
+if (NILP (Ffile_accessible_directory_p (current_dir)))
+report_file_error ("Setting current directory",
+		       list1 (current_buffer->directory));
 #endif /* 0 */
-UNGCPRO;
-}
-name = args[0];
-program = args[2];
 #ifdef VMS
 /* Make a one member argv with all args concatenated
 together separated by a blank.  */
 len = XSTRING_LENGTH (program) + 2;
 strcat (new_argv, XSTRING_DATA (tem));
 }
 /* Need to add code here to check for program existence on VMS */
 #else /* not VMS */
-new_argv = (char **)
-alloca ((nargs - 1) * sizeof (char *));
-new_argv[0] = (char *) XSTRING_DATA (program);
 /* If program file name is not absolute, search our path for it */
 if (!IS_DIRECTORY_SEP (XSTRING_BYTE (program, 0))
 && !(XSTRING_LENGTH (program) > 1
 	  && IS_DEVICE_SEP (XSTRING_BYTE (program, 1))))
 {
-struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; /* Caller protects args[] */
+struct gcpro ngcpro1;
-GCPRO4 (buffer, current_dir, name, program);
 tem = Qnil;
+NGCPRO1 (tem);
 locate_file (Vexec_path, program, EXEC_SUFFIXES, &tem,
 		   X_OK);
-UNGCPRO;
 if (NILP (tem))
 	report_file_error ("Searching for program", list1 (program));
-tem = Fexpand_file_name (tem, Qnil);
+program = Fexpand_file_name (tem, Qnil);
-new_argv[0] = (char *) XSTRING_DATA (tem);
+NUNGCPRO;
 }
 else
 {
-/* #### dmoore - file-directory-p can call lisp, make sure everything
-	 here protects itself. */
 if (!NILP (Ffile_directory_p (program)))
 	error ("Specified program for new process is a directory");
 }
+/* Nothing below here GCs so our string pointers shouldn't move. */
+new_argv = (char **) alloca ((nargs - 1) * sizeof (char *));
+new_argv[0] = (char *) XSTRING_DATA (program);
 for (i = 3; i < nargs; i++)
 {
 tem = args[i];
 CHECK_STRING (tem);
 new_argv[i - 2] = (char *) XSTRING_DATA (tem);
 itself; it's all taken care of here.  */
 record_unwind_protect (start_process_unwind, proc);
 create_process (proc, new_argv, (char *) XSTRING_DATA (current_dir));
+UNGCPRO;
 return unbind_to (speccount, proc);
 }
 /* connect to an existing file descriptor.  This is very similar to
 MARK_MODELINE_CHANGED;
 /* If the restriction isn't what it should be, set it.  */
 if (old_begv != BUF_BEGV (buf) || old_zv != BUF_ZV (buf))
-	Fnarrow_to_region (make_int (old_begv), make_int (old_zv),
+	{
-			   p->buffer);
+	  Fwiden(p->buffer);
+	  old_begv = bufpos_clip_to_bounds (BUF_BEG (buf),
+					    old_begv,
+					    BUF_Z (buf));
+	  old_zv = bufpos_clip_to_bounds (BUF_BEG (buf),
+					  old_zv,
+					  BUF_Z (buf));
+	  Fnarrow_to_region (make_int (old_begv), make_int (old_zv),
+			     p->buffer);
+	}
 /* Handling the process output should not deactivate the mark.  */
 zmacs_region_stays = old_zmacs_region_stays;
 buf->read_only = old_read_only;
+old_point = bufpos_clip_to_bounds (BUF_BEGV (buf),
+					 old_point,
+					 BUF_ZV (buf));
 BUF_SET_PT (buf, old_point);
 UNGCPRO;
 }
 #ifdef VMS
 	      Finsert (1, &msg);
 	      current_buffer->read_only = old_read_only;
 	      Fset_marker (p->mark, make_int (BUF_PT (current_buffer)),
 			   p->buffer);
+	      opoint = bufpos_clip_to_bounds(BUF_BEGV (XBUFFER (p->buffer)),
+					     opoint,
+					     BUF_ZV (XBUFFER (p->buffer)));
 	      BUF_SET_PT (current_buffer, opoint);
 	      Fset_buffer (old);
 NUNGCPRO;
 	    }
 	}

Mercurial > hg > xemacs-beta

comparison src/process.c @ 48:56c54cf7c5b6 r19-16b90