Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/printutils

Timestamp:

Jan 1, 2014, 12:47:38 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/printutils

Files:

• lpd.c (modified) (2 diffs)
• lpr.c (modified) (7 diffs)

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

@@ -71 +71 @@
  */
 
+//usage:#define lpd_trivial_usage
+//usage:       "SPOOLDIR [HELPER [ARGS]]"
+//usage:#define lpd_full_usage "\n\n"
+//usage:       "SPOOLDIR must contain (symlinks to) device nodes or directories"
+//usage:     "\nwith names matching print queue names. In the first case, jobs are"
+//usage:     "\nsent directly to the device. Otherwise each job is stored in queue"
+//usage:     "\ndirectory and HELPER program is called. Name of file to print"
+//usage:     "\nis passed in $DATAFILE variable."
+//usage:     "\nExample:"
+//usage:     "\n    tcpsvd -E 0 515 softlimit -m 999999 lpd /var/spool ./print"
+
 #include "libbb.h"
 
@@ -92 +103 @@
     // SECURITY:
     size_t max = 4 * 1024; // more than enough for commands!
-    return xmalloc_reads(STDIN_FILENO, NULL, &max);
+    return xmalloc_reads(STDIN_FILENO, &max);
 }
 

branches/3.2/mindi-busybox/printutils/lpr.c

@@ -12 +12 @@
  * See RFC 1179 for protocol description.
  */
+
+//usage:#define lpr_trivial_usage
+//usage:       "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE]..."
+/* -C CLASS exists too, not shown.
+ * CLASS is supposed to be printed on banner page, if one is requested */
+//usage:#define lpr_full_usage "\n\n"
+//usage:       "    -P  lp service to connect to (else uses $PRINTER)"
+//usage:     "\n    -m  Send mail on completion"
+//usage:     "\n    -h  Print banner page too"
+//usage:     "\n    -V  Verbose"
+//usage:
+//usage:#define lpq_trivial_usage
+//usage:       "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID]... [-fs]"
+//usage:#define lpq_full_usage "\n\n"
+//usage:       "    -P  lp service to connect to (else uses $PRINTER)"
+//usage:     "\n    -d  Delete jobs"
+//usage:     "\n    -f  Force any waiting job to be printed"
+//usage:     "\n    -s  Short display"
+
 #include "libbb.h"
 
@@ -71 +90 @@
     int fd;
 
+    queue = getenv("PRINTER");
+    if (!queue)
+        queue = "lp";
+
     // parse options
     // TODO: set opt_complementary: s,d,f are mutually exclusive
@@ -80 +103 @@
     argv += optind;
 
-    // if queue is not specified -> use $PRINTER
-    if (!(opts & OPT_P))
-        queue = getenv("PRINTER");
-    // if queue is still not specified ->
-    if (!queue) {
-        // ... queue defaults to "lp"
-        // server defaults to "localhost"
-        queue = "lp";
-    // if queue is specified ->
-    } else {
+    {
         // queue name is to the left of '@'
         char *s = strchr(queue, '@');
@@ -168 +182 @@
         }
 
+        st.st_size = 0; /* paranoia: fstat may theoretically fail */
+        fstat(dfd, &st);
+
+        /* Apparently, some servers are buggy and won't accept 0-sized jobs.
+         * Standard lpr works around it by refusing to send such jobs:
+         */
+        if (st.st_size == 0) {
+            bb_error_msg("nothing to print");
+            continue;
+        }
+
         /* "The name ... should start with ASCII "cfA",
          * followed by a three digit job number, followed
@@ -192 +217 @@
             , remote_filename
         );
-        // delete possible "\nX\n" patterns
+        // delete possible "\nX\n" (that is, one-char) patterns
         c = controlfile;
-        cflen = (unsigned)strlen(controlfile);
         while ((c = strchr(c, '\n')) != NULL) {
             if (c[1] && c[2] == '\n') {
-                /* can't use strcpy, results are undefined */
-                memmove(c, c+2, cflen - (c-controlfile) - 1);
-                cflen -= 2;
+                overlapping_strcpy(c, c+2);
             } else {
                 c++;
@@ -210 +232 @@
         /* "Acknowledgement processing must occur as usual
          * after the command is sent." */
+        cflen = (unsigned)strlen(controlfile);
         fdprintf(fd, "\x2" "%u c%s\n", cflen, remote_filename);
         get_response_or_say_and_die(fd, "sending control file");
@@ -223 +246 @@
         if (opts & LPR_V)
             bb_error_msg("sending data file");
-        st.st_size = 0; /* paranoia: fstat may theoretically fail */
-        fstat(dfd, &st);
         fdprintf(fd, "\x3" "%"OFF_FMT"u d%s\n", st.st_size, remote_filename);
         get_response_or_say_and_die(fd, "sending data file");