Merge branch 'busybox' into merge

10 files changed, 19 insertions, 19 deletions

diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c
index b09555aae..2470050e7 100644
--- a/loginutils/add-remove-shell.c
+++ b/loginutils/add-remove-shell.c
@@ -8,13 +8,13 @@
  * for details.
  */
 //config:config ADD_SHELL
-//config:       bool "add-shell (3.1 kb)"
+//config:       bool "add-shell (3.3 kb)"
 //config:       default y if DESKTOP
 //config:       help
 //config:       Add shells to /etc/shells.
 //config:
 //config:config REMOVE_SHELL
-//config:       bool "remove-shell (3 kb)"
+//config:       bool "remove-shell (3.3 kb)"
 //config:       default y if DESKTOP
 //config:       help
 //config:       Remove shells from /etc/shells.
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 2a83c8a15..2b5ac7550 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADDGROUP
-//config:       bool "addgroup (8.6 kb)"
+//config:       bool "addgroup (8.8 kb)"
 //config:       default y
 //config:       select LONG_OPTS
 //config:       help
@@ -102,7 +102,7 @@ static void new_group(char *group, gid_t gid)
         /* add entry to group */
         p = xasprintf("x:%u:", (unsigned) gr.gr_gid);
         if (update_passwd(bb_path_group_file, group, p, NULL) < 0)
-                exit(EXIT_FAILURE);
+                exit_FAILURE();
         if (ENABLE_FEATURE_CLEAN_UP)
                 free(p);
 #if ENABLE_FEATURE_SHADOWPASSWDS
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index a032abbed..65530b614 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CHPASSWD
-//config:       bool "chpasswd (18 kb)"
+//config:       bool "chpasswd (19 kb)"
 //config:       default y
 //config:       help
 //config:       Reads a file of user name and password pairs from standard input
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 2109e2eb5..1c338540f 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -10,14 +10,14 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CRYPTPW
-//config:       bool "cryptpw (14 kb)"
+//config:       bool "cryptpw (15 kb)"
 //config:       default y
 //config:       help
 //config:       Encrypts the given password with the crypt(3) libc function
 //config:       using the given salt.
 //config:
 //config:config MKPASSWD
-//config:       bool "mkpasswd (15 kb)"
+//config:       bool "mkpasswd (16 kb)"
 //config:       default y
 //config:       help
 //config:       Encrypts the given password with the crypt(3) libc function
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 8e7df737c..a82ffc317 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -9,13 +9,13 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config DELUSER
-//config:       bool "deluser (9.1 kb)"
+//config:       bool "deluser (9.3 kb)"
 //config:       default y
 //config:       help
 //config:       Utility for deleting a user account.
 //config:
 //config:config DELGROUP
-//config:       bool "delgroup (6.4 kb)"
+//config:       bool "delgroup (6.6 kb)"
 //config:       default y
 //config:       help
 //config:       Utility for deleting a group account.
diff --git a/loginutils/getty.c b/loginutils/getty.c
index cd6378d80..4581cc9f7 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -22,7 +22,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config GETTY
-//config:       bool "getty (10 kb)"
+//config:       bool "getty (11 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/loginutils/login.c b/loginutils/login.c
index 332238181..301be4a34 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LOGIN
-//config:       bool "login (24 kb)"
+//config:       bool "login (25 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
@@ -173,7 +173,7 @@ static void die_if_nologin(void)
         fflush_all();
         /* Users say that they do need this prior to exit: */
         tcdrain(STDOUT_FILENO);
-        exit(EXIT_FAILURE);
+        exit_FAILURE();
 }
 #else
 # define die_if_nologin() ((void)0)
@@ -265,19 +265,19 @@ static void get_username_or_die(char *buf, int size_buf)
         do {
                 c = getchar();
                 if (c == EOF)
-                        exit(EXIT_FAILURE);
+                        exit_FAILURE();
                 if (c == '\n') {
                         if (!--cntdown)
-                                exit(EXIT_FAILURE);
+                                exit_FAILURE();
                         goto prompt;
                 }
         } while (isspace(c)); /* maybe isblank? */
 
         *buf++ = c;
         if (!fgets(buf, size_buf-2, stdin))
-                exit(EXIT_FAILURE);
+                exit_FAILURE();
         if (!strchr(buf, '\n'))
-                exit(EXIT_FAILURE);
+                exit_FAILURE();
         while ((unsigned char)*buf > ' ')
                 buf++;
         *buf = '\0';
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index acc942275..1e8449627 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PASSWD
-//config:       bool "passwd (21 kb)"
+//config:       bool "passwd (22 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 681022acb..9c927ed79 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SULOGIN
-//config:       bool "sulogin (17 kb)"
+//config:       bool "sulogin (18 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 720835c4b..11bf58ca0 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -16,7 +16,7 @@
  * It now works with md5, sha1, etc passwords.
  */
 //config:config VLOCK
-//config:       bool "vlock (17 kb)"
+//config:       bool "vlock (18 kb)"
 //config:       default y
 //config:       help
 //config:       Build the "vlock" applet which allows you to lock (virtual) terminals.