diff src/lstream.c @ 814:a634e3b7acc8

[xemacs-hg @ 2002-04-14 12:41:59 by ben] latest changes TODO.ben-mule-21-5: Update. make-docfile.c: Add basic support for handling ISO 2022 doc strings -- we parse the basic charset designation sequences so we know whether we're in ASCII and have to pay attention to end quotes and such. Reformat code according to coding standards. abbrev.el: Add `global-abbrev-mode', which turns on or off abbrev-mode in all buffers. Added `defining-abbrev-turns-on-abbrev-mode' -- if non-nil, defining an abbrev through an interactive function will automatically turn on abbrev-mode, either globally or locally depending on the command. This is the "what you'd expect" behavior. indent.el: general function for indenting a balanced expression in a mode-correct way. Works similar to indent-region in that a mode can specify a specific command to do the whole operation; if not, figure out the region using forward-sexp and indent each line using indent-according-to-mode. keydefs.el: Removed. Modify M-C-backslash to do indent-region-or-balanced-expression. Make S-Tab just insert a TAB char, like it's meant to do. make-docfile.el: Now that we're using the call-process-in-lisp, we need to load an extra file win32-native.el because we're running a bare temacs. menubar-items.el: Totally redo the Cmds menu so that most used commands appear directly on the menu and less used commands appear in submenus. The old way may have been very pretty, but rather impractical. process.el: Under Windows, don't ever use old-call-process-internal, even in batch mode. We can do processes in batch mode. subr.el: Someone recoded truncate-string-to-width, saying "the FSF version is too complicated and does lots of hard-to-understand stuff" but the resulting recoded version was *totally* wrong! it misunderstood the basic point of this function, which is work in *columns* not chars. i dumped ours and copied the version from FSF 21.1. Also added truncate-string-with-continuation-dots, since this idiom is used often. config.inc.samp, xemacs.mak: Separate out debug and optimize flags. Remove all vestiges of USE_MINIMAL_TAGBITS, USE_INDEXED_LRECORD_IMPLEMENTATION, and GUNG_HO, since those ifdefs have long been removed. Make error-checking support actually work. Some rearrangement of config.inc.samp to make it more logical. Remove callproc.c and ntproc.c from xemacs.mak, no longer used. Make pdump the default. lisp.h: Add support for strong type-checking of Bytecount, Bytebpos, Charcount, Charbpos, and others, by making them classes, overloading the operators to provide integer-like operation and carefully controlling what operations are allowed. Not currently enabled in C++ builds because there are still a number of compile errors, and it won't really work till we merge in my "8-bit-Mule" workspace, in which I make use of the new types Charxpos, Bytexpos, Memxpos, representing a "position" either in a buffer or a string. (This is especially important in the extent code.) abbrev.c, alloc.c, eval.c, buffer.c, buffer.h, editfns.c, fns.c, text.h: Warning fixes, some of them related to new C++ strict type checking of Bytecount, Charbpos, etc. dired.c: Caught an actual error due to strong type checking -- char len being passed when should be byte len. alloc.c, backtrace.h, bytecode.c, bytecode.h, eval.c, sysdep.c: Further optimize Ffuncall: -- process arg list at compiled-function creation time, converting into an array for extra-quick access at funcall time. -- rewrite funcall_compiled_function to use it, and inline this function. -- change the order of check for magic stuff in SPECBIND_FAST_UNSAFE to be faster. -- move the check for need to garbage collect into the allocation code, so only a single flag needs to be checked in funcall. buffer.c, symbols.c: add debug funs to check on mule optimization info in buffers and strings. eval.c, emacs.c, text.c, regex.c, scrollbar-msw.c, search.c: Fix evil crashes due to eistrings not properly reinitialized under pdump. Redo a bit some of the init routines; convert some complex_vars_of() into simple vars_of(), because they didn't need complex processing. callproc.c, emacs.c, event-stream.c, nt.c, process.c, process.h, sysdep.c, sysdep.h, syssignal.h, syswindows.h, ntproc.c: Delete. Hallelujah, praise the Lord, there is no god but Allah!!! fix so that processes can be invoked in bare temacs -- thereby eliminating any need for callproc.c. (currently only eliminated under NT.) remove all crufty and unnecessary old process code in ntproc.c and elsewhere. move non-callproc-specific stuff (mostly environment) into process.c, so callproc.c can be left out under NT. console-tty.c, doc.c, file-coding.c, file-coding.h, lstream.c, lstream.h: fix doc string handling so it works with Japanese, etc docs. change handling of "character mode" so callers don't have to manually set it (quite error-prone). event-msw.c: spacing fixes. lread.c: eliminate unused crufty vintage-19 "FSF defun hack" code. lrecord.h: improve pdump description docs. buffer.c, ntheap.c, unexnt.c, win32.c, emacs.c: Mule-ize some unexec and startup code. It was pseudo-Mule-ized before by simply always calling the ...A versions of functions, but that won't cut it -- eventually we want to be able to run properly even if XEmacs has been installed in a Japanese directory. (The current problem is the timing of the loading of the Unicode tables; this will eventually be fixed.) Go through and fix various other places where the code was not Mule-clean. Provide a function mswindows_get_module_file_name() to get our own name without resort to PATH_MAX and such. Add a big comment in main() about the problem with Unicode table load timing that I just alluded to. emacs.c: When error-checking is enabled (interpreted as "user is developing XEmacs"), don't ask user to "pause to read messages" when a fatal error has occurred, because it will wedge if we are in an inner modal loop (typically when a menu is popped up) and make us unable to get a useful stack trace in the debugger. text.c: Correct update_entirely_ascii_p_flag to actually work. lisp.h, symsinit.h: declarations for above changes.
author ben
date Sun, 14 Apr 2002 12:43:31 +0000
parents a5954632b187
children 6728e641994e
line wrap: on
line diff
--- a/src/lstream.c	Sat Apr 13 20:44:53 2002 +0000
+++ b/src/lstream.c	Sun Apr 14 12:43:31 2002 +0000
@@ -208,7 +208,12 @@
    note the non-parallelism in who should set this mode on the stream: The
    *CALLER* sets character mode on read streams it creates; the *STREAM
    ITSELF* sets character mode on write streams, typically at creation
-   time. */
+   time.
+
+   (However, if a read stream always generates internal-format data, then
+   the callers will almost always want character mode, and it's allowed to
+   set this on behalf of the caller, as long as a flag can be provided at
+   creation time to disable this behavior.) */
 
 void
 Lstream_set_character_mode (Lstream *lstr)
@@ -232,12 +237,12 @@
    object hanging around anywhere where they might be used!  When streams
    are chained together, be VERY CAREFUL of the order in which you delete
    them! (e.g. if the streams are in a singly-linked list, delete the head
-   first; this will close, and may send data down to the rest.  Then
+   first; this will close (but check the documentation, e.g. of
+   make_coding_input_stream()), and may send data down to the rest.  Then
    proceed to the rest, one by one.  If the chains are in a doubly-linked
    list, close all the streams first (again, from the head to the tail),
    disconnect the back links, then delete starting from the head.  In
-   general, it's a good idea to close everything before deleting
-   anything.
+   general, it's a good idea to close everything before deleting anything.
 
    NOTE: DO NOT CALL DURING GARBAGE COLLECTION (e.g. in a finalizer).  You
    will be aborted.  See free_managed_lcrecord(). */
@@ -599,8 +604,9 @@
    any data at other times, particularly if SIZE is too small.  this needs
    to be fixed!). -1 means an error occurred and no bytes were read. */
 
-Bytecount
-Lstream_read (Lstream *lstr, void *data, Bytecount size)
+static Bytecount
+Lstream_read_1 (Lstream *lstr, void *data, Bytecount size,
+		int override_no_partial_chars)
 {
   unsigned char *p = (unsigned char *) data;
   Bytecount off = 0;
@@ -662,7 +668,8 @@
 	}
     }
 
-  if (lstr->flags & LSTREAM_FL_NO_PARTIAL_CHARS)
+  if ((lstr->flags & LSTREAM_FL_NO_PARTIAL_CHARS) &&
+      !override_no_partial_chars)
     {
       /* It's quite possible for us to get passed an incomplete
 	 character at the end.  We need to spit back that
@@ -678,6 +685,13 @@
   return off == 0 && error_occurred ? -1 : off;
 }
 
+Bytecount
+Lstream_read (Lstream *lstr, void *data, Bytecount size)
+{
+  return Lstream_read_1 (lstr, data, size, 0);
+}
+
+
 /* Push back SIZE bytes of DATA onto the input queue.  The next call
    to Lstream_read() with the same size will read the same bytes back.
    Note that this will be the case even if there is other pending
@@ -827,7 +841,7 @@
 Lstream_fgetc (Lstream *lstr)
 {
   unsigned char ch;
-  if (Lstream_read (lstr, &ch, 1) <= 0)
+  if (Lstream_read_1 (lstr, &ch, 1, 1) <= 0)
     return -1;
   return ch;
 }
@@ -1013,6 +1027,25 @@
   return wrap_lstream (lstr);
 }
 
+/* Flags:
+   
+   LSTR_CLOSING
+   If set, close the descriptor or FILE * when the stream is closed.
+
+   LSTR_ALLOW_QUIT
+   If set, allow quitting out of the actual I/O.
+
+   LSTR_PTY_FLUSHING
+   If set and filedesc_stream_set_pty_flushing() has been called
+   on the stream, do not send more than pty_max_bytes on a single
+   line without flushing the data out using the eof_char.
+
+   LSTR_BLOCKED_OK
+   If set, an EWOULDBLOCK error is not treated as an error but
+   simply causes the write function to return 0 as the number
+   of bytes written out.
+ */
+
 Lisp_Object
 make_filedesc_input_stream (int filedesc, int offset, int count, int flags)
 {