xemacs-beta: src/callproc.c comparison

comparison src/callproc.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19

author	cvs
date	Mon, 13 Aug 2007 09:55:28 +0200
parents	9ad43877534d
children	a2f645c6b9f8

comparison

equal deleted inserted replaced

-:bcd2674570bf
+:3d6bfa290dbd
 if (!NILP (fd))
 close (XINT (fd));
 if (!NILP (pid))
 EMACS_KILLPG (XINT (pid), SIGKILL);
 synch_process_alive = 0;
 return Qnil;
 }
 static Lisp_Object
 char buf[16384];
 char *bufptr = buf;
 int bufsize = 16384;
 int speccount = specpdl_depth ();
 struct gcpro gcpro1;
-char **new_argv = (char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
+char **new_argv = alloca_array (char *, max (2, nargs - 2));
 /* File to use for stderr in the child.
 t means use same as standard output.  */
 Lisp_Object error_file;
 #ifdef MSDOS
 char *outf, *tempfile;
 int outfilefd;
 #endif /* MSDOS */
 CHECK_STRING (args[0]);
 error_file = Qt;
 #if defined (NO_SUBPROCESSES)
 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. */
 {
 struct gcpro ngcpro1, ngcpro2;
 /* Do this test before building new_argv because GC in Lisp code
 *  called by various filename-hacking routines might relocate strings */
 /* Make sure that the child will be able to chdir to the current
 buffer's current directory.  We can't just have the child check
 for an error when it does the chdir, since it's in a vfork.  */
 	  if (NILP (buffer))
 	    CHECK_BUFFER (spec_buffer);
 	  CHECK_BUFFER (buffer);
 	}
 }
 else
 buffer = Qnil;
 UNGCPRO;
 display = ((nargs >= 4) ? args[3] : Qnil);
 }
 if (NILP (path))
 report_file_error ("Searching for program", Fcons (args[0], Qnil));
 new_argv[0] = (char *) XSTRING_DATA (path);
 filefd = open ((char *) XSTRING_DATA (infile), O_RDONLY, 0);
 if (filefd < 0)
 report_file_error ("Opening process input file", Fcons (infile, Qnil));
 #ifdef MSDOS
 {
 tempfile = alloca (20);
 *tempfile = '\0';
 }
 dostounix_filename (tempfile);
 if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/')
 strcat (tempfile, "/");
 strcat (tempfile, "detmp.XXX");
 mktemp (tempfile);
 outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
 {
 char *outf;
 if (INTP (buffer))
 outf = NULL_DEVICE;
 else
 {
 	/* DOS can't create pipe for interprocess communication,
 	   so redirect child process's standard output to temporary file
 	   and later read the file. */
 if ((outf = egetenv ("TMP")) || (outf = egetenv ("TEMP")))
 	{
 	  strcpy (tempfile, outf);
 	  dostounix_filename (tempfile);
 	}
 	report_file_error ("Cannot open", Fcons(error_file, Qnil));
 }
 fork_error = Qnil;
 #ifdef WINDOWSNT
 pid = child_setup (filefd, fd1, fd_error, new_argv,
 (char *) XSTRING_DATA (current_dir));
 #else  /* not WINDOWSNT */
 pid = fork ();
 if (pid == 0)
 	/* Now NREAD is the total amount of data in the buffer.  */
 	if (nread == 0)
 	  break;
 	total_read += nread;
 	if (!NILP (buffer))
 	  buffer_insert_raw_string (XBUFFER (buffer), (Bufbyte *) bufptr,
 				    nread);
 	/* Make the buffer bigger as we continue to read more data,
 and will be cleaned up in the usual way.  */
 {
 REGISTER int i;
 i = strlen (current_dir);
-pwd = (char *) alloca (i + 6);
+pwd = alloca_array (char, i + 6);
 memcpy (pwd, "PWD=", 4);
 memcpy (pwd + 4, current_dir, i);
 i += 4;
 if (!IS_DIRECTORY_SEP (pwd[i - 1]))
 pwd[i++] = DIRECTORY_SEP;
 	  && STRINGP (XCAR (tem)));
 	 tem = XCDR (tem))
 new_length++;
 /* new_length + 2 to include PWD and terminating 0.  */
-env = new_env = (char **) alloca ((new_length + 2) * sizeof (char *));
+env = new_env = alloca_array (char *, new_length + 2);
 /* If we have a PWD envvar and we know the real current directory,
 pass one down, but with corrected value.  */
 if (pwd && getenv ("PWD"))
 *new_env++ = pwd;
 close (2);
 dup2 (in,  0);
 dup2 (out, 1);
 dup2 (err, 2);
 close (in);
 close (out);
 close (err);
 /* I can't think of any reason why child processes need any more
 Lisp_Object scan;
 for (scan = Vprocess_environment; CONSP (scan); scan = XCDR (scan))
 {
 Lisp_Object entry = XCAR (scan);
 if (STRINGP (entry)
 	  && XSTRING_LENGTH (entry) > varlen
 	  && XSTRING_BYTE (entry, varlen) == '='
 #ifdef WINDOWSNT
 	  /* NT environment variables are case insensitive.  */
 #endif
 {
 char *data_dir = egetenv ("EMACSDATA");
 char *site_dir = egetenv ("EMACSSITE");
 char *doc_dir  = egetenv ("EMACSDOC");
 #ifdef PATH_DATA
 if (!data_dir)
 	data_dir = (char *) PATH_DATA;
 #endif
 #ifdef PATH_DOC
 #endif
 #ifdef PATH_SITE
 if (!site_dir)
 	site_dir = (char *) PATH_SITE;
 #endif
 if (data_dir)
 	Vdata_directory = Ffile_name_as_directory
 	  (build_string (data_dir));
 else
 	Vdata_directory = Qnil;
 #else
 	  Vdata_directory = Qnil;
 #endif
 	}
 }
 if (!NILP (Vsite_directory))
 {
 tempdir = Fdirectory_file_name (Vsite_directory);
 if (access ((char *) XSTRING_DATA (tempdir), 0) < 0)
 	{
 #else
 	  Vsite_directory = Qnil;
 #endif
 	}
 }
 #ifdef PATH_PREFIX
 Vprefix_directory = build_string ((char *) PATH_PREFIX);
 #else
 Vprefix_directory = Qnil;
 #endif
 sh = egetenv ("COMSPEC");
 {
 char *tem;
 	/*
 	** If COMSPEC has been set, then convert the
 	** DOS formatted name into a UNIX format. Then
 	** create a LISP object.
 	*/
 if (sh)
 {
 		tem = (char *) alloca (strlen (sh) + 1);
 	}
 }
 #else /* not VMS or WINDOWSNT */
 sh = (char *) egetenv ("SHELL");
 Vshell_file_name = build_string (sh ? sh : "/bin/sh");
 #endif
 }
 #if 0
 void
 set_process_environment (void)

Mercurial > hg > xemacs-beta

comparison src/callproc.c @ 185:3d6bfa290dbd r20-3b19