Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/add-remove-shell.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/add-remove-shell.c (modified) (4 diffs)

branches/3.3/mindi-busybox/loginutils/add-remove-shell.c

@@ -8 +8 @@
  * for details.
  */
-
-//applet:IF_ADD_SHELL(   APPLET_ODDNAME(add-shell   , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell   ))
-//applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell))
-
-//kbuild:lib-$(CONFIG_ADD_SHELL)    += add-remove-shell.o
-//kbuild:lib-$(CONFIG_REMOVE_SHELL) += add-remove-shell.o
-
 //config:config ADD_SHELL
 //config:       bool "add-shell"
@@ -26 +19 @@
 //config:       help
 //config:         Remove shells from /etc/shells.
+
+//applet:IF_ADD_SHELL(   APPLET_ODDNAME(add-shell   , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell   ))
+//applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell))
+
+//kbuild:lib-$(CONFIG_ADD_SHELL)    += add-remove-shell.o
+//kbuild:lib-$(CONFIG_REMOVE_SHELL) += add-remove-shell.o
 
 //usage:#define add_shell_trivial_usage
@@ -101 +100 @@
             }
             /* copy shell name from old to new file */
-            printf("%s\n", line);
+            puts(line);
  next_line:
             free(line);
@@ -113 +112 @@
         while (*cpp) {
             if (*cpp != dont_add)
-                printf("%s\n", *cpp);
+                puts(*cpp);
             cpp++;
         }