[xemacs-hg @ 2002-05-28 08:44:22 by ben] merge my stderr-proc ws make-docfile.c: Fix places where we forget to check for EOF. code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and friends work both ways but Cygwin programs don't like the CRs. code-process.el, multicast.el, process.el: Removed. Improvements to call-process-internal: -- allows a buffer to be specified for input and stderr output -- use it on all systems -- implement C-g as documented -- clean up and comment call-process-region uses new call-process facilities; no temp file. remove duplicate funs in process.el. comment exactly how coding systems work and fix various problems. open-multicast-group now does similar coding-system frobbing to open-network-stream. dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time. xemacs.mak: Add -DSTRICT. ================================================================ ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES ================================================================ Standard output and standard error can be processed separately in a process. Each can have its own buffer, its own mark in that buffer, and its filter function. You can specify a separate buffer for stderr in `start-process' to get things started, or use the new primitives: set-process-stderr-buffer process-stderr-buffer process-stderr-mark set-process-stderr-filter process-stderr-filter Also, process-send-region takes a 4th optional arg, a buffer. Currently always uses a pipe() under Unix to read the error output. (#### Would a PTY be better?) sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c. wait_for_termination() now only needed on a few really old systems. console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for error input. Create Lstreams for reading in the error channel. Many process methods need change. In general the changes are fairly clear as they involve duplicating what's used for reading the normal stdout and changing for stderr -- although tedious, as such changes are required throughout the entire process code. Rewrote the code that reads process output to do two loops, one for stdout and one for stderr. gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr. ================================================================ NEW ERROR-TRAPPING MECHANISM ================================================================ Totally rewrite error trapping code to be unified and support more features. Basic function is call_trapping_problems(), which lets you specify, by means of flags, what sorts of problems you want trapped. these can include -- quit -- errors -- throws past the function -- creation of "display objects" (e.g. buffers) -- deletion of already-existing "display objects" (e.g. buffers) -- modification of already-existing buffers -- entering the debugger -- gc -- errors->warnings (ala suspended errors) etc. All other error funs rewritten in terms of this one. Various older mechanisms removed or rewritten. window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to note_object_created(), for use with trapping_problems mechanism. When deleting, call check_allowed_operation() and note_object deleted(). The trapping-problems code records the objects created since the call-trapping-problems began. Those objects can be deleted, but none others (i.e. previously existing ones). bytecode.c, cmdloop.c: internal_catch takes another arg. eval.c: Add long comments describing the "five lists" used to maintain state (backtrace, gcpro, specbind, etc.) in the Lisp engine. backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or redo in terms of new one. frame.c, gutter.c: Flush out the concept of "critical display section", defined by the in_display() var. Use an internal_bind() to get it reset, rather than just doing it at end, because there may be a non-local exit. event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on old mechanisms. glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay. insdel.c: Protect hooks against deleting existing buffers. frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers. Otherwise we run into stickiness in redisplay because internal_equal() can QUIT. ================================================================ SIGNAL, C-G CHANGES ================================================================ Here we change the way that C-g interacts with event reading. The idea is that a C-g occurring while we're reading a user event should be read as C-g, but elsewhere should be a QUIT. The former code did all sorts of bizarreness -- requiring that no QUIT occurs anywhere in event-reading code (impossible to enforce given the stuff called or Lisp code invoked), and having some weird system involving enqueue/dequeue of a C-g and interaction with Vquit_flag -- and it didn't work. Now, we simply enclose all code where we want C-g read as an event with {begin/end}_dont_check_for_quit(). This completely turns off the mechanism that checks (and may remove or alter) C-g in the read-ahead queues, so we just get the C-g normal. Signal.c documents this very carefully. cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old out-of-date comments. event-stream.c: Fix C-g handling to actually work. device-x.c: Disable quit checking when err out. signal.c: Cleanup. Add large descriptive comment. process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT. It's not necessary to use REALLY_QUIT and just confuses the issue. lisp.h: Comment quit handlers. ================================================================ CONS CHANGES ================================================================ free_cons() now takes a Lisp_Object not the result of XCONS(). car and cdr have been renamed so that they don't get used directly; go through XCAR(), XCDR() instead. alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object, not Lisp_Cons chartab.c: Eliminate direct use of ->car, ->cdr, should be black box. callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons. ================================================================ USE INTERNAL-BIND-* ================================================================ eval.c: Cleanups of these funs. alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object() in place of whatever varied and cumbersome mechanisms were formerly there. ================================================================ SPECBIND SANITY ================================================================ backtrace.h: - Improved comments backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity checking code each time the catchlist or specbind stack change. Removed older prototype of same mechanism. ================================================================ MISC ================================================================ lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship. device-msw.c: Correct bad Unicode-ization. print.c: Be more careful when not initialized or in fatal error handling. search.c: Eliminate running_asynch_code, an FSF holdover. alloc.c: Added comments about gc-cons-threshold. dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value tree, like in menubar-x.c. gui.c: Use Qunbound not Qnil as the default for gethash. lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP(). lisp.h: Use ERROR_CHECK_STRUCTURES to turn on ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK lisp.h: Add assert_with_message. lisp.h: Add macros for gcproing entire arrays. (You could do this before but it required manual twiddling the gcpro structure.) lisp.h: Add prototypes for new functions defined elsewhere.

--- a/lisp/multicast.el	Sat May 25 01:55:30 2002 +0000
+++ b/lisp/multicast.el	Tue May 28 08:45:36 2002 +0000
@@ -1,6 +1,7 @@
 ;;; multicast.el --- lisp frontend for multicast connections in XEmacs
 
 ;; Copyright (C) 1997-2000 Didier Verna.
+;; Copyright (C) 2002 Ben Wing.
 
 ;; Author:          Didier Verna <didier@xemacs.org>
 ;; Maintainer:      Didier Verna <didier@xemacs.org>
@@ -47,13 +48,12 @@
   "Open a multicast connection on the specified address.
 Returns a process object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
-Args are NAME BUFFER ADDRESS.
 NAME is a name for the process. It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer-name) to associate with the process.
  Process output goes at the end of that buffer, unless you specify an output
  stream or filter function to handle the output.
  BUFFER may be also nil, meaning that this process is not associated with any
