- use ut_user rather than ut_name (Cristian Ionescu-Idbohrn)

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

diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 0c298c50d53d8fe93340510b6f6a0ec75a785c10..68f5e8074a014ee27ee1ebb4c404050e72d509c1 100644 (file)
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -1,28 +1,28 @@
 /* vi: set sw=4 ts=4: */
 /*
  * cryptpw.c
- * 
+ *
  * Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no>
  */
 
 #include "libbb.h"
 
-int cryptpw_main(int argc, char **argv);
-int cryptpw_main(int argc, char **argv)
+int cryptpw_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cryptpw_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
        char salt[sizeof("$N$XXXXXXXX")];
 
-       if (!getopt32(argc, argv, "a:", NULL) || argv[optind - 1][0] != 'd') {
+       if (!getopt32(argv, "a:", NULL) || argv[optind - 1][0] != 'd') {
                strcpy(salt, "$1$");
                /* Too ugly, and needs even more magic to handle endianness: */
                //((uint32_t*)&salt)[0] = '$' + '1'*0x100 + '$'*0x10000;
                /* Hope one day gcc will do it itself (inlining strcpy) */
-               crypt_make_salt(salt + 3, 4); /* md5 */
+               crypt_make_salt(salt + 3, 4, 0); /* md5 */
        } else {
-               crypt_make_salt(salt, 1);     /* des */
+               crypt_make_salt(salt, 1, 0);     /* des */
        }
 
-       puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_getline(stdin), salt));
+       puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_fgetline(stdin), salt));
 
        return 0;
 }