[git commit master] fix a few goofs uncovered by "make allnoconfig" testing
Denys Vlasenko
vda.linux at googlemail.com
Sun Jun 6 03:23:09 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=161bb8fa124a9bd3f39579123e347a04d428d25b
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/ash.c | 2 +-
util-linux/Config.src | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/shell/ash.c b/shell/ash.c
index b2c56f0..90680e8 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9479,7 +9479,7 @@ preadfd(void)
}
}
#else
- nr = nonblock_safe_read(g_parsefile->fd, buf, IBUFSIZ - 1);
+ nr = nonblock_safe_read(g_parsefile->pf_fd, buf, IBUFSIZ - 1);
#endif
#if 0
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 27c7418..997cdec 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -293,7 +293,7 @@ config FEATURE_HEXDUMP_REVERSE
config HD
bool "hd"
default y
- select HEXDUMP
+ depends on HEXDUMP
help
hd is an alias to hexdump -C.
--
1.6.3.3
More information about the busybox-cvs
mailing list