summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-06 16:09:57 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-06 16:09:57 (GMT)
commit2fd45c2cdbf51dbafe1f44a49421a45a1cee4907 (patch)
treec8db99482dec94e9defd339872d857272398bf84
parentf2da16f451812f40bed51fd60a304df3d7dfc1bd (diff)
downloadbusybox-2fd45c2cdbf51dbafe1f44a49421a45a1cee4907.tar.gz
busybox-2fd45c2cdbf51dbafe1f44a49421a45a1cee4907.tar.bz2
dumpkmap,loadkmap: abort if there are params on cmdline
function old new delta loadkmap_main 201 219 +18 dumpkmap_main 208 223 +15 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--console-tools/dumpkmap.c7
-rw-r--r--console-tools/loadkmap.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 061fc47..a03b593 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -24,12 +24,17 @@ struct kbentry {
#define MAX_NR_KEYMAPS 256
int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+int dumpkmap_main(int argc UNUSED_PARAM, char **argv)
{
struct kbentry ke;
int i, j, fd;
RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
+ /* When user accidentally runs "dumpkmap FILE"
+ * instead of "dumpkmap >FILE", we'd dump binary stuff to tty.
+ * Let's prevent it: */
+ if (argv[1])
+ bb_show_usage();
/* bb_warn_ignoring_args(argv[1]);*/
fd = get_console_fd_or_die();
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 912291a..9e2c779 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -32,6 +32,11 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
/* const char *tty_name = CURRENT_TTY; */
RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
+ /* When user accidentally runs "loadkmap FILE"
+ * instead of "loadkmap <FILE", we end up waiting for input from tty.
+ * Let's prevent it: */
+ if (argv[1])
+ bb_show_usage();
/* bb_warn_ignoring_args(argv[1]); */
fd = get_console_fd_or_die();
/* or maybe: