Merge changes from CUPS 1.6svn-r10437.

[thirdparty/cups.git] / backend / usb-unix.c

diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index de4ab4e29b2c6f0c23c8a58716f1451320d029f4..b06825f78c84da2c8fa96200032d9aededd4e5ae 100644 (file)
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,11 +1,11 @@
 /*
- * "$Id: usb-unix.c 7687 2008-06-24 01:28:36Z mike $"
+ * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $"
  *
- *   USB port backend for the Common UNIX Printing System (CUPS).
+ *   USB port backend for CUPS.
  *
  *   This file is included from "usb.c" when compiled on UNIX/Linux.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -36,7 +36,7 @@
  */
 
 static int     open_device(const char *uri, int *use_bc);
-static void    side_cb(int print_fd, int device_fd, int snmp_fd,
+static int     side_cb(int print_fd, int device_fd, int snmp_fd,
                        http_addr_t *addr, int use_bc);
 
 
@@ -56,7 +56,7 @@ print_device(const char *uri,         /* I - Device URI */
 {
   int          use_bc;                 /* Use backchannel path? */
   int          device_fd;              /* USB device */
-  size_t       tbytes;                 /* Total number of bytes written */
+  ssize_t      tbytes;                 /* Total number of bytes written */
   struct termios opts;                 /* Parallel port options */
 
 
@@ -80,6 +80,14 @@ print_device(const char *uri,                /* I - Device URI */
 
     use_bc = 0;
 
+#elif defined(__sun)
+   /*
+    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
+    * select() or poll(), so we can't support backchannel...
+    */
+
+    use_bc = 0;
+
 #else
    /*
     * Disable backchannel data when printing to Brother, Canon, or
@@ -88,10 +96,10 @@ print_device(const char *uri,               /* I - Device URI */
     * a read request...
     */
 
-    use_bc = strcasecmp(hostname, "Brother") &&
-             strcasecmp(hostname, "Canon") &&
-             strncasecmp(hostname, "Konica", 6) &&
-             strncasecmp(hostname, "Minolta", 7);
+    use_bc = _cups_strcasecmp(hostname, "Brother") &&
+             _cups_strcasecmp(hostname, "Canon") &&
+             _cups_strncasecmp(hostname, "Konica", 6) &&
+             _cups_strncasecmp(hostname, "Minolta", 7);
 #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
 
     if ((device_fd = open_device(uri, &use_bc)) == -1)
@@ -105,9 +113,9 @@ print_device(const char *uri,               /* I - Device URI */
        * 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...
@@ -120,23 +128,17 @@ print_device(const char *uri,             /* I - Device URI */
 
       if (errno == EBUSY)
       {
-        _cupsLangPuts(stderr,
-                     _("INFO: Printer busy; will retry in 10 seconds...\n"));
+        _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(10);
       }
       else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
                errno == ENODEV)
       {
-        _cupsLangPuts(stderr,
-                     _("INFO: Printer not connected; will retry in 30 "
-                       "seconds...\n"));
        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);
       }
     }
@@ -173,16 +175,20 @@ print_device(const char *uri,             /* I - Device URI */
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, side_cb);
+#ifdef __sun
+   /*
+    * CUPS STR #3028: Solaris' usbprn driver apparently does not support
+    * select() or poll(), so we can't support the sidechannel either...
+    */
+
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
 
-    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-                     _("INFO: Sent print file, %lld bytes...\n"),
 #else
-                     _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-                     CUPS_LLCAST tbytes);
+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
+#endif /* __sun */
+
+    if (print_fd != 0 && tbytes >= 0)
+      _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
   }
 
  /*
@@ -191,7 +197,7 @@ print_device(const char *uri,               /* I - Device URI */
 
   close(device_fd);
 
-  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
+  return (CUPS_BACKEND_OK);
 }
 
 
@@ -415,8 +421,7 @@ open_device(const char *uri,                /* I - Device URI */
       */
 
       if (busy)
-       _cupsLangPuts(stderr,
-                     _("INFO: Printer busy; will retry in 5 seconds...\n"));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
 
       sleep(5);
     }
@@ -499,8 +504,7 @@ open_device(const char *uri,                /* I - Device URI */
 
       if (busy)
       {
-       _cupsLangPuts(stderr,
-                     _("INFO: Printer is busy; will retry in 5 seconds...\n"));
+       _cupsLangPrintFilter(stderr, "INFO", _("The printer is in use."));
        sleep(5);
       }
     }
@@ -542,7 +546,7 @@ open_device(const char *uri,                /* I - Device URI */
  * 'side_cb()' - Handle side-channel requests...
  */
 
-static void
+static int                             /* O - 0 on success, -1 on error */
 side_cb(int         print_fd,          /* I - Print file */
         int         device_fd,         /* I - Device file */
         int         snmp_fd,           /* I - SNMP socket (unused) */
@@ -561,10 +565,7 @@ side_cb(int         print_fd,              /* I - Print file */
   datalen = sizeof(data);
 
   if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
+    return (-1);
 
   switch (command)
   {
@@ -580,6 +581,7 @@ side_cb(int         print_fd,               /* I - Print file */
         break;
 
     case CUPS_SC_CMD_GET_BIDI :
+       status  = CUPS_SC_STATUS_OK;
         data[0] = use_bc;
         datalen = 1;
         break;
@@ -606,10 +608,10 @@ side_cb(int         print_fd,             /* I - Print file */
        break;
   }
 
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
+  return (cupsSideChannelWrite(command, status, data, datalen, 1.0));
 }
 
 
 /*
- * End of "$Id: usb-unix.c 7687 2008-06-24 01:28:36Z mike $".
+ * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $".
  */