summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-08-02 11:05:55 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2007-08-02 11:05:55 +0000
commite101b27e8e2279911c8ba86f22593600e2ddc678 (patch)
tree8b7a876b8b301a96219f3d37b6596155ea43f6fa /bin
parent9dda5c595b41eed3745b4cb17c1accc1db26db6f (diff)
backout last change; iff is right.
prompted by deraadt@
Diffstat (limited to 'bin')
-rw-r--r--bin/ksh/NEWS4
-rw-r--r--bin/ksh/NOTES4
-rw-r--r--bin/ksh/eval.c4
-rw-r--r--bin/ksh/misc.c4
-rw-r--r--bin/ksh/var.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/bin/ksh/NEWS b/bin/ksh/NEWS
index 0bf957d6b13..93faac92178 100644
--- a/bin/ksh/NEWS
+++ b/bin/ksh/NEWS
@@ -57,7 +57,7 @@ Version 5.2.13
* editing: completion after "cmd " now completes files (was command).
-$OpenBSD: NEWS,v 1.14 2007/08/02 10:56:25 fgsch Exp $
+$OpenBSD: NEWS,v 1.15 2007/08/02 11:05:54 fgsch Exp $
Version 5.2.12
@@ -262,7 +262,7 @@ Version 5.2.3
* test -o option: if option starts with a !, the test is negated. The test
always fails if the option doesn't exist (so [ -o foo -o -o !foo ] is true
- if option foo exists).
+ iff option foo exists).
* new option: set -o nohup (currently on by default) - if set, running jobs
are not kill -HUP'd when a login shell exits; if clear, they are. In
diff --git a/bin/ksh/NOTES b/bin/ksh/NOTES
index 13e0744aa64..e5e02b1cbd8 100644
--- a/bin/ksh/NOTES
+++ b/bin/ksh/NOTES
@@ -1,4 +1,4 @@
-$OpenBSD: NOTES,v 1.10 2007/08/02 10:56:25 fgsch Exp $
+$OpenBSD: NOTES,v 1.11 2007/08/02 11:05:54 fgsch Exp $
General features of at&t ksh88 that are not (yet) in pdksh:
- exported aliases and functions (not in ksh93).
@@ -507,7 +507,7 @@ POSIX sh questions (references are to POSIX 1003.2-1992)
bar?)
- what action should be taken if there is an error doing a dup due
to system limits (eg, not enough feil destriptors): is this
- a "redirection error" (in which case a script will exit if the
+ a "redirection error" (in which case a script will exit iff the
error occured while executing a special built-in)?
IMHO, shell should exit script. Couldn't find a blanket statement
like "if shell encounters an unexpected system error, it shall
diff --git a/bin/ksh/eval.c b/bin/ksh/eval.c
index abc9889aa2a..0af321366bb 100644
--- a/bin/ksh/eval.c
+++ b/bin/ksh/eval.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eval.c,v 1.32 2007/08/02 10:56:25 fgsch Exp $ */
+/* $OpenBSD: eval.c,v 1.33 2007/08/02 11:05:54 fgsch Exp $ */
/*
* Expansion - quoting, separation, substitution, globbing
@@ -681,7 +681,7 @@ expand(char *cp, /* input word */
static int
varsub(Expand *xp, char *sp, char *word,
int *stypep, /* becomes qualifier type */
- int *slenp) /* " " len (=, :=, etc.) valid if *stypep != 0 */
+ int *slenp) /* " " len (=, :=, etc.) valid iff *stypep != 0 */
{
int c;
int state; /* next state: XBASE, XARG, XSUB, XNULLSUB */
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 5c3b5913250..24844c013e0 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.31 2007/08/02 10:56:25 fgsch Exp $ */
+/* $OpenBSD: misc.c,v 1.32 2007/08/02 11:05:54 fgsch Exp $ */
/*
* Miscellaneous functions
@@ -495,7 +495,7 @@ gmatch(const char *s, const char *p, int isfile)
return 0;
se = s + strlen(s);
pe = p + strlen(p);
- /* isfile is false if no syntax check has been done on
+ /* isfile is false iff no syntax check has been done on
* the pattern. If check fails, just to a strcmp().
*/
if (!isfile && !has_globbing(p, pe)) {
diff --git a/bin/ksh/var.c b/bin/ksh/var.c
index f357e01aad4..1d88e50be49 100644
--- a/bin/ksh/var.c
+++ b/bin/ksh/var.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: var.c,v 1.32 2007/08/02 10:56:25 fgsch Exp $ */
+/* $OpenBSD: var.c,v 1.33 2007/08/02 11:05:54 fgsch Exp $ */
#include "sh.h"
#include <time.h>
@@ -981,7 +981,7 @@ setspec(struct tbl *vp)
afree(tmpdir, APERM);
tmpdir = (char *) 0;
}
- /* Use tmpdir if it is an absolute path, is writable and
+ /* Use tmpdir iff it is an absolute path, is writable and
* searchable and is a directory...
*/
{