summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAleksey Demakov <a.demakov@pengutronix.de>2008-03-31 06:50:07 +0000
committerAleksey Demakov <a.demakov@pengutronix.de>2008-03-31 06:50:07 +0000
commitd932d1cf384dbd3f26fd110e24b1455c266a7889 (patch)
treeb9f06891bd1c95784d69fdbeb46d3c0189c07e19 /patches
parent1e596f06d5940006f80eb649165a2131fc54e34b (diff)
downloadptxdist-d932d1cf384dbd3f26fd110e24b1455c266a7889.tar.gz
ptxdist-d932d1cf384dbd3f26fd110e24b1455c266a7889.tar.xz
new busubox-1.10.0 upstream patch
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7890 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/busybox-1.10.0/generic/busybox-1.10.0-fuser.patch52
-rw-r--r--patches/busybox-1.10.0/generic/series1
2 files changed, 53 insertions, 0 deletions
diff --git a/patches/busybox-1.10.0/generic/busybox-1.10.0-fuser.patch b/patches/busybox-1.10.0/generic/busybox-1.10.0-fuser.patch
new file mode 100644
index 000000000..149d0d5d8
--- /dev/null
+++ b/patches/busybox-1.10.0/generic/busybox-1.10.0-fuser.patch
@@ -0,0 +1,52 @@
+Subject: busybox 1.10.0 fixes
+From: http://busybox.net/downloads/fixes-1.10.0
+
+---
+ procps/fuser.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+Index: busybox-1.10.0/procps/fuser.c
+===================================================================
+--- busybox-1.10.0.orig/procps/fuser.c
++++ busybox-1.10.0/procps/fuser.c
+@@ -57,11 +57,11 @@ static int file_to_dev_inode(const char
+
+ 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 *add_inode(inode_list
+ 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 @@ static inode_list *scan_proc_net(const c
+
+ tmp_dev = find_socket_dev();
+
+- sprintf(path, "net/%s", proto);
++ sprintf(path, "/proc/net/%s", proto);
+ f = fopen(path, "r");
+ if (!f)
+ return ilist;
+@@ -314,8 +314,6 @@ Find processes which use FILEs or PORTs
+ opt = getopt32(argv, OPTION_STRING);
+ argv += optind;
+
+- xchdir("/proc");
+-
+ ilist = NULL;
+ pp = argv;
+ while (*pp) {
diff --git a/patches/busybox-1.10.0/generic/series b/patches/busybox-1.10.0/generic/series
index 7ba0623f8..e3c18ab7f 100644
--- a/patches/busybox-1.10.0/generic/series
+++ b/patches/busybox-1.10.0/generic/series
@@ -1,3 +1,4 @@
busybox-1.10.0-tail.patch
busybox-1.10.0-taskset.patch
busybox-1.10.0-udhcp.patch
+busybox-1.10.0-fuser.patch