aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2014-02-03 18:31:51 +0000
committerWarner Losh <imp@FreeBSD.org>2014-02-03 18:31:51 +0000
commit87fbb90b997fec9183274d3edfbd1df97efc43ac (patch)
tree6077fd17ffd56c7bf6b4b5998bb00cb0cf3ef7ed /usr.sbin
parentf0d701f048f67a3137e808a90ef5dd8d357fc2bc (diff)
downloadsrc-87fbb90b997fec9183274d3edfbd1df97efc43ac.tar.gz
src-87fbb90b997fec9183274d3edfbd1df97efc43ac.zip
Better error messages when EOF is hit in the middle of a phrase.
Notes
Notes: svn path=/head/; revision=261442
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/config/mkmakefile.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 7d374756778b..7b114412e86e 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -329,9 +329,7 @@ next:
}
if (eq(wd, "include")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
fprintf(stderr, "%s: missing include filename.\n",
fname);
exit(1);
@@ -436,9 +434,7 @@ nextparam:
}
if (eq(wd, "dependency")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
fprintf(stderr,
"%s: %s missing dependency string.\n",
fname, this);
@@ -449,9 +445,7 @@ nextparam:
}
if (eq(wd, "clean")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
fprintf(stderr, "%s: %s missing clean file list.\n",
fname, this);
exit(1);
@@ -461,9 +455,7 @@ nextparam:
}
if (eq(wd, "compile-with")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
fprintf(stderr,
"%s: %s missing compile command string.\n",
fname, this);
@@ -474,9 +466,7 @@ nextparam:
}
if (eq(wd, "warning")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
fprintf(stderr,
"%s: %s missing warning text string.\n",
fname, this);
@@ -487,9 +477,7 @@ nextparam:
}
if (eq(wd, "obj-prefix")) {
wd = get_quoted_word(fp);
- if (wd == (char *)EOF)
- return;
- if (wd == 0) {
+ if (wd == (char *)EOF || wd == 0) {
printf("%s: %s missing object prefix string.\n",
fname, this);
exit(1);