summaryrefslogtreecommitdiff
path: root/backend/ieee1284.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-07-14 23:31:23 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-07-14 23:31:23 +0000
commit4a4b4f99149e8241247e0116cc18fec762fdb1ea (patch)
treee05af0ac92a463918e503240f82cb6e832cef2a2 /backend/ieee1284.c
parentf701418f7b9c2f499288510f0ef60d4a8291bda9 (diff)
downloadcups-4a4b4f99149e8241247e0116cc18fec762fdb1ea.tar.gz
Merge changes from CUPS 1.4.0 (r8756)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1613 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/ieee1284.c')
-rw-r--r--backend/ieee1284.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index edf7efe1b..dfb9c9c70 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -306,6 +306,14 @@ backendGetDeviceID(
mfg = temp;
}
+ if (!strncasecmp(mdl, mfg, strlen(mfg)))
+ {
+ mdl += strlen(mfg);
+
+ while (isspace(*mdl & 255))
+ mdl ++;
+ }
+
/*
* Generate the device URI from the manufacturer, make_model, and
* serial number strings.