diff src/file-coding.h @ 802:19dfb459d51a

[xemacs-hg @ 2002-04-03 10:47:37 by ben] fix tty problem et al internals/internals.texi: Add section on correctly merging a branch back into the trunk. console-tty.c, eval.c, event-unixoid.c, file-coding.c, file-coding.h, lisp.h, print.c, sysdep.c: Fix data corruption error in print.c from print_depth becoming negative. Borrow primitives internal_bind_int, internal_bind_lisp_object from my stderr-proc ws, soon to be integrated; use them to properly bind print_depth et al. First fix for TTY problem. The basic problem is I switched things so that the TTY I/O is filtered through a coding system, for the support of kterm and such, that speak JIS or similar encodings. (#### I ***swear*** I had this working way back in 19.12.) Anyway, this introduced buffering issues, in which instead of one char being read, it tried to read 1024 chars. I tried setting the stdin descriptor non-blocking, but it doesn't appear to work on Cygwin. (#### Andy, do you know anything about this?) So I fixed it elsewhere. If you get weirdness on the TTY, look in console-tty.c and see how it gets the coding system; maybe there's a way to change it (and if not, there should be!). Also fix warning in sysdep.c.
author ben
date Wed, 03 Apr 2002 10:47:52 +0000
parents a5954632b187
children a634e3b7acc8
line wrap: on
line diff
--- a/src/file-coding.h	Mon Apr 01 03:59:04 2002 +0000
+++ b/src/file-coding.h	Wed Apr 03 10:47:52 2002 +0000
@@ -836,7 +836,7 @@
 } while (0)
 #define DETECTOR_HAS_METHOD(Detector, Meth)				\
   Dynarr_at (all_coding_detectors, detector_##Detector).Meth##_method =	\
-  Detector##_##Meth
+    Detector##_##Meth
   
 
 /**************************************************/
@@ -930,6 +930,9 @@
 
   /* If set, don't close the stream at the other end when being closed. */
   unsigned int no_close_other:1;
+  /* If set, read only one byte at a time from other end to avoid any
+     possible blocking. */
+  unsigned int one_byte_at_a_time:1;
   
   /* #### Temporary test */
   unsigned int finalized:1;
@@ -1057,12 +1060,15 @@
 					 Lisp_Object type,
 					 Lisp_Object description,
 					 Lisp_Object props);
+
+#define CODE_FL_NO_CLOSE_OTHER (1 << 0)
+#define CODE_FL_READ_ONE_BYTE_AT_A_TIME (1 << 1)
 Lisp_Object make_coding_input_stream (Lstream *stream, Lisp_Object codesys,
 				      enum encode_decode direction,
-				      int no_close_other);
+				      int flags);
 Lisp_Object make_coding_output_stream (Lstream *stream, Lisp_Object codesys,
 				       enum encode_decode direction,
-				       int no_close_other);
+				       int flags);
 void set_detection_results (struct detection_state *st, int detector,
 			    int given);