summaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-01-12 09:36:57 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-01-12 09:36:57 +0000
commit1e38a548bc9e471524bf0e6b5b5d2d2c0f831a8b (patch)
treef9b4bbfb8985c1509b0223eae92235f7bb58ad4c /package/busybox
parent2dcd4dedc705ba18edf6d525fdea554c5bd6d1ce (diff)
downloadbuildroot-novena-1e38a548bc9e471524bf0e6b5b5d2d2c0f831a8b.tar.gz
buildroot-novena-1e38a548bc9e471524bf0e6b5b5d2d2c0f831a8b.zip
busybox: 1.13.2 mdev fix
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/busybox-1.13.2-mdev.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.13.2-mdev.patch b/package/busybox/busybox-1.13.2-mdev.patch
new file mode 100644
index 000000000..bd17f9912
--- /dev/null
+++ b/package/busybox/busybox-1.13.2-mdev.patch
@@ -0,0 +1,39 @@
+--- busybox-1.13.2/testsuite/mdev.tests Sun Nov 9 18:28:19 2008
++++ busybox-1.13.2-mdev/testsuite/mdev.tests Mon Jan 12 08:59:15 2009
+@@ -111,6 +111,22 @@
+
+ # continuing to use directory structure from prev test
+ rm -rf mdev.testdir/dev/*
++echo "sda 0:0 644 =block/ @echo @echo TEST" >mdev.testdir/etc/mdev.conf
++testing "mdev move and command" \
++ "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
++ ls -lnR mdev.testdir/dev | $FILTER_LS2" \
++"\
++@echo TEST
++mdev.testdir/dev:
++drwxr-xr-x 2 0 0 block
++
++mdev.testdir/dev/block:
++brw-r--r-- 1 0 0 sda
++" \
++ "" ""
++
++# continuing to use directory structure from prev test
++rm -rf mdev.testdir/dev/*
+ echo "@8,0 :1 644" >mdev.testdir/etc/mdev.conf
+ testing "mdev #maj,min and no explicit uid" \
+ "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
+--- busybox-1.13.2/util-linux/mdev.c Sun Nov 9 18:28:22 2008
++++ busybox-1.13.2-mdev/util-linux/mdev.c Mon Jan 12 08:59:15 2009
+@@ -179,8 +179,9 @@
+ unsigned i, n;
+ #endif
+ char *a = val;
+- s = strchr(val, ' ');
+- val = (s && s[1]) ? s+1 : NULL;
++ s = strchrnul(val, ' ');
++ val = (s[0] && s[1]) ? s+1 : NULL;
++ s[0] = '\0';
+ #if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+ /* substitute %1..9 with off[1..9], if any */
+ n = 0;