2006-11-16 16:30:20 +00:00
|
|
|
--- cups-1.2.7/backend/usb-unix.c.direct-usb 2006-11-15 20:28:39.000000000 +0000
|
|
|
|
|
+++ cups-1.2.7/backend/usb-unix.c 2006-11-16 16:23:51.000000000 +0000
|
|
|
|
|
@@ -85,6 +85,8 @@
|
|
|
|
|
*/
|
2006-07-14 11:02:44 +00:00
|
|
|
|
2006-11-16 16:30:20 +00:00
|
|
|
use_bc = strcasecmp(hostname, "Canon") && !strstr(hostname, "Minolta");
|
2006-07-14 11:02:44 +00:00
|
|
|
+ if (use_bc && !strncmp(uri, "usb:/dev/", 9))
|
|
|
|
|
+ use_bc = 0;
|
|
|
|
|
|
|
|
|
|
if ((device_fd = open_device(uri, &use_bc)) == -1)
|
|
|
|
|
{
|
2006-11-16 16:30:20 +00:00
|
|
|
@@ -302,12 +304,7 @@
|
2006-04-04 15:10:37 +00:00
|
|
|
if (!strncmp(uri, "usb:/dev/", 9))
|
|
|
|
|
#ifdef __linux
|
2006-07-04 16:58:59 +00:00
|
|
|
{
|
|
|
|
|
- /*
|
|
|
|
|
- * Do not allow direct devices anymore...
|
|
|
|
|
- */
|
|
|
|
|
-
|
|
|
|
|
- errno = ENODEV;
|
|
|
|
|
- return (-1);
|
2006-04-04 15:10:37 +00:00
|
|
|
+ return (open(uri + 4, O_RDWR | O_EXCL));
|
2006-07-04 16:58:59 +00:00
|
|
|
}
|
2006-04-04 15:10:37 +00:00
|
|
|
else if (!strncmp(uri, "usb://", 6))
|
|
|
|
|
{
|
