Blame cups-direct-usb.patch
|
Tim Waugh |
16fc81 |
--- cups-1.2.7/backend/usb-unix.c.direct-usb 2006-11-15 20:28:39.000000000 +0000
|
|
Tim Waugh |
16fc81 |
+++ cups-1.2.7/backend/usb-unix.c 2006-11-16 16:23:51.000000000 +0000
|
|
Tim Waugh |
16fc81 |
@@ -85,6 +85,8 @@
|
|
Tim Waugh |
16fc81 |
*/
|
|
Tim Waugh |
73d7a1 |
|
|
Tim Waugh |
16fc81 |
use_bc = strcasecmp(hostname, "Canon") && !strstr(hostname, "Minolta");
|
|
Tim Waugh |
73d7a1 |
+ if (use_bc && !strncmp(uri, "usb:/dev/", 9))
|
|
Tim Waugh |
73d7a1 |
+ use_bc = 0;
|
|
Tim Waugh |
73d7a1 |
|
|
Tim Waugh |
73d7a1 |
if ((device_fd = open_device(uri, &use_bc)) == -1)
|
|
Tim Waugh |
73d7a1 |
{
|
|
Tim Waugh |
16fc81 |
@@ -302,12 +304,7 @@
|
|
Tim Waugh |
46df88 |
if (!strncmp(uri, "usb:/dev/", 9))
|
|
Tim Waugh |
46df88 |
#ifdef __linux
|
|
Tim Waugh |
0bbee8 |
{
|
|
Tim Waugh |
0bbee8 |
- /*
|
|
Tim Waugh |
0bbee8 |
- * Do not allow direct devices anymore...
|
|
Tim Waugh |
0bbee8 |
- */
|
|
Tim Waugh |
0bbee8 |
-
|
|
Tim Waugh |
0bbee8 |
- errno = ENODEV;
|
|
Tim Waugh |
0bbee8 |
- return (-1);
|
|
Tim Waugh |
46df88 |
+ return (open(uri + 4, O_RDWR | O_EXCL));
|
|
Tim Waugh |
0bbee8 |
}
|
|
Tim Waugh |
46df88 |
else if (!strncmp(uri, "usb://", 6))
|
|
Tim Waugh |
46df88 |
{
|