|
 |
95d92a2 |
From c98bc4b769f85da3199485c85e8c98bb8c87ff04 Mon Sep 17 00:00:00 2001
|
|
|
95d92a2 |
From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
|
|
|
95d92a2 |
Date: Tue, 9 Oct 2012 03:01:31 +0000
|
|
|
95d92a2 |
Subject: [PATCH] Work around broken 1284 device IDs that use a newline
|
|
|
95d92a2 |
instead of a semicolon.
|
|
|
95d92a2 |
|
|
|
95d92a2 |
git-svn-id: http://svn.easysw.com/public/cups/trunk@10642 7a7537e8-13f0-0310-91df-b6672ffda945
|
|
|
95d92a2 |
---
|
|
|
95d92a2 |
diff --git a/backend/snmp.c b/backend/snmp.c
|
|
|
95d92a2 |
index f672e37..fc40800 100644
|
|
|
95d92a2 |
--- a/backend/snmp.c
|
|
|
95d92a2 |
+++ b/backend/snmp.c
|
|
|
95d92a2 |
@@ -1025,6 +1025,11 @@ read_snmp_response(int fd) /* I - SNMP socket file descriptor */
|
|
|
95d92a2 |
* Description is the IEEE-1284 device ID...
|
|
|
95d92a2 |
*/
|
|
|
95d92a2 |
|
|
|
95d92a2 |
+ char *ptr; /* Pointer into device ID */
|
|
|
95d92a2 |
+
|
|
|
95d92a2 |
+ for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
|
|
|
95d92a2 |
+ if (*ptr == '\n')
|
|
|
95d92a2 |
+ *ptr = ';'; /* A lot of bad printers put a newline */
|
|
|
95d92a2 |
if (!device->id)
|
|
|
95d92a2 |
device->id = strdup((char *)packet.object_value.string.bytes);
|
|
|
95d92a2 |
|
|
|
95d92a2 |
@@ -1066,8 +1071,11 @@ read_snmp_response(int fd) /* I - SNMP socket file descriptor */
|
|
|
95d92a2 |
*/
|
|
|
95d92a2 |
|
|
|
95d92a2 |
char make_model[256]; /* Make and model */
|
|
|
95d92a2 |
+ char *ptr; /* Pointer into device ID */
|
|
|
95d92a2 |
|
|
|
95d92a2 |
-
|
|
|
95d92a2 |
+ for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
|
|
|
95d92a2 |
+ if (*ptr == '\n')
|
|
|
95d92a2 |
+ *ptr = ';'; /* A lot of bad printers put a newline */
|
|
|
95d92a2 |
if (device->id)
|
|
|
95d92a2 |
free(device->id);
|
|
|
95d92a2 |
|
|
|
95d92a2 |
--
|
|
|
95d92a2 |
1.7.11.7
|
|
|
95d92a2 |
|