Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/printutils/lpd.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/printutils/lpd.c (modified) (4 diffs)

branches/3.3/mindi-busybox/printutils/lpd.c

@@ -70 +70 @@
  * mv -f ./"$DATAFILE" save/
  */
+//config:config LPD
+//config:   bool "lpd"
+//config:   default y
+//config:   help
+//config:     lpd is a print spooling daemon.
+
+//applet:IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_LPD) += lpd.o
 
 //usage:#define lpd_trivial_usage
@@ -201 +210 @@
             goto unsupported_cmd;
         if (spooling & (1 << (s[0]-1))) {
-            printf("Duplicated subcommand\n");
+            puts("Duplicated subcommand");
             goto err_exit;
         }
         // get filename
-        *strchrnul(s, '\n') = '\0';
+        chomp(s);
         fname = strchr(s, ' ');
         if (!fname) {
 // bad_fname:
-            printf("No or bad filename\n");
+            puts("No or bad filename");
             goto err_exit;
         }
@@ -220 +229 @@
         expected_len = bb_strtou(s + 1, NULL, 10);
         if (errno || expected_len < 0) {
-            printf("Bad length\n");
+            puts("Bad length");
             goto err_exit;
         }
@@ -226 +235 @@
             // SECURITY:
             // ctrlfile can't be big (we want to read it back later!)
-            printf("File is too big\n");
+            puts("File is too big");
             goto err_exit;
         }