Module Name: src
Committed By: christos
Date: Tue May 12 14:29:06 UTC 2020
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: extern.h setkey.c token.l
Log Message:
Keep track of the filename to print in error messages.
Change quoting of error string from [] to `'.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/setkey/extern.h
cvs rdiff -u -r1.20 -r1.21 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/setkey/token.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/setkey/extern.h
diff -u src/crypto/dist/ipsec-tools/src/setkey/extern.h:1.7 src/crypto/dist/ipsec-tools/src/setkey/extern.h:1.8
--- src/crypto/dist/ipsec-tools/src/setkey/extern.h:1.7 Sun Oct 14 04:27:39 2018
+++ src/crypto/dist/ipsec-tools/src/setkey/extern.h Tue May 12 10:29:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.7 2018/10/14 08:27:39 maxv Exp $ */
+/* $NetBSD: extern.h,v 1.8 2020/05/12 14:29:06 christos Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
void parse_init(void);
/* token.l */
-int parse(FILE **);
+int parse(const char *, FILE *);
int parse_string(char *);
/* setkey.c */
@@ -46,6 +46,7 @@ void yyerror(const char *);
#ifdef HAVE_POLICY_FWD
extern int f_rfcmode;
#endif
+extern const char *filename;
extern int lineno;
extern int exit_now;
#ifdef HAVE_PFKEY_POLICY_PRIORITY
Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.20 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.21
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.20 Sun Feb 3 05:23:42 2019
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c Tue May 12 10:29:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: setkey.c,v 1.20 2019/02/03 10:23:42 mrg Exp $ */
+/* $NetBSD: setkey.c,v 1.21 2020/05/12 14:29:06 christos Exp $ */
/* $KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $ */
/*
@@ -149,6 +149,7 @@ rkwarn(void)
#endif
int lineno;
+const char *filename;
int exit_now;
static time_t thiszone;
@@ -172,6 +173,7 @@ int
main(int argc, char **argv)
{
FILE *fp = stdin;
+ const char *fname = "<stdin>";
int c;
if (argc == 1) {
@@ -193,9 +195,11 @@ main(int argc, char **argv)
f_mode = MODE_SCRIPT;
if (strcmp(optarg, "-") == 0) {
fp = stdin;
+ fname = "<stdin>";
} else if ((fp = fopen(optarg, "r")) == NULL) {
err(1, "Can't open `%s'", optarg);
}
+ fname = optarg;
break;
case 'D':
f_mode = MODE_CMDDUMP;
@@ -286,7 +290,7 @@ main(int argc, char **argv)
if (get_supported() < 0) {
errx(1, "%s", ipsec_strerror());
}
- if (parse(&fp))
+ if (parse(fname, fp))
exit(1);
break;
case MODE_STDIN:
@@ -826,7 +830,7 @@ verifypriority(struct sadb_msg *m)
#endif
static int
-fileproc(const char *filename)
+fileproc(const char *fname)
{
int fd;
ssize_t len, l;
@@ -834,7 +838,7 @@ fileproc(const char *filename)
struct sadb_msg *msg;
u_char rbuf[1024 * 32]; /* XXX: Enough ? Should I do MSG_PEEK ? */
- fd = open(filename, O_RDONLY);
+ fd = open(fname, O_RDONLY);
if (fd < 0)
return -1;
Index: src/crypto/dist/ipsec-tools/src/setkey/token.l
diff -u src/crypto/dist/ipsec-tools/src/setkey/token.l:1.24 src/crypto/dist/ipsec-tools/src/setkey/token.l:1.25
--- src/crypto/dist/ipsec-tools/src/setkey/token.l:1.24 Sun May 10 15:54:49 2020
+++ src/crypto/dist/ipsec-tools/src/setkey/token.l Tue May 12 10:29:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: token.l,v 1.24 2020/05/10 19:54:49 christos Exp $ */
+/* $NetBSD: token.l,v 1.25 2020/05/12 14:29:06 christos Exp $ */
/* $KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $ */
/*
@@ -336,23 +336,23 @@ yyfatal(const char *s)
void
yyerror(const char *s)
{
- warnx("line %d: %s at [%s]", lineno, s, yytext);
+ warnx("%s,%d: %s at `%s'", filename, lineno, s, yytext);
}
int
-parse(FILE **fp)
+parse(const char *fname, FILE *fp)
{
- yyin = *fp;
-
+ yyin = fp;
+ filename = fname;
lineno = 1;
parse_init();
if (yyparse()) {
- warnx("line %d: parse failed", lineno);
- return(-1);
+ warnx("%s,%d: parse failed", filename, lineno);
+ return -1;
}
- return(0);
+ return 0;
}
int
