Merge changes from CUPS 1.5.1-r9875.

[thirdparty/cups.git] / backend / serial.c

diff --git a/backend/serial.c b/backend/serial.c
index 7a0c36c61c29a145340f5bdb12c09c673bce87dd..def68cb85ad4d0a22e4cb5c0a058e9add4e4ab7d 100644 (file)
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -1,9 +1,9 @@
 /*
  * "$Id: serial.c 7647 2008-06-16 17:39:40Z mike $"
  *
- *   Serial port backend for the Common UNIX Printing System (CUPS).
+ *   Serial port backend for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -164,7 +164,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   else if (argc < 6 || argc > 7)
   {
     _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
+                    _("Usage: %s job-id user title copies options [file]"),
                    argv[0]);
     return (CUPS_BACKEND_FAILED);
   }
@@ -187,9 +187,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
 
     if ((print_fd = open(argv[6], O_RDONLY)) < 0)
     {
-      _cupsLangPrintf(stderr,
-                      _("ERROR: Unable to open print file \"%s\": %s\n"),
-                      argv[6], strerror(errno));
+      _cupsLangPrintError("ERROR", _("Unable to open print file"));
       return (CUPS_BACKEND_FAILED);
     }
 
@@ -239,9 +237,9 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
        * available printer in the class.
        */
 
-        _cupsLangPuts(stderr,
-                     _("INFO: Unable to contact printer, queuing on next "
-                       "printer in class...\n"));
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Unable to contact printer, queuing on next "
+                              "printer in class."));
 
        /*
         * Sleep 5 seconds to keep the job from requeuing too rapidly...
@@ -254,15 +252,13 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
 
       if (errno == EBUSY)
       {
-        _cupsLangPuts(stderr,
-                     _("INFO: Printer busy; will retry in 30 seconds...\n"));
+        _cupsLangPrintFilter(stderr, "INFO",
+                            _("Printer busy; will retry in 30 seconds."));
        sleep(30);
       }
       else
       {
-       _cupsLangPrintf(stderr,
-                       _("ERROR: Unable to open device file \"%s\": %s\n"),
-                       resource, strerror(errno));
+       _cupsLangPrintError("ERROR", _("Unable to open device file"));
        return (CUPS_BACKEND_FAILED);
       }
     }
@@ -322,7 +318,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
       * Process the option...
       */
 
-      if (!strcasecmp(name, "baud"))
+      if (!_cups_strcasecmp(name, "baud"))
       {
        /*
         * Set the baud rate...
@@ -379,13 +375,13 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
              break;
 #  endif /* B230400 */
           default :
-             _cupsLangPrintf(stderr, _("WARNING: Unsupported baud rate %s\n"),
-                             value);
+             _cupsLangPrintFilter(stderr, "WARNING",
+                                  _("Unsupported baud rate: %s"), value);
              break;
        }
 #endif /* B19200 == 19200 */
       }
-      else if (!strcasecmp(name, "bits"))
+      else if (!_cups_strcasecmp(name, "bits"))
       {
        /*
         * Set number of data bits...
@@ -406,25 +402,25 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
              break;
        }
       }
-      else if (!strcasecmp(name, "parity"))
+      else if (!_cups_strcasecmp(name, "parity"))
       {
        /*
        * Set parity checking...
        */
 
-       if (!strcasecmp(value, "even"))
+       if (!_cups_strcasecmp(value, "even"))
        {
          opts.c_cflag |= PARENB;
           opts.c_cflag &= ~PARODD;
        }
-       else if (!strcasecmp(value, "odd"))
+       else if (!_cups_strcasecmp(value, "odd"))
        {
          opts.c_cflag |= PARENB;
           opts.c_cflag |= PARODD;
        }
-       else if (!strcasecmp(value, "none"))
+       else if (!_cups_strcasecmp(value, "none"))
          opts.c_cflag &= ~PARENB;
-       else if (!strcasecmp(value, "space"))
+       else if (!_cups_strcasecmp(value, "space"))
        {
         /*
          * Note: we only support space parity with 7 bits per character...
@@ -434,7 +430,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
           opts.c_cflag |= CS8;
          opts.c_cflag &= ~PARENB;
         }
-       else if (!strcasecmp(value, "mark"))
+       else if (!_cups_strcasecmp(value, "mark"))
        {
         /*
          * Note: we only support mark parity with 7 bits per character
@@ -447,29 +443,29 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
           opts.c_cflag |= CSTOPB;
         }
       }
-      else if (!strcasecmp(name, "flow"))
+      else if (!_cups_strcasecmp(name, "flow"))
       {
        /*
        * Set flow control...
        */
 
-       if (!strcasecmp(value, "none"))
+       if (!_cups_strcasecmp(value, "none"))
        {
          opts.c_iflag &= ~(IXON | IXOFF);
           opts.c_cflag &= ~CRTSCTS;
        }
-       else if (!strcasecmp(value, "soft"))
+       else if (!_cups_strcasecmp(value, "soft"))
        {
          opts.c_iflag |= IXON | IXOFF;
           opts.c_cflag &= ~CRTSCTS;
        }
-       else if (!strcasecmp(value, "hard") ||
-                !strcasecmp(value, "rtscts"))
+       else if (!_cups_strcasecmp(value, "hard") ||
+                !_cups_strcasecmp(value, "rtscts"))
         {
          opts.c_iflag &= ~(IXON | IXOFF);
           opts.c_cflag |= CRTSCTS;
        }
-       else if (!strcasecmp(value, "dtrdsr"))
+       else if (!_cups_strcasecmp(value, "dtrdsr"))
        {
          opts.c_iflag &= ~(IXON | IXOFF);
           opts.c_cflag &= ~CRTSCTS;
@@ -477,7 +473,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
          dtrdsr = 1;
        }
       }
-      else if (!strcasecmp(name, "stop"))
+      else if (!_cups_strcasecmp(name, "stop"))
       {
         switch (atoi(value))
        {
@@ -726,7 +722,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   if (print_fd != 0)
     close(print_fd);
 
-  return (total_bytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+  return (CUPS_BACKEND_OK);
 }
 
 
@@ -1221,11 +1217,11 @@ list_devices(void)
 
 
        /* Check if hidden... */
-       hiddenVal = IORegistryEntrySearchCFProperty(serialService, 
+       hiddenVal = IORegistryEntrySearchCFProperty(serialService,
                                                    kIOServicePlane,
                                                    CFSTR("HiddenPort"),
                                                    kCFAllocatorDefault,
-                                                   kIORegistryIterateRecursively | 
+                                                   kIORegistryIterateRecursively |
                                                    kIORegistryIterateParents);
        if (hiddenVal)
          CFRelease(hiddenVal); /* This interface should not be used */
@@ -1241,7 +1237,7 @@ list_devices(void)
                                        sizeof(serialName),
                                        kCFStringEncodingASCII);
            CFRelease(serialNameAsCFString);
-  
+
            if (result)
            {
              bsdPathAsCFString =
@@ -1254,7 +1250,7 @@ list_devices(void)
                                            sizeof(bsdPath),
                                            kCFStringEncodingASCII);
                CFRelease(bsdPathAsCFString);
-  
+
                if (result)
                  printf("serial serial:%s?baud=115200 \"Unknown\" \"%s\"\n",
                         bsdPath, serialName);