- buffer
+ buffer.
 ADDRESS specifies a standard multicast address \"dest/port/ttl\":
  dest is an internet address between 224.0.0.0 and 239.255.255.255
  port is a communication port like in traditional unicast
@@ -61,7 +61,28 @@
 
 WARNING: it is *strongly* recommended to avoid using groups beginning with
          224 or 239. Such groups are considered 'admin' groups, and may
-         behave in a surprising way ..."
+         behave in a surprising way ...
+
+The read/write coding systems used for process I/O on the process are
+determined as follows:
+
+1. `coding-system-for-read', `coding-system-for-write', if non-nil.
+      (Intended as a temporary overriding mechanism for use by Lisp
+      code.)
+2. The matching value for the port from `network-coding-system-alist',
+      if any, and if non-nil.  The value may be either a single coding
+      system, used for both read and write; or a cons of read/write; or a
+      function, called to get one of the other two values.
+3. The value of `default-network-coding-system', which should be a cons
+      of read/write coding systems, if the values are non-nil.
+4. The coding system `undecided' for read, and `raw-text' for write.
+
+Note that the processes of determining the read and write coding systems
+proceed essentially independently one from the other, as in `start-process'.
+
+You can change the coding systems later on using
+`set-process-coding-system', `set-process-input-coding-system', or
+`set-process-output-coding-system'."
   (let (dest port ttl)
     ;; We check only the general form of the multicast address.
     ;; The rest will be handled by the internal function.
@@ -75,7 +96,44 @@
 	 (error "invalid port specification."))
     (and (= 0 (setq ttl (string-to-int (match-string 3 address))))
 	 (error "invalid ttl specification."))
-    (declare-fboundp (open-multicast-group-internal name buffer dest port ttl))
-    ))
+  (let (cs-r cs-w)
+    (let (ret)
+      (catch 'found
+	(let ((alist network-coding-system-alist)
+	      (case-fold-search nil)
+	      pattern)
+	  (while alist
+	    (setq pattern (car (car alist)))
+	    (and
+	     (cond ((numberp pattern)
+		    (and (numberp port)
+			 (eq pattern port)))
+		   ((stringp pattern)
+		    (or (and (stringp port)
+			     (string-match pattern port))
+			(and (numberp port)
+			     (string-match pattern
+					   (number-to-string port))))))
+	     (throw 'found (setq ret (cdr (car alist)))))
+	    (setq alist (cdr alist))
+	    )))
+      (if (functionp ret)
+	  (setq ret (funcall ret 'open-multicast-group port)))
+      (cond ((consp ret)
+	     (setq cs-r (car ret)
+		   cs-w (cdr ret)))
+	    ((and ret (find-coding-system ret))
+	     (setq cs-r ret
+		   cs-w ret))))
+    (let ((coding-system-for-read
+	   (or coding-system-for-read cs-r
+	       (car default-network-coding-system)
+	       'undecided))
+	  (coding-system-for-write
+	   (or coding-system-for-write cs-w
+	       (cdr default-network-coding-system)
+	       'raw-text)))
+      (declare-fboundp (open-multicast-group-internal name buffer dest port
+						      ttl))))))
 
 ;;; multicast.el ends here