summaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenys Vlasenko2009-06-19 12:10:38 +0200
committerDenys Vlasenko2009-06-19 12:10:38 +0200
commitf3b92d385695aecefd93d5f199be1f64270c2687 (patch)
tree5d6b2308ceafea6040bd78ea8401a91eb65d376b /loginutils
parente2e4cc249dc1bd4b280846f55a36208674eadd55 (diff)
downloadbusybox-f3b92d385695aecefd93d5f199be1f64270c2687.zip
busybox-f3b92d385695aecefd93d5f199be1f64270c2687.tar.gz
getopt: FEATURE_GETOPT_LONG for -l; rename GETOPT_LONG to LONG_OPTS
Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/Config.in4
-rw-r--r--loginutils/chpasswd.c4
-rw-r--r--loginutils/cryptpw.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/loginutils/Config.in b/loginutils/Config.in
index e115036..f6c0e2e 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -100,7 +100,7 @@ config ADDGROUP
config FEATURE_ADDGROUP_LONG_OPTIONS
bool "Enable long options"
default n
- depends on ADDGROUP && GETOPT_LONG
+ depends on ADDGROUP && LONG_OPTS
help
Support long options for the addgroup applet.
@@ -148,7 +148,7 @@ config ADDUSER
config FEATURE_ADDUSER_LONG_OPTIONS
bool "Enable long options"
default n
- depends on ADDUSER && GETOPT_LONG
+ depends on ADDUSER && LONG_OPTS
help
Support long options for the adduser applet.
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 68b3980..1817231 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -7,7 +7,7 @@
*/
#include "libbb.h"
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
static const char chpasswd_longopts[] ALIGN1 =
"encrypted\0" No_argument "e"
"md5\0" No_argument "m"
@@ -29,7 +29,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
opt_complementary = "m--e:e--m";
- IF_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
+ IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
opt = getopt32(argv, "em");
while ((name = xmalloc_fgetline(stdin)) != NULL) {
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 47212e1..b44993f 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -60,7 +60,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
int len;
int fd;
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
static const char mkpasswd_longopts[] ALIGN1 =
"stdin\0" No_argument "s"
"password-fd\0" Required_argument "P"