id: unsigned long is excessive for option bitmask

[oweals/busybox.git] / loginutils / chpasswd.c

diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 3e3e8d3d32727c144510cf04ffeefe4f4c71262d..c83d1dad78c5a3bc0dfad776de5b653382d758ca 100644 (file)
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -9,19 +9,17 @@
 #include "libbb.h"
 
 #if ENABLE_GETOPT_LONG
-#include <getopt.h>
-
-static const char chpasswd_longopts[] =
+static const char chpasswd_longopts[] ALIGN1 =
        "encrypted\0" No_argument "e"
        "md5\0"       No_argument "m"
-       "\0";
+       ;
 #endif
 
 #define OPT_ENC                1
 #define OPT_MD5                2
 
-int chpasswd_main(int argc, char **argv);
-int chpasswd_main(int argc, char **argv)
+int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
        char *name, *pass;
        char salt[sizeof("$N$XXXXXXXX")];
@@ -31,11 +29,11 @@ int chpasswd_main(int argc, char **argv)
        if (getuid())
                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
-       opt_complementary = "m--e:e--m";
+       opt_complementary = "m--e:e--m";
        USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
-       opt = getopt32(argc, argv, "em");
+       opt = getopt32(argv, "em");
 
-       while ((name = xmalloc_getline(stdin)) != NULL) {
+       while ((name = xmalloc_fgetline(stdin)) != NULL) {
                pass = strchr(name, ':');
                if (!pass)
                        bb_error_msg_and_die("missing new password");
@@ -49,7 +47,7 @@ int chpasswd_main(int argc, char **argv)
                                strcpy(salt, "$1$");
                                rnd = crypt_make_salt(salt + 3, 4, rnd);
                        }
-                       pass = pw_encrypt(pass, salt);
+                       pass = pw_encrypt(pass, salt, 0);
                }
 
                /* This is rather complex: if user is not found in /etc/shadow,
@@ -67,7 +65,8 @@ int chpasswd_main(int argc, char **argv)
                        bb_info_msg("Password for '%s' changed", name);
                logmode = LOGMODE_STDIO;
                free(name);
+               if (!(opt & OPT_ENC))
+                       free(pass);
        }
-
-       return 0;
+       return EXIT_SUCCESS;
 }