getty: do not emit bogus error message on EOF

[platform/upstream/busybox.git] / loginutils / chpasswd.c

diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index cb13ebb..1817231 100644 (file)
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -5,10 +5,9 @@
  * Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org>
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
 #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"
@@ -19,7 +18,7 @@ static const char chpasswd_longopts[] ALIGN1 =
 #define OPT_MD5                2
 
 int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
        char *name, *pass;
        char salt[sizeof("$N$XXXXXXXX")];
@@ -30,10 +29,10 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
                bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
 
        opt_complementary = "m--e:e--m";
-       USE_GETOPT_LONG(applet_long_options = chpasswd_longopts;)
+       IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
        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");
@@ -47,16 +46,16 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, 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,
                 * we try to find & change his passwd in /etc/passwd */
 #if ENABLE_FEATURE_SHADOWPASSWDS
-               rc = update_passwd(bb_path_shadow_file, name, pass);
+               rc = update_passwd(bb_path_shadow_file, name, pass, NULL);
                if (rc == 0) /* no lines updated, no errors detected */
 #endif
-                       rc = update_passwd(bb_path_passwd_file, name, pass);
+                       rc = update_passwd(bb_path_passwd_file, name, pass, NULL);
                /* LOGMODE_BOTH logs to syslog also */
                logmode = LOGMODE_BOTH;
                if (rc < 0)
@@ -65,7 +64,8 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, 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;
 }