Module Name: src
Committed By: kre
Date: Sat Apr 16 14:20:45 UTC 2022
Modified Files:
src/bin/sh: miscbltin.c mystring.c options.c parser.c
Log Message:
Avoid generating error messages implying that user errors are illegal.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/bin/sh/miscbltin.c
cvs rdiff -u -r1.18 -r1.19 src/bin/sh/mystring.c
cvs rdiff -u -r1.56 -r1.57 src/bin/sh/options.c
cvs rdiff -u -r1.177 -r1.178 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/miscbltin.c
diff -u src/bin/sh/miscbltin.c:1.47 src/bin/sh/miscbltin.c:1.48
--- src/bin/sh/miscbltin.c:1.47 Sun Dec 12 11:18:46 2021
+++ src/bin/sh/miscbltin.c Sat Apr 16 14:20:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: miscbltin.c,v 1.47 2021/12/12 11:18:46 andvar Exp $ */
+/* $NetBSD: miscbltin.c,v 1.48 2022/04/16 14:20:45 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: miscbltin.c,v 1.47 2021/12/12 11:18:46 andvar Exp $");
+__RCSID("$NetBSD: miscbltin.c,v 1.48 2022/04/16 14:20:45 kre Exp $");
#endif
#endif /* not lint */
@@ -268,7 +268,8 @@ umaskcmd(int argc, char **argv)
mask = 0;
do {
if (*ap >= '8' || *ap < '0')
- error("Illegal number: %s", argv[1]);
+ error("Not a valid octal number: '%s'",
+ argv[1]);
mask = (mask << 3) + (*ap - '0');
} while (*++ap != '\0');
umask(mask);
Index: src/bin/sh/mystring.c
diff -u src/bin/sh/mystring.c:1.18 src/bin/sh/mystring.c:1.19
--- src/bin/sh/mystring.c:1.18 Fri Jul 13 22:43:44 2018
+++ src/bin/sh/mystring.c Sat Apr 16 14:20:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mystring.c,v 1.18 2018/07/13 22:43:44 kre Exp $ */
+/* $NetBSD: mystring.c,v 1.19 2022/04/16 14:20:45 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)mystring.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: mystring.c,v 1.18 2018/07/13 22:43:44 kre Exp $");
+__RCSID("$NetBSD: mystring.c,v 1.19 2022/04/16 14:20:45 kre Exp $");
#endif
#endif /* not lint */
@@ -117,7 +117,7 @@ number(const char *s)
if (!is_digit(*s) || ((n = strtoimax(s, &ep, 10)),
(ep == NULL || ep == s || *ep != '\0')))
- error("Illegal number: '%s'", s);
+ error("Invalid number: '%s'", s);
if (n < INT_MIN || n > INT_MAX)
error("Number out of range: %s", s);
return (int)n;
Index: src/bin/sh/options.c
diff -u src/bin/sh/options.c:1.56 src/bin/sh/options.c:1.57
--- src/bin/sh/options.c:1.56 Tue Oct 26 00:05:38 2021
+++ src/bin/sh/options.c Sat Apr 16 14:20:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.56 2021/10/26 00:05:38 kre Exp $ */
+/* $NetBSD: options.c,v 1.57 2022/04/16 14:20:45 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: options.c,v 1.56 2021/10/26 00:05:38 kre Exp $");
+__RCSID("$NetBSD: options.c,v 1.57 2022/04/16 14:20:45 kre Exp $");
#endif
#endif /* not lint */
@@ -325,7 +325,7 @@ minus_o(char *name, int val)
#endif
return;
}
- error("Illegal option %co %s", "+-"[val], name);
+ error("Unknown option %co %s", "+-"[val], name);
}
}
@@ -344,7 +344,7 @@ setoption(int flag, int val)
#endif
return;
}
- error("Illegal option %c%c", "+-"[val], flag);
+ error("Unknown option %c%c", "+-"[val], flag);
/* NOTREACHED */
}
@@ -540,7 +540,7 @@ atend:
s[1] = '\0';
err |= setvarsafe("OPTARG", s, 0);
} else {
- outfmt(&errout, "Illegal option -%c\n", c);
+ outfmt(&errout, "Unknown option -%c\n", c);
(void) unsetvar("OPTARG", 0);
}
c = '?';
@@ -631,7 +631,7 @@ nextopt(const char *optstring)
c = *p++;
for (q = optstring ; *q != c ; ) {
if (*q == '\0')
- error("Illegal option -%c", c);
+ error("Unknown option -%c", c);
if (*++q == ':')
q++;
}
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.177 src/bin/sh/parser.c:1.178
--- src/bin/sh/parser.c:1.177 Wed Dec 8 20:21:09 2021
+++ src/bin/sh/parser.c Sat Apr 16 14:20:45 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.177 2021/12/08 20:21:09 andvar Exp $ */
+/* $NetBSD: parser.c,v 1.178 2022/04/16 14:20:45 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.177 2021/12/08 20:21:09 andvar Exp $");
+__RCSID("$NetBSD: parser.c,v 1.178 2022/04/16 14:20:45 kre Exp $");
#endif
#endif /* not lint */
@@ -795,7 +795,8 @@ parsefname(void)
* So, leave it like this until the rest of the parser is fixed.
*/
if (!noexpand(wordtext))
- synerror("Illegal eof marker for << redirection");
+ synerror("Unimplemented form of eof marker"
+ " for << redirection");
rmescapes(wordtext);
here->eofmark = wordtext;
