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

get rid of unnecessary fgets() buffer size limitation 

fgets() will read at most size-1 bytes into the buffer and add a
terminating null-char at the end. Therefore it is not necessary to pass
a reduced buffer size when calling it.

This change was generated using the following semantic patch:

@@
identifier buf, fp;
@@
- fgets(buf, sizeof(buf) - 1, fp)
+ fgets(buf, sizeof(buf), fp)

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2015-11-28 01:00:05 +01:00 committed by Stephen Hemminger
parent d572ed4d0a
commit 61170fd88d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/arpd.c
View File

@ -703,7 +703,7 @@ int main(int argc, char **argv)
} }
buf[sizeof(buf)-1] = 0; buf[sizeof(buf)-1] = 0;
while (fgets(buf, sizeof(buf)-1, fp)) { while (fgets(buf, sizeof(buf), fp)) {
__u8 b1[6]; __u8 b1[6];
char ipbuf[128]; char ipbuf[128];
char macbuf[128]; char macbuf[128];

8
misc/ss.c
View File

@ -2729,7 +2729,7 @@ static int unix_show(struct filter *f)
if ((fp = net_unix_open()) == NULL) if ((fp = net_unix_open()) == NULL)
return -1; return -1;
if (!fgets(buf, sizeof(buf)-1, fp)) { if (!fgets(buf, sizeof(buf), fp)) {
fclose(fp); fclose(fp);
return -1; return -1;
} }
@ -2738,7 +2738,7 @@ static int unix_show(struct filter *f)
newformat = 1; newformat = 1;
cnt = 0; cnt = 0;
while (fgets(buf, sizeof(buf)-1, fp)) { while (fgets(buf, sizeof(buf), fp)) {
struct sockstat *u, **insp; struct sockstat *u, **insp;
int flags; int flags;
@ -3217,12 +3217,12 @@ static int netlink_show(struct filter *f)
if ((fp = net_netlink_open()) == NULL) if ((fp = net_netlink_open()) == NULL)
return -1; return -1;
if (!fgets(buf, sizeof(buf)-1, fp)) { if (!fgets(buf, sizeof(buf), fp)) {
fclose(fp); fclose(fp);
return -1; return -1;
} }
while (fgets(buf, sizeof(buf)-1, fp)) { while (fgets(buf, sizeof(buf), fp)) {
sscanf(buf, "%llx %d %d %x %d %d %llx %d", sscanf(buf, "%llx %d %d %x %d %d %llx %d",
&sk, &sk,
&prot, &pid, &groups, &rq, &wq, &cb, &rc); &prot, &pid, &groups, &rq, &wq, &cb, &rc);