Contents of /trunk/cups/patches/cups-2.1.4-dnssd-deviceid.patch
Parent Directory | Revision Log
Revision 2923 -
(show annotations)
(download)
Mon May 22 08:45:44 2017 UTC (7 years, 4 months ago) by niro
File size: 1580 byte(s)
Mon May 22 08:45:44 2017 UTC (7 years, 4 months ago) by niro
File size: 1580 byte(s)
-rediffed
1 | diff -up cups-2.1.4/backend/dnssd.c.dnssd-deviceid cups-2.1.4/backend/dnssd.c |
2 | --- cups-2.1.4/backend/dnssd.c.dnssd-deviceid 2016-06-15 14:36:19.922353606 +0200 |
3 | +++ cups-2.1.4/backend/dnssd.c 2016-06-15 14:45:45.794966648 +0200 |
4 | @@ -1188,15 +1188,22 @@ query_callback( |
5 | if (device->device_id) |
6 | free(device->device_id); |
7 | |
8 | +if (device_id[0]) |
9 | +{ |
10 | + /* Mark this as the real device ID. */ |
11 | + ptr = device_id + strlen(device_id); |
12 | + snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); |
13 | +} |
14 | + |
15 | if (!device_id[0] && strcmp(model, "Unknown")) |
16 | { |
17 | if (make_and_model[0]) |
18 | - snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", |
19 | + snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", |
20 | make_and_model, model); |
21 | else if (!_cups_strncasecmp(model, "designjet ", 10)) |
22 | - snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;", model + 10); |
23 | + snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); |
24 | else if (!_cups_strncasecmp(model, "stylus ", 7)) |
25 | - snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;", model + 7); |
26 | + snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); |
27 | else if ((ptr = strchr(model, ' ')) != NULL) |
28 | { |
29 | /* |
30 | @@ -1206,7 +1213,7 @@ query_callback( |
31 | memcpy(make_and_model, model, (size_t)(ptr - model)); |
32 | make_and_model[ptr - model] = '\0'; |
33 | |
34 | - snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", |
35 | + snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", |
36 | make_and_model, ptr + 1); |
37 | } |
38 | } |