1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
From 4219adeeef8a3d5447af4c9bd1e4e7c05b3112fd Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Wed, 27 Feb 2019 20:30:21 +0000
Subject: [PATCH 33/57] Fix line counting when reading /etc/hosts.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---
CHANGELOG | 4 ++++
src/cache.c | 16 ++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,10 @@ version 2.81
combinatorial explosion of compile-time options. Thanks to
Kevin Darbyshire-Bryant for the patch.
+ Fix line-counting when reading /etc/hosts and friends; for
+ correct error messages. Thanks to Christian Rosentreter
+ for reporting this.
+
version 2.80
Add support for RFC 4039 DHCP rapid commit. Thanks to Ashram Method
--- a/src/cache.c
+++ b/src/cache.c
@@ -1062,7 +1062,7 @@ static int eatspace(FILE *f)
}
if (c == '\n')
- nl = 1;
+ nl++;
}
}
@@ -1073,7 +1073,7 @@ static int gettok(FILE *f, char *token)
while (1)
{
if ((c = getc(f)) == EOF)
- return (count == 0) ? EOF : 1;
+ return (count == 0) ? -1 : 1;
if (isspace(c) || c == '#')
{
@@ -1093,7 +1093,7 @@ int read_hostsfile(char *filename, unsig
{
FILE *f = fopen(filename, "r");
char *token = daemon->namebuff, *domain_suffix = NULL;
- int addr_count = 0, name_count = cache_size, lineno = 0;
+ int addr_count = 0, name_count = cache_size, lineno = 1;
unsigned int flags = 0;
union all_addr addr;
int atnl, addrlen = 0;
@@ -1104,12 +1104,10 @@ int read_hostsfile(char *filename, unsig
return cache_size;
}
- eatspace(f);
+ lineno += eatspace(f);
- while ((atnl = gettok(f, token)) != EOF)
+ while ((atnl = gettok(f, token)) != -1)
{
- lineno++;
-
if (inet_pton(AF_INET, token, &addr) > 0)
{
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4;
@@ -1145,7 +1143,7 @@ int read_hostsfile(char *filename, unsig
int fqdn, nomem;
char *canon;
- if ((atnl = gettok(f, token)) == EOF)
+ if ((atnl = gettok(f, token)) == -1)
break;
fqdn = !!strchr(token, '.');
@@ -1178,6 +1176,8 @@ int read_hostsfile(char *filename, unsig
else if (!nomem)
my_syslog(LOG_ERR, _("bad name at %s line %d"), filename, lineno);
}
+
+ lineno += atnl;
}
fclose(f);
|
