diff options
| author | Steve Hill <quagga@cheesy.sackheads.org> | 2009-07-28 16:36:14 -0400 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2014-09-19 22:14:54 +0100 |
| commit | ea55500409651b0f8fd2c8a02fdbf245acc96dd8 (patch) | |
| tree | 74f195200f595ae96363e007103e77654ace3f4d /lib/command.c | |
| parent | d4a8607d12e1d3f655055647f1633ec154685545 (diff) | |
| download | quagga-ea55500409651b0f8fd2c8a02fdbf245acc96dd8.tar.bz2 quagga-ea55500409651b0f8fd2c8a02fdbf245acc96dd8.tar.xz | |
lib: Improve error reporting from broken config files
* command.h: (config_from_file) Add variable to interface for line
number reporting.
* command.c: (config_from_file) Set & increment 'line_num' while parsing.
* vty.c: (vty_read_file) Report parse errors in the correct order to
stderr, with added line numbers.
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/command.c b/lib/command.c index 7249c653..1087ceb8 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2762,13 +2762,15 @@ cmd_execute_command_strict (vector vline, struct vty *vty, /* Configration make from file. */ int -config_from_file (struct vty *vty, FILE *fp) +config_from_file (struct vty *vty, FILE *fp, unsigned int *line_num) { int ret; + *line_num = 0; vector vline; while (fgets (vty->buf, VTY_BUFSIZ, fp)) { + ++(*line_num); vline = cmd_make_strvec (vty->buf); /* In case of comment line */ |