aboutsummaryrefslogtreecommitdiff
path: root/util-linux/mdev.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2013-04-03 13:02:14 +0100
committerRon Yorston <rmy@pobox.com>2013-04-03 13:02:14 +0100
commit667d5dd0a428a790df5a73d044cf9a8882ee92f8 (patch)
tree76291debc380e8d31991c3d2eddcf0add131c7a3 /util-linux/mdev.c
parent8782950636f76faa8db0ed8c5d698ab0bd1fbf45 (diff)
parentd35cbad0efaa57bf7c5280e62825966f7757906a (diff)
downloadbusybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.gz
busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.tar.bz2
busybox-w32-667d5dd0a428a790df5a73d044cf9a8882ee92f8.zip
Merge branch 'busybox' into merge
Conflicts: libbb/lineedit.c
Diffstat (limited to 'util-linux/mdev.c')
-rw-r--r--util-linux/mdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 5fe6bbbde..1d741367e 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -1060,15 +1060,15 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
1060 * ACTION can be "add", "remove", "change" 1060 * ACTION can be "add", "remove", "change"
1061 * DEVPATH is like "/block/sda" or "/class/input/mice" 1061 * DEVPATH is like "/block/sda" or "/class/input/mice"
1062 */ 1062 */
1063 action = getenv("ACTION");
1064 op = index_in_strings(keywords, action);
1065 env_devname = getenv("DEVNAME"); /* can be NULL */ 1063 env_devname = getenv("DEVNAME"); /* can be NULL */
1066 env_devpath = getenv("DEVPATH");
1067 G.subsystem = getenv("SUBSYSTEM"); 1064 G.subsystem = getenv("SUBSYSTEM");
1065 action = getenv("ACTION");
1066 env_devpath = getenv("DEVPATH");
1068 if (!action || !env_devpath /*|| !G.subsystem*/) 1067 if (!action || !env_devpath /*|| !G.subsystem*/)
1069 bb_show_usage(); 1068 bb_show_usage();
1070 fw = getenv("FIRMWARE"); 1069 fw = getenv("FIRMWARE");
1071 seq = getenv("SEQNUM"); 1070 seq = getenv("SEQNUM");
1071 op = index_in_strings(keywords, action);
1072 1072
1073 my_pid = getpid(); 1073 my_pid = getpid();
1074 open_mdev_log(seq, my_pid); 1074 open_mdev_log(seq, my_pid);