From 47c2eea2dd1c72c4a61e4162ee31d581563e8c58 Mon Sep 17 00:00:00 2001 From: shivers Date: Mon, 11 Nov 1996 18:52:19 +0000 Subject: [PATCH] Changed OPEN/NONBLOCKING to OPEN/NON-BLOCKING and SET-RECORD-LOCK-NOBLOCK to SET-RECORD-LOCK-NO-BLOCK. The former was always documented to be OPEN/NON-BLOCKING and the latter isn't exported in any event. --- NEWS | 6 +++++- scsh/aix/fdflags.scm | 4 ++-- scsh/bsd/fdflags.scm | 4 ++-- scsh/cxux/fdflags.scm | 2 +- scsh/flock.scm | 2 +- scsh/generic/fdflags.scm | 4 ++-- scsh/hpux/fdflags.scm | 4 ++-- scsh/irix/fdflags.scm | 4 ++-- scsh/linux/fdflags.scm | 4 ++-- scsh/next/fdflags.scm | 4 ++-- scsh/scsh-interfaces.scm | 4 ++-- scsh/solaris/fdflags.scm | 4 ++-- scsh/sunos/fdflags.scm | 4 ++-- scsh/ultrix/fdflags.scm | 4 ++-- 14 files changed, 29 insertions(+), 25 deletions(-) diff --git a/NEWS b/NEWS index 2647a90..0fa6c01 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,9 @@ Recent changes to the Scheme Shell. Now we do. Really. Installed & documented. Hopefully, bdc will change this line to say the static heap linker is documented. + Name-consistency change (non-backwards compatible): + open/nonblocking renamed to open/non-blocking, + which is the way it was always described in the manual. 11/03/96 (version 0.4.4) minor fixes for SunOS, Solaris, AIX, NeXTStep, 686 systems @@ -33,7 +36,8 @@ Recent changes to the Scheme Shell. switch and with the (DUMP-SCSH-PROGRAM ) are now equivalent in that both pass a list of command-line arguments that includes the program name. The two start-up methods - were not the same in the previous release. + were not the same in the previous release. N.B.: This is not + backwards-compatible with older releases' DUMP-SCSH-PROGRAM. 10/31/95 (version 0.4.0) New minor versioning introduced diff --git a/scsh/aix/fdflags.scm b/scsh/aix/fdflags.scm index 5b9fb0a..3bde3ba 100644 --- a/scsh/aix/fdflags.scm +++ b/scsh/aix/fdflags.scm @@ -10,7 +10,7 @@ (create #x0100) (exclusive #x0400) (no-control-tty #x0800) - (nonblocking #x0004) + (non-blocking #x0004) (truncate #x0200) ;;; Not POSIX. @@ -29,7 +29,7 @@ (get-status-flags 3) ; F_GETFL (set-status-flags 4) ; F_SETFL (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/bsd/fdflags.scm b/scsh/bsd/fdflags.scm index fd342ba..3139743 100644 --- a/scsh/bsd/fdflags.scm +++ b/scsh/bsd/fdflags.scm @@ -7,7 +7,7 @@ (read #x0000) (write #x0001) (read+write #x0002) - (nonblocking #x0004) ; no delay + (non-blocking #x0004) ; no delay (append #x0008) ; set append mode ;; BSD4.4-Lite @@ -36,7 +36,7 @@ (get-owner 5) ; F_GETOWN (Not POSIX) (set-owner 6) ; F_SETOWN (Not POSIX) (get-record-lock 7) ; F_GETLK - (set-record-lock-noblock 8) ; F_SETLK + (set-record-lock-no-block 8) ; F_SETLK (set-record-lock 9)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/cxux/fdflags.scm b/scsh/cxux/fdflags.scm index 72f4d5c..f468086 100644 --- a/scsh/cxux/fdflags.scm +++ b/scsh/cxux/fdflags.scm @@ -9,7 +9,7 @@ (create #o00400) (exclusive #o02000) (no-control-tty #o04000) - (nonblocking #o00100) + (non-blocking #o00100) (truncate #o01000) ;;; Not POSIX. diff --git a/scsh/flock.scm b/scsh/flock.scm index c45133b..2f7ac80 100644 --- a/scsh/flock.scm +++ b/scsh/flock.scm @@ -101,7 +101,7 @@ ;;; Return true/false indicating success/failure. (define (lock-region/no-block fdes lock) - (cond ((call-lock-region %set-lock fcntl/set-record-lock-noblock fdes lock) + (cond ((call-lock-region %set-lock fcntl/set-record-lock-no-block fdes lock) => (lambda (errno) (cond ((or (= errno errno/again) (= errno errno/acces)) #f) ((= errno errno/intr) (lock-region/no-block fdes lock)) diff --git a/scsh/generic/fdflags.scm b/scsh/generic/fdflags.scm index 8a17fa5..987ed71 100644 --- a/scsh/generic/fdflags.scm +++ b/scsh/generic/fdflags.scm @@ -9,7 +9,7 @@ (create #x0200) (exclusive #x0800) (no-control-tty #x8000) - (nonblocking #x4000) + (non-blocking #x4000) (truncate #x0400) ;;; Not POSIX. @@ -28,7 +28,7 @@ (get-status-flags 3) ; F_GETFL (set-status-flags 4) ; F_SETFL (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/hpux/fdflags.scm b/scsh/hpux/fdflags.scm index 5c4a262..367426f 100644 --- a/scsh/hpux/fdflags.scm +++ b/scsh/hpux/fdflags.scm @@ -6,7 +6,7 @@ (read 0) (write 1) (read+write 2) - (nonblocking #o200000) + (non-blocking #o200000) (append #o10) (no-control-tty #o400000) (create #o0400) @@ -28,7 +28,7 @@ (get-status-flags 3) ; F_GETFL (set-status-flags 4) ; F_SETFL (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/irix/fdflags.scm b/scsh/irix/fdflags.scm index 8cadcee..04fcbba 100644 --- a/scsh/irix/fdflags.scm +++ b/scsh/irix/fdflags.scm @@ -9,7 +9,7 @@ (create #x100) (exclusive #x400) (no-control-tty #x800) - (nonblocking #x80) + (non-blocking #x80) (truncate #x200) ;;; Not POSIX. @@ -28,7 +28,7 @@ (get-status-flags 3) ; F_GETFL (set-status-flags 4) ; F_SETFL (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/linux/fdflags.scm b/scsh/linux/fdflags.scm index af7ad0b..0decd14 100644 --- a/scsh/linux/fdflags.scm +++ b/scsh/linux/fdflags.scm @@ -7,7 +7,7 @@ (read #x0000) (write #x0001) (read+write #x0002) - (nonblocking #x0800) ; no delay + (non-blocking #x0800) ; no delay (append #x0400) ; set append mode ;; Linux @@ -38,7 +38,7 @@ (get-owner 9) ; F_GETOWN (Not POSIX) (set-owner 8) ; F_SETOWN (Not POSIX) (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/next/fdflags.scm b/scsh/next/fdflags.scm index 4645bfe..ca92d99 100644 --- a/scsh/next/fdflags.scm +++ b/scsh/next/fdflags.scm @@ -6,7 +6,7 @@ (read 0) (write 1) (read+write 2) - (nonblocking 4) + (non-blocking 4) (append #o10) (no-control-tty #o20) (create #o1000) @@ -32,7 +32,7 @@ (get-owner 5) ; F_GETOWN (Not POSIX) (set-owner 6) ; F_SETOWN (Not POSIX) (get-record-lock 7) ; F_GETLK - (set-record-lock-noblock 8) ; F_SETLK + (set-record-lock-no-block 8) ; F_SETLK (set-record-lock 9)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/scsh-interfaces.scm b/scsh/scsh-interfaces.scm index 2cec9f9..6a167ee 100644 --- a/scsh/scsh-interfaces.scm +++ b/scsh/scsh-interfaces.scm @@ -6,7 +6,7 @@ (export open/read open/write open/read+write - open/nonblocking + open/non-blocking open/append open/no-control-tty open/create @@ -21,7 +21,7 @@ fcntl/set-status-flags fcntl/get-record-lock fcntl/set-record-lock - fcntl/set-record-lock-noblock + fcntl/set-record-lock-no-block fdflags/close-on-exec diff --git a/scsh/solaris/fdflags.scm b/scsh/solaris/fdflags.scm index 7993307..a5bc4c3 100644 --- a/scsh/solaris/fdflags.scm +++ b/scsh/solaris/fdflags.scm @@ -10,7 +10,7 @@ (create #x0100) (exclusive #x0400) (no-control-tty #x800) ;claims to be POSIX - (nonblocking #x80) ;claims to be POSIX + (non-blocking #x80) ;claims to be POSIX (truncate #x0200) ;;; Not POSIX. @@ -31,7 +31,7 @@ (get-owner 23) ; F_GETOWN (Not Posix) (set-owner 24) ; F_SETOWN (Not Posix) (get-record-lock 5) ; F_GETLK - (set-record-lock-noblock 6) ; F_SETLK + (set-record-lock-no-block 6) ; F_SETLK (set-record-lock 7)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/sunos/fdflags.scm b/scsh/sunos/fdflags.scm index 9855e3b..9d58572 100644 --- a/scsh/sunos/fdflags.scm +++ b/scsh/sunos/fdflags.scm @@ -9,7 +9,7 @@ (create #x0200) (exclusive #x0800) (no-control-tty #x8000) - (nonblocking #x4000) + (non-blocking #x4000) (truncate #x0400) ;;; Not POSIX. @@ -30,7 +30,7 @@ (get-owner 5) ; F_GETOWN (Not Posix) (set-owner 6) ; F_SETOWN (Not Posix) (get-record-lock 7) ; F_GETLK - (set-record-lock-noblock 8) ; F_SETLK + (set-record-lock-no-block 8) ; F_SETLK (set-record-lock 9)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD) diff --git a/scsh/ultrix/fdflags.scm b/scsh/ultrix/fdflags.scm index 8e7b186..f1d64e9 100644 --- a/scsh/ultrix/fdflags.scm +++ b/scsh/ultrix/fdflags.scm @@ -10,7 +10,7 @@ (create #o01000) (exclusive #o04000) (no-control-tty #o20000000) - (nonblocking #o4000000) + (non-blocking #o4000000) (truncate #o2000) ;;; Not POSIX. (no-delay #o0004) @@ -33,7 +33,7 @@ (get-status-flags 3) ; F_GETFL (set-status-flags 4) ; F_SETFL (get-record-lock 7) ; F_GETLK - (set-record-lock-noblock 8) ; F_SETLK + (set-record-lock-no-block 8) ; F_SETLK (set-record-lock 9)) ; F_SETLKW ;;; fcntl fdes-flags (F_GETFD)