matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix line numbering on batch commands 

ip command should not keep track of lineno, that is done
in getcmdline().
This commit is contained in:
Stephen Hemminger 2010-03-03 16:31:09 -08:00
parent 8ecdcce083
commit 3e4f6a380a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ip/ip.c
View File

@ -96,7 +96,6 @@ static int batch(const char *name)
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
int ret = 0; int ret = 0;
int lineno = 0;
if (name && strcmp(name, "-") != 0) { if (name && strcmp(name, "-") != 0) {
if (freopen(name, "r", stdin) == NULL) { if (freopen(name, "r", stdin) == NULL) {
@ -111,6 +110,7 @@ static int batch(const char *name)
return -1; return -1;
} }
cmdlineno = 0;
while (getcmdline(&line, &len, stdin) != -1) { while (getcmdline(&line, &len, stdin) != -1) {
char *largv[100]; char *largv[100];
int largc; int largc;
@ -120,7 +120,7 @@ static int batch(const char *name)
continue; /* blank line */ continue; /* blank line */
if (do_cmd(largv[0], largc, largv)) { if (do_cmd(largv[0], largc, largv)) {
fprintf(stderr, "Command failed %s:%d\n", name, lineno); fprintf(stderr, "Command failed %s:%d\n", name, cmdlineno);
ret = 1; ret = 1;
if (!force) if (!force)
break; break;