svn commit: trunk/busybox/loginutils

[aldot at busybox.net]

Author: aldot
Date: 2008-12-04 06:19:21 -0800 (Thu, 04 Dec 2008)
New Revision: 24264

Log:
- -4b and use proper define; add license note


Modified:
   trunk/busybox/loginutils/cryptpw.c


Changeset:
Modified: trunk/busybox/loginutils/cryptpw.c
===================================================================
--- trunk/busybox/loginutils/cryptpw.c	2008-12-04 14:16:54 UTC (rev 24263)
+++ trunk/busybox/loginutils/cryptpw.c	2008-12-04 14:19:21 UTC (rev 24264)
@@ -1,7 +1,9 @@
 /* vi: set sw=4 ts=4: */
 /*
- * cryptpw.c
+ * cryptpw.c - output a crypt(3)ed password to stdout.
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ *
  * Cooked from passwd.c by Thomas Lundquist <thomasez at zelow.no>
  * mkpasswd compatible options added by Bernhard Reutner-Fischer
  */
@@ -103,8 +105,8 @@
 		argv[0]	? argv[0] : (
 			/* Only mkpasswd, and only from tty, prompts.
 			 * Otherwise it is a plain read. */
-			(isatty(0) && applet_name[0] == 'm')
-			? bb_ask(STDIN_FILENO, 0, "Password: ")
+			(isatty(STDIN_FILENO) && applet_name[0] == 'm')
+			? bb_ask_stdin("Password: ")
 			: xmalloc_fgetline(stdin)
 		),
 		salt, 1));