busybox: additional 1.10.0 fixes

This commit is contained in:
Peter Korsgaard 2008-03-30 14:37:06 +00:00
parent 49bb82c9f4
commit 399a1f27fa

View File

@ -0,0 +1,43 @@
--- busybox-1.10.0/procps/fuser.c Thu Mar 20 12:47:05 2008
+++ busybox-1.10.0-fuser/procps/fuser.c Sat Mar 29 18:55:23 2008
@@ -57,11 +57,11 @@
static char *parse_net_arg(const char *arg, unsigned *port)
{
- char path[12], tproto[5];
+ char path[20], tproto[5];
if (sscanf(arg, "%u/%4s", port, tproto) != 2)
return NULL;
- sprintf(path, "net/%s", tproto);
+ sprintf(path, "/proc/net/%s", tproto);
if (access(path, R_OK) != 0)
return NULL;
return xstrdup(tproto);
@@ -99,7 +99,7 @@
static inode_list *scan_proc_net(const char *proto,
unsigned port, inode_list *ilist)
{
- char path[12], line[MAX_LINE + 1];
+ char path[20], line[MAX_LINE + 1];
char addr[128];
ino_t tmp_inode;
dev_t tmp_dev;
@@ -109,7 +109,7 @@
tmp_dev = find_socket_dev();
- sprintf(path, "net/%s", proto);
+ sprintf(path, "/proc/net/%s", proto);
f = fopen(path, "r");
if (!f)
return ilist;
@@ -313,8 +313,6 @@
opt = getopt32(argv, OPTION_STRING);
argv += optind;
-
- xchdir("/proc");
ilist = NULL;
pp = argv;