Blame cups-direct-usb.patch
|
Tim Waugh |
e27eb5 |
diff -up cups-1.3.9/backend/usb-unix.c.direct-usb cups-1.3.9/backend/usb-unix.c
|
|
Tim Waugh |
e27eb5 |
--- cups-1.3.9/backend/usb-unix.c.direct-usb 2008-07-11 23:48:49.000000000 +0100
|
|
Tim Waugh |
e27eb5 |
+++ cups-1.3.9/backend/usb-unix.c 2009-01-28 17:33:29.000000000 +0000
|
|
Tim Waugh |
e27eb5 |
@@ -94,6 +94,9 @@ print_device(const char *uri, /* I - De
|
|
Tim Waugh |
e27eb5 |
strncasecmp(hostname, "Minolta", 7);
|
|
Tim Waugh |
78ddcc |
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
|
|
Tim Waugh |
78ddcc |
|
|
Tim Waugh |
b32a2e |
+ if (use_bc && !strncmp(uri, "usb:/dev/", 9))
|
|
Tim Waugh |
b32a2e |
+ use_bc = 0;
|
|
Tim Waugh |
78ddcc |
+
|
|
Tim Waugh |
b32a2e |
if ((device_fd = open_device(uri, &use_bc)) == -1)
|
|
Tim Waugh |
b32a2e |
{
|
|
Tim Waugh |
78ddcc |
if (getenv("CLASS") != NULL)
|
|
Tim Waugh |
e27eb5 |
@@ -320,12 +323,7 @@ open_device(const char *uri, /* I - Dev
|
|
Tim Waugh |
23fc70 |
if (!strncmp(uri, "usb:/dev/", 9))
|
|
Tim Waugh |
23fc70 |
#ifdef __linux
|
|
Tim Waugh |
c617a1 |
{
|
|
Tim Waugh |
c617a1 |
- /*
|
|
Tim Waugh |
c617a1 |
- * Do not allow direct devices anymore...
|
|
Tim Waugh |
c617a1 |
- */
|
|
Tim Waugh |
c617a1 |
-
|
|
Tim Waugh |
c617a1 |
- errno = ENODEV;
|
|
Tim Waugh |
c617a1 |
- return (-1);
|
|
Tim Waugh |
23fc70 |
+ return (open(uri + 4, O_RDWR | O_EXCL));
|
|
Tim Waugh |
c617a1 |
}
|
|
Tim Waugh |
23fc70 |
else if (!strncmp(uri, "usb://", 6))
|
|
Tim Waugh |
23fc70 |
{
|