diff options
author | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
commit | fcfe3f145944eb93270f8c4d301313364e1f30b2 (patch) | |
tree | 378d1e978b67c2c78904a81b454d303def969a97 /mcon/U/nblock_io.U | |
parent | e65bb46f249ce0cb16f71814f8b542eea87a8a82 (diff) | |
parent | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (diff) |
Merge branch 'upstream' into topic--debian
Conflicts:
jmake/files/Jmake.rules
mcon/U/Chk_MANI.U
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'mcon/U/nblock_io.U')
-rw-r--r-- | mcon/U/nblock_io.U | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mcon/U/nblock_io.U b/mcon/U/nblock_io.U index 6beb9c4..5c488de 100644 --- a/mcon/U/nblock_io.U +++ b/mcon/U/nblock_io.U @@ -1,12 +1,12 @@ -?RCS: $Id: nblock_io.U,v 3.0.1.2 1997/02/28 16:17:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: nblock_io.U,v $ ?RCS: Revision 3.0.1.2 1997/02/28 16:17:14 ram @@ -22,7 +22,7 @@ ?X: (Problem reported on FreeBSD; it's unclear if this helps.) --AD ?X: ?MAKE:o_nonblock eagain rd_nodata d_eofnblk: cat rm +cc +ccflags +ldflags \ - d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar startsh + d_open3 h_sysfile h_fcntl signal_t hint Oldconfig Setvar startsh Warn ?MAKE: -pick add $@ %< ?S:o_nonblock: ?S: This variable bears the symbol value to be used during open() or fcntl() @@ -72,7 +72,7 @@ ?H:#define RD_NODATA $rd_nodata ?H:#$d_eofnblk EOF_NONBLOCK ?H:. -?F:!try !try.out !try.ret !try.err +?F:!try !try.out !try.ret !try.err !mtry ?T:status ?LINT:use d_open3 : check for non-blocking I/O stuff @@ -91,7 +91,7 @@ case "$o_nonblock" in '') $cat head.c > try.c $cat >>try.c <<'EOCP' -main() { +int main() { #ifdef O_NONBLOCK printf("O_NONBLOCK\n"); exit(0); @@ -109,7 +109,7 @@ main() { exit(0); } EOCP - if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then + if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then o_nonblock=`./try` case "$o_nonblock" in '') echo "I can't figure it out, assuming O_NONBLOCK will do.";; @@ -137,7 +137,7 @@ extern int errno; $signal_t blech(x) int x; { exit(3); } EOCP $cat >> try.c <<'EOCP' -main() +int main() { int pd[2]; int pu[2]; @@ -187,7 +187,7 @@ main() exit(0); /* Bye bye, thank you for playing! */ } EOCP - if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then + if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then ?X: Use script to avoid the possible 'alarm call' message echo "$startsh" >mtry echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry @@ -226,7 +226,7 @@ EOCP esac val="$define" if test "$status" = "$rd_nodata"; then - echo "WARNING: you can't distinguish between EOF and no data!" + ./warn "your read() can't distinguish between EOF and no data!" val="$undef" fi else |