summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-06 03:07:11 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-06 03:07:11 (GMT)
commit161bb8fa124a9bd3f39579123e347a04d428d25b (patch)
tree9229878e5abac0ed8c73dac11f8e7ed272d15def
parent22bdf90334515e047fcccf36ae80a543b6a056de (diff)
downloadbusybox-161bb8fa124a9bd3f39579123e347a04d428d25b.tar.gz
busybox-161bb8fa124a9bd3f39579123e347a04d428d25b.tar.bz2
fix a few goofs uncovered by "make allnoconfig" testing
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c2
-rw-r--r--util-linux/Config.src2
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.