Mercurial > hg > xemacs-beta

diff src/callproc.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 7039e6323819
children 38db05db9cb5
line wrap: on
line diff
--- a/src/callproc.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/callproc.c	Thu May 24 07:51:33 2001 +0000
@@ -138,20 +138,6 @@
   return Qnil;
 }
 
-static Lisp_Object fork_error;
-#if 0 /* UNUSED */
-static void
-report_fork_error (char *string, Lisp_Object data)
-{
-  Lisp_Object errstring = lisp_strerror (errno);
-
-  fork_error = Fcons (build_string (string), Fcons (errstring, data));
-
-  /* terminate this branch of the fork, without closing stdin/out/etc. */
-  _exit (1);
-}
-#endif /* unused */
-
 DEFUN ("old-call-process-internal", Fold_call_process_internal, 1, MANY, 0, /*
 Call PROGRAM synchronously in separate process, with coding-system specified.
 Arguments are
@@ -202,7 +188,7 @@
 #if defined (NO_SUBPROCESSES)
   /* Without asynchronous processes we cannot have BUFFER == 0.  */
   if (nargs >= 3 && !INTP (args[2]))
-    error ("Operating system cannot handle asynchronous subprocesses");
+    signal_error (Qunimplemented, "Operating system cannot handle asynchronous subprocesses", Qunbound);
 #endif /* NO_SUBPROCESSES */
 
   /* Do all filename munging before building new_argv because GC in
@@ -233,8 +219,8 @@
     /* This is in FSF, but it breaks everything in the presence of
        ange-ftp-visited files, so away with it.  */
     if (NILP (Ffile_accessible_directory_p (current_dir)))
-      report_file_error ("Setting current directory",
-                         Fcons (current_buffer->directory, Qnil));
+      signal_error (Qprocess_error, "Setting current directory",
+		    current_buffer->directory);
 #endif /* 0 */
     NUNGCPRO;
   }
@@ -308,12 +294,12 @@
   new_argv[max(nargs - 3,1)] = 0;
 
   if (NILP (path))
-    report_file_error ("Searching for program", Fcons (args[0], Qnil));
+    signal_error (Qprocess_error, "Searching for program", args[0]);
   new_argv[0] = (char *) XSTRING_DATA (path);
 
   filefd = open ((char *) XSTRING_DATA (infile), O_RDONLY | OPEN_BINARY, 0);
   if (filefd < 0)
-    report_file_error ("Opening process input file", Fcons (infile, Qnil));
+    report_process_error ("Opening process input file", infile);
 
   if (INTP (buffer))
     {
@@ -368,10 +354,9 @@
 	if (fd1 >= 0)
 	  close (fd1);
 	errno = save_errno;
-	report_file_error ("Cannot open", Fcons(error_file, Qnil));
+	report_process_error ("Cannot open", error_file);
       }
 
-    fork_error = Qnil;
 #ifdef WIN32_NATIVE
     pid = child_setup (filefd, fd1, fd_error, new_argv,
                        (char *) XSTRING_DATA (current_dir));
@@ -424,9 +409,6 @@
       close (fd1);
   }
 
-  if (!NILP (fork_error))
-    signal_error (Qfile_error, fork_error);
-
 #ifndef WIN32_NATIVE
   if (pid < 0)
     {
@@ -434,7 +416,7 @@
       if (fd[0] >= 0)
 	close (fd[0]);
       errno = save_errno;
-      report_file_error ("Doing fork", Qnil);
+      report_process_error ("Doing fork", Qunbound);
     }
 #endif
 
@@ -787,7 +769,7 @@
 		  (const char* const*)env);
   if (cpid == -1)
     /* An error occurred while trying to spawn the process.  */
-    report_file_error ("Spawning child process", Qnil);
+    report_process_error ("Spawning child process", Qunbound);
   reset_standard_handles (in, out, err, handles);
   return cpid;
 #else /* not WIN32_NATIVE */