You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.3 KiB
52 lines
1.3 KiB
diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c |
|
--- cups-1.5b1/backend/usb-unix.c.usb-paperout 2011-05-24 15:51:39.000000000 +0200 |
|
+++ cups-1.5b1/backend/usb-unix.c 2011-05-24 15:51:39.000000000 +0200 |
|
@@ -30,6 +30,11 @@ |
|
|
|
#include <sys/select.h> |
|
|
|
+#ifdef __linux |
|
+#include <sys/ioctl.h> |
|
+#include <linux/lp.h> |
|
+#endif /* __linux */ |
|
+ |
|
|
|
/* |
|
* Local functions... |
|
@@ -334,7 +339,19 @@ open_device(const char *uri, /* I - Dev |
|
if (!strncmp(uri, "usb:/dev/", 9)) |
|
#ifdef __linux |
|
{ |
|
- return (open(uri + 4, O_RDWR | O_EXCL)); |
|
+ fd = open(uri + 4, O_RDWR | O_EXCL); |
|
+ |
|
+ if (fd != -1) |
|
+ { |
|
+ /* |
|
+ * Tell the driver to return from write() with errno==ENOSPACE |
|
+ * on paper-out. |
|
+ */ |
|
+ unsigned int t = 1; |
|
+ ioctl (fd, LPABORT, &t); |
|
+ } |
|
+ |
|
+ return fd; |
|
} |
|
else if (!strncmp(uri, "usb://", 6)) |
|
{ |
|
@@ -400,7 +417,14 @@ open_device(const char *uri, /* I - Dev |
|
if (!strcmp(uri, device_uri)) |
|
{ |
|
/* |
|
- * Yes, return this file descriptor... |
|
+ * Yes, tell the driver to return from write() with |
|
+ * errno==ENOSPACE on paper-out. |
|
+ */ |
|
+ unsigned int t = 1; |
|
+ ioctl (fd, LPABORT, &t); |
|
+ |
|
+ /* |
|
+ * Return this file descriptor... |
|
*/ |
|
|
|
fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",
|
|
|