imported 9.0.299 Beta 02

[ckermit.git] / ckutio.c

diff --git a/ckutio.c b/ckutio.c
index d3354be..6551e77 100644 (file)
--- a/ckutio.c
+++ b/ckutio.c
@@ -1,12 +1,12 @@
 #define CKUTIO_C
 
 #ifdef aegis
-char *ckxv = "Aegis Communications support, 9.0.323, 10 June 2011";
+char *ckxv = "Aegis Communications support, 9.0.324, 20 June 2011";
 #else
 #ifdef Plan9
-char *ckxv = "Plan 9 Communications support, 9.0.323, 10 June 2011";
+char *ckxv = "Plan 9 Communications support, 9.0.324, 20 June 2011";
 #else
-char *ckxv = "UNIX Communications support, 9.0.323, 10 June 2011";
+char *ckxv = "UNIX Communications support, 9.0.324, 20 June 2011";
 #endif /* Plan9 */
 #endif /* aegis */
 
@@ -828,10 +828,18 @@ Time functions
 #endif /* XENIX */
 
 #ifdef CK_SCOV5                                /* Ditto for SCO OpenServer 5.0 */
+#ifndef SCO_OSR507                     /* 299 */
 #ifdef FIONREAD
 #undef FIONREAD
 #endif /* FIONREAD */
-#endif /* XENIX */
+#endif /* SCO_OSR507 */
+#endif /* CK_SCOV5 */
+
+#ifdef SCO_OSR507                      /* 299 */
+#ifdef RDCHK
+#undef RDCHK
+#endif /* RDCHK */
+#endif /* SCO_OSR507 */
 
 /* Whether to include <fcntl.h> */
 
@@ -14397,9 +14405,11 @@ pty_chk(fd) int fd; {
             ckitoa(n));
     debug(F100,msgbuf,"",0);
 #else
+#ifdef RDCHK
     n = rdchk(fd);
     debug(F101,"pty_chk rdchk","",n);
-#ifdef RDCHK
+#else
+    n = 1;
 #endif /* RDCHK */
 #endif /* FIONREAD */
     return((n > -1) ? n : 0);