In case the commented out line was longer than the buffer size,
the remaining part was previously not properly skipped.
With this fix we should now continue ignoring lines starting with #
until we find a newline character.
Signed-off-by: Andreas Henriksson <andr...@fatal.se>
---
misc/arpd.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/misc/arpd.c b/misc/arpd.c
index 700dc50..a4f0f0d 100644
--- a/misc/arpd.c
+++ b/misc/arpd.c
@@ -691,6 +691,7 @@ int main(int argc, char **argv)
FILE *fp;
struct dbkey k;
DBT dbkey, dbdat;
+ int skip_until_eol = 0;
dbkey.data = &k;
dbkey.size = sizeof(k);
@@ -707,8 +708,19 @@ int main(int argc, char **argv)
char ipbuf[128];
char macbuf[128];
- if (buf[0] == '#')
+ /* skip remaining part of commented outline. */
+ if (skip_until_eol) {
+ if (strrchr(buf, '\n') != NULL)
+ skip_until_eol = 0;
continue;
+ }
+
+ /* skip (beginning of) commented out line. */
+ if (buf[0] == '#') {
+ if (strrchr(buf, '\n') == NULL)
+ skip_until_eol = 1;
+ continue;
+ }
if (sscanf(buf, "%u%s%s", &k.iface, ipbuf, macbuf) !=
3) {
fprintf(stderr, "Wrong format of input file
\"%s\"\n", do_load);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
