Tim Waugh 116262
--- cups-1.2.10/backend/usb-unix.c.usb-paperout	2007-06-26 15:11:14.000000000 +0100
Tim Waugh 116262
+++ cups-1.2.10/backend/usb-unix.c	2007-06-26 15:16:23.000000000 +0100
Tim Waugh 116262
@@ -39,6 +39,11 @@
Tim Waugh 116262
 #include "ieee1284.c"
Tim Waugh 116262
 #include <sys/select.h>
Tim Waugh 72da82
 
Tim Waugh 72da82
+#ifdef __linux
Tim Waugh 72da82
+#include <sys/ioctl.h>
Tim Waugh 72da82
+#include <linux/lp.h>
Tim Waugh 72da82
+#endif /* __linux */
Tim Waugh 72da82
+
Tim Waugh b66134
 
Tim Waugh 116262
 /*
Tim Waugh 116262
  * Local functions...
Tim Waugh 116262
@@ -308,7 +313,19 @@
Tim Waugh 116262
   if (!strncmp(uri, "usb:/dev/", 9))
Tim Waugh 116262
 #ifdef __linux
Tim Waugh 116262
   {
Tim Waugh 116262
-    return (open(uri + 4, O_RDWR | O_EXCL));
Tim Waugh 116262
+    fd = open(uri + 4, O_RDWR | O_EXCL);
Tim Waugh 72da82
+
Tim Waugh 116262
+    if (fd != -1)
Tim Waugh 72da82
+    {
Tim Waugh 116262
+     /*
Tim Waugh 116262
+      * Tell the driver to return from write() with errno==ENOSPACE
Tim Waugh 116262
+      * on paper-out.
Tim Waugh 116262
+      */
Tim Waugh 116262
+      unsigned int t = 1;
Tim Waugh 116262
+      ioctl (fd, LPABORT, &t);
Tim Waugh 72da82
+    }
Tim Waugh 72da82
+
Tim Waugh 116262
+    return fd;
Tim Waugh 72da82
   }
Tim Waugh 116262
   else if (!strncmp(uri, "usb://", 6))
Tim Waugh 116262
   {
Tim Waugh 116262
@@ -374,7 +391,14 @@
Tim Waugh 116262
         if (!strcmp(uri, device_uri))
Tim Waugh 116262
 	{
Tim Waugh 116262
 	 /*
Tim Waugh 116262
-	  * Yes, return this file descriptor...
Tim Waugh 116262
+	  * Yes, tell the driver to return from write() with
Tim Waugh 116262
+	  * errno==ENOSPACE on paper-out.
Tim Waugh 116262
+	  */
Tim Waugh 116262
+	  unsigned int t = 1;
Tim Waugh 116262
+	  ioctl (fd, LPABORT, &t);
Tim Waugh 72da82
+
Tim Waugh 116262
+	 /*
Tim Waugh 116262
+	  * Return this file descriptor...
Tim Waugh 116262
 	  */
Tim Waugh 72da82
 
Tim Waugh 116262
 	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", device);