Date: Mon, 3 Feb 2014 18:31:51 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261442 - head/usr.sbin/config Message-ID: <201402031831.s13IVpaw003947@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Feb 3 18:31:51 2014 New Revision: 261442 URL: http://svnweb.freebsd.org/changeset/base/261442 Log: Better error messages when EOF is hit in the middle of a phrase. Modified: head/usr.sbin/config/mkmakefile.c Modified: head/usr.sbin/config/mkmakefile.c ============================================================================== --- head/usr.sbin/config/mkmakefile.c Mon Feb 3 17:33:06 2014 (r261441) +++ head/usr.sbin/config/mkmakefile.c Mon Feb 3 18:31:51 2014 (r261442) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402031831.s13IVpaw003947>