[src/netbsd-6]: src/usr.sbin/npf/npfctl Pull up following revision(s) (reques...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a231ec591f71
branches:  netbsd-6
changeset: 774640:a231ec591f71
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Oct 09 23:08:21 2012 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #590):
        usr.sbin/npf/npfctl/npf_parse.y: revision 1.14
npfctl/yyerror(): print the right line number if we already parsed the line.

diffstat:

 usr.sbin/npf/npfctl/npf_parse.y |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 3846b61aa8f6 -r a231ec591f71 usr.sbin/npf/npfctl/npf_parse.y
--- a/usr.sbin/npf/npfctl/npf_parse.y   Tue Oct 09 23:06:13 2012 +0000
+++ b/usr.sbin/npf/npfctl/npf_parse.y   Tue Oct 09 23:08:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_parse.y,v 1.3.2.6 2012/08/13 17:49:52 riz Exp $    */
+/*     $NetBSD: npf_parse.y,v 1.3.2.7 2012/10/09 23:08:21 riz Exp $    */
 
 /*-
  * Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -55,17 +55,23 @@
        extern char *yytext;
 
        char *msg, *context = xstrndup(yytext, yyleng);
-       size_t len = strlen(context);
-       char *dst = zalloc(len * 4 + 1);
+       bool eol = (*context == '\n');
        va_list ap;
 
        va_start(ap, fmt);
        vasprintf(&msg, fmt, ap);
        va_end(ap);
 
-       strvisx(dst, context, len, VIS_WHITE|VIS_CSTYLE);
-       fprintf(stderr, "%s:%d:%d: %s near '%s'\n", yyfilename, yylineno,
-           yycolumn, msg, dst);
+       fprintf(stderr, "%s:%d:%d: %s", yyfilename,
+           yylineno - (int)eol, yycolumn, msg);
+       if (!eol) {
+               size_t len = strlen(context);
+               char *dst = zalloc(len * 4 + 1);
+
+               strvisx(dst, context, len, VIS_WHITE|VIS_CSTYLE);
+               fprintf(stderr, " near '%s'", dst);
+       }
+       fprintf(stderr, "\n");
        exit(EXIT_FAILURE);
 }