aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-06-19 12:10:38 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-06-19 12:10:38 +0200
commitf3b92d385695aecefd93d5f199be1f64270c2687 (patch)
tree5d6b2308ceafea6040bd78ea8401a91eb65d376b /loginutils
parente2e4cc249dc1bd4b280846f55a36208674eadd55 (diff)
downloadbusybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.tar.gz
busybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.tar.bz2
busybox-w32-f3b92d385695aecefd93d5f199be1f64270c2687.zip
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 e11503665..f6c0e2e64 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -100,7 +100,7 @@ config ADDGROUP
100config FEATURE_ADDGROUP_LONG_OPTIONS 100config FEATURE_ADDGROUP_LONG_OPTIONS
101 bool "Enable long options" 101 bool "Enable long options"
102 default n 102 default n
103 depends on ADDGROUP && GETOPT_LONG 103 depends on ADDGROUP && LONG_OPTS
104 help 104 help
105 Support long options for the addgroup applet. 105 Support long options for the addgroup applet.
106 106
@@ -148,7 +148,7 @@ config ADDUSER
148config FEATURE_ADDUSER_LONG_OPTIONS 148config FEATURE_ADDUSER_LONG_OPTIONS
149 bool "Enable long options" 149 bool "Enable long options"
150 default n 150 default n
151 depends on ADDUSER && GETOPT_LONG 151 depends on ADDUSER && LONG_OPTS
152 help 152 help
153 Support long options for the adduser applet. 153 Support long options for the adduser applet.
154 154
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 68b398068..181723169 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -7,7 +7,7 @@
7 */ 7 */
8#include "libbb.h" 8#include "libbb.h"
9 9
10#if ENABLE_GETOPT_LONG 10#if ENABLE_LONG_OPTS
11static const char chpasswd_longopts[] ALIGN1 = 11static const char chpasswd_longopts[] ALIGN1 =
12 "encrypted\0" No_argument "e" 12 "encrypted\0" No_argument "e"
13 "md5\0" No_argument "m" 13 "md5\0" No_argument "m"
@@ -29,7 +29,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
29 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); 29 bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
30 30
31 opt_complementary = "m--e:e--m"; 31 opt_complementary = "m--e:e--m";
32 IF_GETOPT_LONG(applet_long_options = chpasswd_longopts;) 32 IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
33 opt = getopt32(argv, "em"); 33 opt = getopt32(argv, "em");
34 34
35 while ((name = xmalloc_fgetline(stdin)) != NULL) { 35 while ((name = xmalloc_fgetline(stdin)) != NULL) {
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 47212e18a..b44993f06 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -60,7 +60,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv)
60 int len; 60 int len;
61 int fd; 61 int fd;
62 62
63#if ENABLE_GETOPT_LONG 63#if ENABLE_LONG_OPTS
64 static const char mkpasswd_longopts[] ALIGN1 = 64 static const char mkpasswd_longopts[] ALIGN1 =
65 "stdin\0" No_argument "s" 65 "stdin\0" No_argument "s"
66 "password-fd\0" Required_argument "P" 66 "password-fd\0" Required_argument "P"