From aaf19ab07e5ba1f270e4ebbc321a1a0b76a4d25f Mon Sep 17 00:00:00 2001
From: msweet
Date: Wed, 7 Apr 2010 07:11:03 +0000
Subject: [PATCH] Import changes from CUPS 1.5svn-r9085.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2046 a1ca3aef-8c08-0410-bb20-df032aa958be
---
CHANGES.txt | 7 +-
backend/Dependencies | 113 +-
backend/pap.c | 122 +--
berkeley/Dependencies | 52 +-
cgi-bin/Dependencies | 117 +-
cgi-bin/admin.c | 2 +-
conf/cupsd.conf.in | 8 +-
cups/Dependencies | 1173 +++++++++++----------
cups/adminutil.h | 1 +
cups/cups-private.h | 1 +
cups/cups.h | 17 +-
cups/http.c | 2 +-
cups/ipp-private.h | 6 +-
cups/ipp-support.c | 295 +++++-
cups/ipp.c | 14 +-
cups/ipp.h | 12 +
cups/ppd-private.h | 20 +-
cups/ppd.h | 21 +-
cups/pwg-media.c | 2 +-
cups/pwg-ppd.c | 47 +-
cups/pwg-private.h | 24 +-
cups/raster.h | 4 +-
cups/testconflicts.c | 1 +
cups/testcups.c | 3 +-
cups/testipp.c | 200 ++--
cups/testpwg.c | 2 +-
cups/versioning.h | 8 +-
doc/Makefile | 2 +
doc/help/api-cgi.html | 64 +-
doc/help/api-cups.html | 108 +-
doc/help/api-httpipp.html | 91 +-
doc/help/api-ppd.html | 7 +
doc/help/whatsnew.html | 6 +-
driver/Dependencies | 107 +-
filter/Dependencies | 612 +++++------
filter/commandtops.c | 1 +
filter/common.h | 2 +-
filter/imagetops.c | 8 +-
filter/imagetoraster.c | 8 +-
filter/pdftops.c | 17 +-
filter/rastertohp.c | 1 +
filter/rastertolabel.c | 5 +-
locale/Dependencies | 37 +-
man/Makefile | 6 +-
man/ipptest.man | 89 --
man/ipptool.man | 116 ++
man/{ipp.test.man => ipptoolfile.man} | 51 +-
monitor/Dependencies | 12 +-
monitor/bcp.c | 1 +
monitor/tbcp.c | 1 +
notifier/Dependencies | 22 +-
packaging/cups.list.in | 15 +-
packaging/cups.spec.in | 10 +-
ppdc/Dependencies | 326 +++---
scheduler/Dependencies | 497 ++++-----
scheduler/conf.c | 68 +-
scheduler/ipp.c | 572 ++++++++--
scheduler/printers.c | 61 +-
scripting/php/Dependencies | 6 +-
standards/rfctohtml.c | 4 +-
systemv/Dependencies | 176 ++--
test/Dependencies | 15 +-
test/Makefile | 33 +-
test/create-printer-subscription.test | 35 +-
test/get-completed-jobs.test | 51 +
test/get-jobs.test | 43 +-
test/ipp-1.1.test | 2 +-
test/ipp-2.0.test | 83 +-
test/ipp-2.1.test | 106 +-
test/{ipptest.c => ipptool.c} | 529 ++++++++--
test/run-stp-tests.sh | 4 +-
vc2005/{ipptest.vcproj => ipptool.vcproj} | 4 +-
vcnet/cups.sln | 2 +-
vcnet/{ipptest.vcproj => ipptool.vcproj} | 6 +-
74 files changed, 3850 insertions(+), 2446 deletions(-)
delete mode 100644 man/ipptest.man
create mode 100644 man/ipptool.man
rename man/{ipp.test.man => ipptoolfile.man} (89%)
create mode 100644 test/get-completed-jobs.test
rename test/{ipptest.c => ipptool.c} (88%)
rename vc2005/{ipptest.vcproj => ipptool.vcproj} (93%)
rename vcnet/{ipptest.vcproj => ipptool.vcproj} (93%)
diff --git a/CHANGES.txt b/CHANGES.txt
index 01ec3535f..80ec932f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,13 @@
-CHANGES.txt - 2010-03-09
+CHANGES.txt - 2010-04-04
------------------------
CHANGES IN CUPS V1.5b1
+ - The scheduler now implements the Cancel-Jobs, Cancel-My-Jobs, and
+ Close-Job operations along with the job-ids operation attribute from
+ PWG 5100.11.
+ - The main CUPS header () no longer includes the PPD header
+ ().
- The scheduler and CUPS API now support the print-quality job template
attribute.
- The scheduler no longer supports the old Mac OS X Server quota
diff --git a/backend/Dependencies b/backend/Dependencies
index eb5e0e4e8..b4e2e6205 100644
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -3,45 +3,47 @@
ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
ipp.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
ipp.o: ../cups/http.h backend-private.h ../cups/backend.h
-ipp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-ipp.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ipp.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h
-ipp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string-private.h
+ipp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+ipp.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+ipp.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+ipp.o: ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h
+ipp.o: ../cups/snmp-private.h ../cups/string-private.h
lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
lpd.o: ../cups/http.h backend-private.h ../cups/backend.h
-lpd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-lpd.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpd.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h
-lpd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string-private.h
+lpd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+lpd.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+lpd.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+lpd.o: ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h
+lpd.o: ../cups/snmp-private.h ../cups/string-private.h
dnssd.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-dnssd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-dnssd.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-dnssd.o: ../cups/language.h ../cups/debug-private.h
-dnssd.o: ../cups/language-private.h ../cups/transcode.h
-dnssd.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h
-dnssd.o: ../config.h ../cups/array.h
-pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h ../cups/array.h
-pap.o: ../cups/versioning.h ../cups/file.h ../cups/language.h
-pap.o: ../cups/backend.h ../cups/sidechannel.h
+dnssd.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+dnssd.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+dnssd.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+dnssd.o: ../cups/debug-private.h ../cups/language-private.h
+dnssd.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
+dnssd.o: ../cups/string-private.h ../config.h ../cups/array.h
+pap.o: ../config.h ../cups/cups.h ../cups/backend.h ../cups/versioning.h
+pap.o: ../cups/sidechannel.h
parallel.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-parallel.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-parallel.o: ../cups/language.h ../cups/debug-private.h
-parallel.o: ../cups/language-private.h ../cups/transcode.h
-parallel.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h
-parallel.o: ../config.h
+parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+parallel.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+parallel.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+parallel.o: ../cups/debug-private.h ../cups/language-private.h
+parallel.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
+parallel.o: ../cups/string-private.h ../config.h
serial.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-serial.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-serial.o: ../cups/language.h ../cups/debug-private.h
-serial.o: ../cups/language-private.h ../cups/transcode.h
-serial.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h
-serial.o: ../config.h
+serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+serial.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+serial.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+serial.o: ../cups/debug-private.h ../cups/language-private.h
+serial.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
+serial.o: ../cups/string-private.h ../config.h
snmp.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-snmp.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-snmp.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h
+snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+snmp.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+snmp.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+snmp.o: ../cups/debug-private.h ../cups/language-private.h
snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
snmp.o: ../cups/string-private.h ../config.h ../cups/array.h ../cups/file.h
snmp.o: ../cups/http-private.h ../cups/md5-private.h ../cups/ipp-private.h
@@ -49,35 +51,36 @@ snmp.o: ../cups/ipp.h ../cups/http.h
socket.o: ../cups/http-private.h ../config.h ../cups/http.h
socket.o: ../cups/versioning.h ../cups/md5-private.h ../cups/ipp-private.h
socket.o: ../cups/ipp.h ../cups/http.h backend-private.h ../cups/backend.h
-socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-socket.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-socket.o: ../cups/language.h ../cups/debug-private.h
-socket.o: ../cups/language-private.h ../cups/transcode.h
-socket.o: ../cups/snmp-private.h ../cups/string-private.h
+socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+socket.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+socket.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+socket.o: ../cups/debug-private.h ../cups/language-private.h
+socket.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string-private.h
test1284.o: ../cups/string-private.h ../config.h ieee1284.c backend-private.h
test1284.o: ../cups/backend.h ../cups/versioning.h ../cups/sidechannel.h
-test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/ppd.h
-test1284.o: ../cups/array.h ../cups/file.h ../cups/language.h
-test1284.o: ../cups/debug-private.h ../cups/language-private.h
-test1284.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
-test1284.o: ../cups/cups-private.h ../cups/string-private.h
-test1284.o: ../cups/debug-private.h ../cups/http-private.h
+test1284.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h ../cups/file.h
+test1284.o: ../cups/ipp.h ../cups/language.h ../cups/array.h
+test1284.o: ../cups/pwg-private.h ../cups/cups.h ../cups/debug-private.h
+test1284.o: ../cups/language-private.h ../cups/transcode.h
+test1284.o: ../cups/snmp-private.h ../cups/http.h ../cups/cups-private.h
+test1284.o: ../cups/string-private.h ../cups/debug-private.h
+test1284.o: ../cups/ppd-private.h ../cups/http-private.h
test1284.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-test1284.o: ../cups/http.h ../cups/language-private.h ../cups/pwg-private.h
+test1284.o: ../cups/http.h ../cups/language-private.h
testbackend.o: ../cups/string-private.h ../config.h ../cups/cups.h
-testbackend.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h
-testbackend.o: ../cups/versioning.h ../cups/file.h ../cups/language.h
-testbackend.o: ../cups/sidechannel.h
+testbackend.o: ../cups/sidechannel.h ../cups/versioning.h
testsupplies.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-testsupplies.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testsupplies.o: ../cups/language.h ../cups/debug-private.h
+testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+testsupplies.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h
+testsupplies.o: ../cups/language.h ../cups/array.h ../cups/pwg-private.h
+testsupplies.o: ../cups/cups.h ../cups/debug-private.h
testsupplies.o: ../cups/language-private.h ../cups/transcode.h
testsupplies.o: ../cups/snmp-private.h ../cups/http.h
testsupplies.o: ../cups/string-private.h ../config.h
usb.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-usb.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
-usb.o: ../cups/ipp.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-usb.o: ../cups/language.h ../cups/debug-private.h ../cups/language-private.h
-usb.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/http.h
-usb.o: ../cups/string-private.h ../config.h
+usb.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h
+usb.o: ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/language.h
+usb.o: ../cups/array.h ../cups/pwg-private.h ../cups/cups.h
+usb.o: ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h
+usb.o: ../cups/snmp-private.h ../cups/http.h ../cups/string-private.h
+usb.o: ../config.h
diff --git a/backend/pap.c b/backend/pap.c
index 8acda032e..3c8d8571d 100644
--- a/backend/pap.c
+++ b/backend/pap.c
@@ -1,15 +1,15 @@
/*
* "$Id: pap.c 7720 2008-07-11 22:46:21Z mike $"
*
-* Copyright 2004-2008 Apple Inc. All rights reserved.
-*
+* Copyright 2004-2010 Apple Inc. All rights reserved.
+*
* IMPORTANT: This Apple software is supplied to you by Apple Computer,
* Inc. ("Apple") in consideration of your agreement to the following
* terms, and your use, installation, modification or redistribution of
* this Apple software constitutes acceptance of these terms. If you do
* not agree with these terms, please do not use, install, modify or
* redistribute this Apple software.
-*
+*
* In consideration of your agreement to abide by the following terms, and
* subject to these terms, Apple grants you a personal, non-exclusive
* license, under AppleĆs copyrights in this original Apple software (the
@@ -17,7 +17,7 @@
* Software, with or without modifications, in source and/or binary forms;
* provided that if you redistribute the Apple Software in its entirety and
* without modifications, you must retain this notice and the following
-* text and disclaimers in all such redistributions of the Apple Software.
+* text and disclaimers in all such redistributions of the Apple Software.
* Neither the name, trademarks, service marks or logos of Apple Computer,
* Inc. may be used to endorse or promote products derived from the Apple
* Software without specific prior written permission from Apple. Except
@@ -25,13 +25,13 @@
* or implied, are granted by Apple herein, including but not limited to
* any patent rights that may be infringed by your derivative works or by
* other works in which the Apple Software may be incorporated.
-*
+*
* The Apple Software is provided by Apple on an "AS IS" basis. APPLE
* MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
* THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
* OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
-*
+*
* IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -42,8 +42,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*
-* This program implements the Printer Access Protocol (PAP) on top of AppleTalk
-* Transaction Protocol (ATP). If it were to use the blocking pap functions of
+* This program implements the Printer Access Protocol (PAP) on top of AppleTalk
+* Transaction Protocol (ATP). If it were to use the blocking pap functions of
* the AppleTalk library it would need seperate threads for reading, writing
* and status.
*
@@ -98,7 +98,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -117,20 +117,20 @@ enum { RUNNING, NOTLOADED, LOADED, OTHERERROR };
extern int atp_abort(int fd, at_inet_t *dest, u_short tid);
extern int atp_close(int fd);
-extern int atp_getreq(int fd, at_inet_t *src, char *buf, int *len, int *userdata,
+extern int atp_getreq(int fd, at_inet_t *src, char *buf, int *len, int *userdata,
int *xo, u_short *tid, u_char *bitmap, int nowait);
extern int atp_getresp(int fd, u_short *tid, at_resp_t *resp);
extern int atp_look(int fd);
extern int atp_open(at_socket *sock);
-extern int atp_sendreq(int fd, at_inet_t *dest, char *buf, int len,
- int userdata, int xo, int xo_relt, u_short *tid,
+extern int atp_sendreq(int fd, at_inet_t *dest, char *buf, int len,
+ int userdata, int xo, int xo_relt, u_short *tid,
at_resp_t *resp, at_retry_t *retry, int nowait);
-extern int atp_sendrsp(int fd, at_inet_t *dest, int xo, u_short tid,
+extern int atp_sendrsp(int fd, at_inet_t *dest, int xo, u_short tid,
at_resp_t *resp);
extern int checkATStack();
-extern int nbp_lookup(at_entity_t *entity, at_nbptuple_t *buf, int max,
+extern int nbp_lookup(at_entity_t *entity, at_nbptuple_t *buf, int max,
at_retry_t *retry);
-extern int nbp_make_entity(at_entity_t *entity, char *obj, char *type,
+extern int nbp_make_entity(at_entity_t *entity, char *obj, char *type,
char *zone);
extern int zip_getmyzone(char *ifName, at_nvestr_t *zone);
#endif /* HAVE_APPLETALK_AT_PROTO_H */
@@ -168,16 +168,16 @@ int gDebug = 0; /* Option: emit debugging info */
/* Local functions */
static int listDevices(void);
-static int printFile(char* name, char* type, char* zone, int fdin, int fdout,
+static int printFile(char* name, char* type, char* zone, int fdin, int fdout,
int fderr, int copies, int argc);
-static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
+static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
at_inet_t* pap_to, u_char* flowQuantum);
static int papClose();
-static int papWrite(int sockfd, at_inet_t* dest, u_short tid, u_char connID,
+static int papWrite(int sockfd, at_inet_t* dest, u_short tid, u_char connID,
u_char flowQuantum, char* data, int len, int eof);
-static int papCloseResp(int sockfd, at_inet_t* dest, int xo, u_short tid,
+static int papCloseResp(int sockfd, at_inet_t* dest, int xo, u_short tid,
u_char connID);
-static int papSendRequest(int sockfd, at_inet_t* dest, u_char connID,
+static int papSendRequest(int sockfd, at_inet_t* dest, u_char connID,
int function, u_char bitmap, int xo, int seqno);
static int papCancelRequest(int sockfd, u_short tid);
static void sidechannel_request();
@@ -331,7 +331,7 @@ static int listDevices(void)
/* Not required but sort them so they look nice */
qsort(buf, numberFound, sizeof(at_nbptuple_t), nbptuple_compare);
- for (i = 0; i < numberFound; i++)
+ for (i = 0; i < numberFound; i++)
{
memcpy(name, buf[i].enu_entity.object.str, MIN(buf[i].enu_entity.object.len, sizeof(name)-1));
name[MIN(buf[i].enu_entity.object.len, sizeof(name)-1)] = '\0';
@@ -418,7 +418,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
u_char flowQuantum = 1;
time_t now,
start_time,
- elasped_time,
+ elasped_time,
sleep_time,
connect_timeout = -1,
nextStatusTime = 0;
@@ -539,7 +539,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
* Now that we are connected to the printer ignore SIGTERM so that we
* can finish out any page data the driver sends (e.g. to eject the
* current page... if we are printing data from a file then catch the
- * signal so we can send a PAP Close packet (otherwise you can't cancel
+ * signal so we can send a PAP Close packet (otherwise you can't cancel
* raw jobs...)
*/
@@ -688,14 +688,14 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
_cupsLangPrintError(_("ERROR: Unable to look for PAP response"));
break;
}
-
+
if (rc > 0)
{
/* It's an ATP response */
resp.resp[0].iov_base = sockBuffer;
resp.resp[0].iov_len = sizeof(sockBuffer) - 1;
resp.bitmap = 0x01;
-
+
if ((err = atp_getresp(gSockfd, &tid, &resp)) < 0)
{
_cupsLangPrintError(_("ERROR: Unable to get PAP response"));
@@ -725,7 +725,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
statusUpdate(&iov_base[5], iov_base[4]);
}
break;
-
+
case AT_PAP_TYPE_SEND_DATA: /* Send-Data packet */
sendDataAddr.socket = src.socket;
gSendDataID = tid;
@@ -753,7 +753,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
}
}
break;
-
+
case AT_PAP_TYPE_DATA: /* Data packet */
for (len=0, i=0; i < ATP_TRESP_MAX; i++)
{
@@ -769,12 +769,12 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
char *logLevel;
char logstr[512];
int logstrlen;
-
+
cupsBackChannelWrite(sockBuffer, len, 1.0);
-
+
sockBuffer[len] = '\0'; /* We always reserve room for the nul so we can use strstr() below*/
pLineBegin = sockBuffer;
-
+
/* If there are PostScript status comments in the buffer log them.
*
* This logic shouldn't be in the backend but until we get backchannel
@@ -786,16 +786,16 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
{
pCommentEnd += 3; /* Skip past "]%%" */
*pCommentEnd = '\0'; /* There's always room for the nul */
-
+
/* Strip the CRs & LFs before writing it to stderr */
for (pChar = pLineBegin; pChar < pCommentEnd; pChar++)
if (*pChar == '\r' || *pChar == '\n')
*pChar = ' ';
-
+
if (strncasecmp(pLineBegin, "%%[ Error:", 10) == 0)
{
/* logLevel should be "ERROR" here but this causes PrintCenter
- * to pause the queue which in turn clears this error, which
+ * to pause the queue which in turn clears this error, which
* restarts the job. So the job ends up in an infinite loop with
* the queue being held/un-held. Just make it DEBUG for now until
* we fix notifications later.
@@ -807,7 +807,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
logLevel = "DEBUG";
else
logLevel = "INFO";
-
+
if ((logstrlen = snprintf(logstr, sizeof(logstr), "%s: %s\n", logLevel, pLineBegin)) >= sizeof(logstr))
{
/* If the string was trucnated make sure it has a linefeed before the nul */
@@ -840,10 +840,10 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
goto Exit;
}
break;
-
+
case AT_PAP_TYPE_TICKLE: /* Tickle packet */
break;
-
+
case AT_PAP_TYPE_CLOSE_CONN: /* Close-Connection packet */
/* We shouldn't normally see this. */
papCloseResp(gSockfd, &gSessionAddr, xo, tid, gConnID);
@@ -859,7 +859,7 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
}
goto Exit;
break;
-
+
case AT_PAP_TYPE_OPEN_CONN: /* Open-Connection packet */
case AT_PAP_TYPE_OPEN_CONN_REPLY: /* Open-Connection-Reply packet */
case AT_PAP_TYPE_SEND_STATUS: /* Send-Status packet */
@@ -867,13 +867,13 @@ static int printFile(char* name, char* type, char* zone, int fdin, int fdout, in
_cupsLangPrintf(stderr, _("WARNING: Unexpected PAP packet of type %d\n"),
TYPE_OF(userdata));
break;
-
+
default:
_cupsLangPrintf(stderr, _("WARNING: Unknown PAP packet of type %d\n"),
TYPE_OF(userdata));
break;
}
-
+
if (CONNID_OF(userdata) == gConnID)
{
/* Reset tickle timer */
@@ -906,7 +906,7 @@ Exit:
*
* @result A non-zero return value for errors
*/
-static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
+static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
at_inet_t* sessionAddr, u_char* flowQuantum)
{
int result,
@@ -914,7 +914,7 @@ static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
userdata;
time_t tm,
waitTime;
- char data[10],
+ char data[10],
rdata[ATP_DATA_SIZE];
u_char *puserdata;
at_socket socketfd;
@@ -930,7 +930,7 @@ static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
if ((*fd = atp_open(&socketfd)) < 0)
return -1;
- /*
+ /*
* Build the open connection request packet.
*/
@@ -960,7 +960,7 @@ static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
fprintf(stderr, "DEBUG: -> %s\n", packet_name(AT_PAP_TYPE_OPEN_CONN));
- if (atp_sendreq(*fd, &tuple->enu_addr, data, 4, userdata, 1, 0,
+ if (atp_sendreq(*fd, &tuple->enu_addr, data, 4, userdata, 1, 0,
0, &resp, &retry, 0) < 0)
{
statusUpdate("Destination unreachable", 23);
@@ -971,7 +971,7 @@ static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
puserdata = (u_char *)&resp.userdata[0];
open_result = OSReadBigInt16(&rdata[2], 0);
- fprintf(stderr, "DEBUG: <- %s, status %d\n", packet_name(puserdata[1]),
+ fprintf(stderr, "DEBUG: <- %s, status %d\n", packet_name(puserdata[1]),
open_result);
/*
@@ -1019,7 +1019,7 @@ static int papOpen(at_nbptuple_t* tuple, u_char* connID, int* fd,
/*!
* @function papClose
- * @abstract End a PAP session by canceling outstanding send-data & tickle
+ * @abstract End a PAP session by canceling outstanding send-data & tickle
* transactions and sending a PAP close request.
*
* @result A non-zero return value for errors
@@ -1040,7 +1040,7 @@ static int papClose()
gSockfd = 0;
alarm(0);
-
+
/* Cancel the pending send-data and tickle trnsactions
*/
if (gSendDataID)
@@ -1049,7 +1049,7 @@ static int papClose()
gSendDataID = 0;
papCancelRequest(fd, tmpID);
}
-
+
if (gTickleID)
{
tmpID = gTickleID;
@@ -1059,29 +1059,29 @@ static int papClose()
/* This is a workaround for bug #2735145. The problem is papWrite()
* returns before the ATP TRel arrives for it. If we send the pap close packet
- * before this release then the printer can drop the last data packets.
- * The effect on an Epson printer is the last page doesn't print, on HP it
+ * before this release then the printer can drop the last data packets.
+ * The effect on an Epson printer is the last page doesn't print, on HP it
* doesn't close the pap session.
*/
if (gWaitEOF == false)
sleep(2);
fprintf(stderr, "DEBUG: -> %s\n", packet_name(AT_PAP_TYPE_CLOSE_CONN));
-
+
puserdata[0] = gConnID;
puserdata[1] = AT_PAP_TYPE_CLOSE_CONN;
puserdata[2] = 0;
puserdata[3] = 0;
-
+
retry.interval = 2;
retry.retries = 5;
-
+
resp.bitmap = 0x01;
resp.resp[0].iov_base = rdata;
resp.resp[0].iov_len = sizeof(rdata);
-
+
atp_sendreq(fd, &gSessionAddr, 0, 0, userdata, 1, 0, 0, &resp, &retry, 0);
-
+
close(fd);
}
return noErr;
@@ -1307,7 +1307,7 @@ sidechannel_request()
case CUPS_SC_CMD_SOFT_RESET: /* Do a soft reset */
case CUPS_SC_CMD_GET_DEVICE_ID: /* Return IEEE-1284 device ID */
default:
- return (cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED,
+ return (cupsSideChannelWrite(command, CUPS_SC_STATUS_NOT_IMPLEMENTED,
NULL, 0, 1.0));
break;
}
@@ -1336,8 +1336,8 @@ void statusUpdate(char* status, u_char statusLen)
last_statusLen = statusLen;
memcpy(status_str, status, statusLen);
status_str[(int)statusLen] = '\0';
-
- /*
+
+ /*
* Make sure the status string is in the form of a PostScript comment.
*/
@@ -1382,7 +1382,7 @@ static int parseUri(const char* argv0, char* name, char* type, char* zone)
method[0] = username[0] = hostname[0] = resource[0] = '\0';
port = 0;
- httpSeparateURI(HTTP_URI_CODING_NONE, argv0, method, sizeof(method),
+ httpSeparateURI(HTTP_URI_CODING_NONE, argv0, method, sizeof(method),
username, sizeof(username),
hostname, sizeof(hostname), &port,
resource, sizeof(resource));
@@ -1526,7 +1526,7 @@ static int addPercentEscapes(const char* src, char* dst, int dstMax)
{
c = *src++;
- if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+ if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9') || (c == '.' || c == '-' || c == '*' || c == '_'))
{
if (dst >= dstEnd)
@@ -1594,7 +1594,7 @@ static int removePercentEscapes(const char* src, char* dst, int dstMax)
int nbptuple_compare(const void *p1, const void *p2)
{
int result;
- int len = MIN(((at_nbptuple_t*)p1)->enu_entity.object.len,
+ int len = MIN(((at_nbptuple_t*)p1)->enu_entity.object.len,
((at_nbptuple_t*)p2)->enu_entity.object.len);
if ((result = memcmp(((at_nbptuple_t*)p1)->enu_entity.object.str, ((at_nbptuple_t*)p2)->enu_entity.object.str, len)) == 0)
@@ -1619,7 +1619,7 @@ int nbptuple_compare(const void *p1, const void *p2)
static int okayToUseAppleTalk()
{
int atStatus = checkATStack();
-
+
/* I think the test should be:
* return atStatus == RUNNING || atStatus == LOADED;
* but when I disable AppleTalk from the network control panel and
diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 1420a4c0f..7a3341fb6 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,26 +1,30 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-lpc.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpc.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpc.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
-lpc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-lpc.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
-lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-lpq.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpq.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpq.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
-lpq.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-lpq.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
-lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-lpr.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpr.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpr.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
-lpr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-lpr.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
-lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-lprm.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lprm.o: ../cups/language.h ../cups/string-private.h ../config.h
-lprm.o: ../cups/debug-private.h ../cups/http-private.h ../cups/http.h
-lprm.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-lprm.o: ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h
+lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+lpc.o: ../cups/array.h ../cups/string-private.h ../config.h
+lpc.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+lpc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+lpc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+lpc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpq.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+lpq.o: ../cups/array.h ../cups/string-private.h ../config.h
+lpq.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+lpq.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+lpq.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+lpq.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lpr.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+lpr.o: ../cups/array.h ../cups/string-private.h ../config.h
+lpr.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+lpr.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+lpr.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+lpr.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+lprm.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+lprm.o: ../cups/array.h ../cups/string-private.h ../config.h
+lprm.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+lprm.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+lprm.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+lprm.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index e1607f929..c8a4e51ba 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -1,76 +1,75 @@
# DO NOT DELETE
-help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help-index.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-help-index.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+help-index.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+help-index.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
help-index.o: ../cups/debug-private.h ../cups/language-private.h
help-index.o: ../cups/transcode.h ../cups/string-private.h ../config.h
help-index.o: ../cups/dir.h
-html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-html.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-html.o: ../cups/language.h ../cups/array.h help-index.h
-html.o: ../cups/debug-private.h ../cups/language-private.h
-html.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-ipp-var.o: ../cups/language.h ../cups/array.h help-index.h
+html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+html.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+html.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h
+html.o: ../cups/language-private.h ../cups/transcode.h
+html.o: ../cups/string-private.h ../config.h
+ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+ipp-var.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+ipp-var.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
ipp-var.o: ../cups/debug-private.h ../cups/language-private.h
ipp-var.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-search.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-search.o: ../cups/language.h ../cups/array.h help-index.h
+search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+search.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+search.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
search.o: ../cups/debug-private.h ../cups/language-private.h
search.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-template.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-template.o: ../cups/language.h ../cups/array.h help-index.h
+template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+template.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+template.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
template.o: ../cups/debug-private.h ../cups/language-private.h
template.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-var.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-var.o: ../cups/language.h ../cups/array.h help-index.h
-var.o: ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h
+var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+var.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
+var.o: ../cups/array.h help-index.h ../cups/debug-private.h
+var.o: ../cups/language-private.h ../cups/transcode.h
var.o: ../cups/string-private.h ../config.h ../cups/http.h
var.o: ../cups/md5-private.h
-admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-admin.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-admin.o: ../cups/language.h ../cups/array.h help-index.h
-admin.o: ../cups/debug-private.h ../cups/language-private.h
-admin.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/file.h
-classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-classes.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-classes.o: ../cups/language.h ../cups/array.h help-index.h
+admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+admin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+admin.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h
+admin.o: ../cups/language-private.h ../cups/transcode.h
+admin.o: ../cups/string-private.h ../config.h ../cups/adminutil.h
+admin.o: ../cups/cups.h ../cups/ppd.h
+classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+classes.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
classes.o: ../cups/debug-private.h ../cups/language-private.h
classes.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-help.o: ../cups/language.h ../cups/array.h help-index.h
-help.o: ../cups/debug-private.h ../cups/language-private.h
-help.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-jobs.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-jobs.o: ../cups/language.h ../cups/array.h help-index.h
-jobs.o: ../cups/debug-private.h ../cups/language-private.h
-jobs.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-makedocset.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-makedocset.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-makedocset.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
-printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-printers.o: ../cups/language.h ../cups/array.h help-index.h
+help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+help.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+help.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h
+help.o: ../cups/language-private.h ../cups/transcode.h
+help.o: ../cups/string-private.h ../config.h
+jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+jobs.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h
+jobs.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h
+jobs.o: ../cups/language-private.h ../cups/transcode.h
+jobs.o: ../cups/string-private.h ../config.h
+makedocset.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+makedocset.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
+makedocset.o: ../cups/array.h help-index.h
+printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h
+printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
+printers.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h
printers.o: ../cups/debug-private.h ../cups/language-private.h
printers.o: ../cups/transcode.h ../cups/string-private.h ../config.h
-testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testcgi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testcgi.o: ../cups/language.h ../cups/array.h help-index.h
-testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testhi.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testhi.o: ../cups/language.h ../cups/array.h help-index.h
-testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testtemplate.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-testtemplate.o: ../cups/file.h ../cups/language.h ../cups/array.h
-testtemplate.o: help-index.h
-websearch.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-websearch.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
-websearch.o: ../cups/file.h ../cups/language.h ../cups/array.h help-index.h
+testcgi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testcgi.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
+testcgi.o: ../cups/array.h help-index.h
+testhi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testhi.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
+testhi.o: ../cups/array.h help-index.h
+testtemplate.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+testtemplate.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
+testtemplate.o: ../cups/array.h ../cups/array.h help-index.h
+websearch.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h
+websearch.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
+websearch.o: ../cups/array.h help-index.h
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 5617be224..58fb7b8a4 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -40,7 +40,7 @@
#include "cgi-private.h"
#include
-#include
+#include
#include
#include
#include
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index f02a74133..e51c430c1 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -46,7 +46,7 @@ DefaultAuthType Basic
# Set the default printer/job policies...
# Job-related operations must be done by the owner or an administrator...
-
+
Require user @OWNER @SYSTEM
Order deny,allow
@@ -66,7 +66,7 @@ DefaultAuthType Basic
# Only the owner or an administrator can cancel or authenticate a job...
-
+
Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
Order deny,allow
@@ -84,7 +84,7 @@ DefaultAuthType Basic
Order deny,allow
-
+
AuthType Default
Require user @OWNER @SYSTEM
Order deny,allow
@@ -105,7 +105,7 @@ DefaultAuthType Basic
# Only the owner or an administrator can cancel or authenticate a job...
-
+
AuthType Default
Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
Order deny,allow
diff --git a/cups/Dependencies b/cups/Dependencies
index 6ddb2548b..56639ae69 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,193 +1,205 @@
# DO NOT DELETE
-adminutil.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-adminutil.o: array.h file.h language.h string-private.h ../config.h
-adminutil.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-adminutil.o: ipp-private.h ../cups/ipp.h language-private.h
-adminutil.o: ../cups/transcode.h pwg-private.h adminutil.h cups.h
+adminutil.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+adminutil.o: language.h array.h string-private.h ../config.h debug-private.h
+adminutil.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+adminutil.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+adminutil.o: language-private.h ../cups/transcode.h adminutil.h
array.o: string-private.h ../config.h debug-private.h array.h versioning.h
-attr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-attr.o: file.h language.h string-private.h ../config.h debug-private.h
-attr.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-attr.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-attr.o: ppd-private.h
-auth.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-auth.o: file.h language.h string-private.h ../config.h debug-private.h
-auth.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-auth.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+attr.o: language.h array.h string-private.h ../config.h debug-private.h
+attr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+attr.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+attr.o: language-private.h ../cups/transcode.h
+auth.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+auth.o: language.h array.h string-private.h ../config.h debug-private.h
+auth.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+auth.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+auth.o: language-private.h ../cups/transcode.h
backchannel.o: cups.h
-backend.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-backend.o: array.h file.h language.h string-private.h ../config.h
-backend.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-backend.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-backend.o: pwg-private.h backend.h
-conflicts.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-conflicts.o: array.h file.h language.h string-private.h ../config.h
-conflicts.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-conflicts.o: ipp-private.h ../cups/ipp.h language-private.h
-conflicts.o: ../cups/transcode.h pwg-private.h ppd-private.h
-custom.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-custom.o: array.h file.h language.h string-private.h ../config.h
-custom.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-custom.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-custom.o: pwg-private.h
-debug.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-debug.o: array.h file.h language.h string-private.h ../config.h
-debug.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-debug.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-debug.o: pwg-private.h
-dest.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-dest.o: file.h language.h string-private.h ../config.h debug-private.h
-dest.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-dest.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backend.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+backend.o: language.h array.h string-private.h ../config.h debug-private.h
+backend.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+backend.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+backend.o: language-private.h ../cups/transcode.h backend.h
+conflicts.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+conflicts.o: language.h array.h string-private.h ../config.h debug-private.h
+conflicts.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+conflicts.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+conflicts.o: language-private.h ../cups/transcode.h
+custom.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+custom.o: language.h array.h string-private.h ../config.h debug-private.h
+custom.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+custom.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+custom.o: language-private.h ../cups/transcode.h
+debug.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+debug.o: language.h array.h string-private.h ../config.h debug-private.h
+debug.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+debug.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+debug.o: language-private.h ../cups/transcode.h
+dest.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+dest.o: language.h array.h string-private.h ../config.h debug-private.h
+dest.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+dest.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+dest.o: language-private.h ../cups/transcode.h
dir.o: string-private.h ../config.h debug-private.h dir.h versioning.h
-emit.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-emit.o: file.h language.h string-private.h ../config.h debug-private.h
-emit.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-emit.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-encode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-encode.o: array.h file.h language.h string-private.h ../config.h
-encode.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-encode.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-encode.o: pwg-private.h
-file.o: file-private.h cups-private.h ../cups/cups.h ipp.h http.h
-file.o: versioning.h ppd.h array.h file.h language.h string-private.h
-file.o: ../config.h debug-private.h http-private.h ../cups/http.h
-file.o: md5-private.h ipp-private.h ../cups/ipp.h language-private.h
-file.o: ../cups/transcode.h pwg-private.h
-getdevices.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getdevices.o: array.h file.h language.h string-private.h ../config.h
-getdevices.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-getdevices.o: ipp-private.h ../cups/ipp.h language-private.h
-getdevices.o: ../cups/transcode.h pwg-private.h
+emit.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+emit.o: language.h array.h string-private.h ../config.h debug-private.h
+emit.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+emit.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+emit.o: language-private.h ../cups/transcode.h
+encode.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+encode.o: language.h array.h string-private.h ../config.h debug-private.h
+encode.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+encode.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+encode.o: language-private.h ../cups/transcode.h
+file.o: file-private.h cups-private.h ../cups/cups.h file.h versioning.h
+file.o: ipp.h http.h language.h array.h string-private.h ../config.h
+file.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h
+file.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
+file.o: ../cups/ipp.h language-private.h ../cups/transcode.h
+getdevices.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getdevices.o: language.h array.h string-private.h ../config.h debug-private.h
+getdevices.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getdevices.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getdevices.o: language-private.h ../cups/transcode.h
getifaddrs.o: http-private.h ../config.h ../cups/http.h md5-private.h
getifaddrs.o: ipp-private.h ../cups/ipp.h
-getputfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getputfile.o: array.h file.h language.h string-private.h ../config.h
-getputfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-getputfile.o: ipp-private.h ../cups/ipp.h language-private.h
-getputfile.o: ../cups/transcode.h pwg-private.h
-globals.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-globals.o: array.h file.h language.h string-private.h ../config.h
-globals.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-globals.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-globals.o: pwg-private.h
-http.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-http.o: file.h language.h string-private.h ../config.h debug-private.h
-http.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-http.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-http-addr.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-addr.o: array.h file.h language.h string-private.h ../config.h
-http-addr.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-http-addr.o: ipp-private.h ../cups/ipp.h language-private.h
-http-addr.o: ../cups/transcode.h pwg-private.h
-http-addrlist.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h
-http-addrlist.o: ppd.h array.h file.h language.h string-private.h ../config.h
-http-addrlist.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getputfile.o: language.h array.h string-private.h ../config.h debug-private.h
+getputfile.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getputfile.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getputfile.o: language-private.h ../cups/transcode.h
+globals.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+globals.o: language.h array.h string-private.h ../config.h debug-private.h
+globals.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+globals.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+globals.o: language-private.h ../cups/transcode.h
+http.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http.o: language.h array.h string-private.h ../config.h debug-private.h
+http.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http.o: language-private.h ../cups/transcode.h
+http-addr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http-addr.o: language.h array.h string-private.h ../config.h debug-private.h
+http-addr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http-addr.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http-addr.o: language-private.h ../cups/transcode.h
+http-addrlist.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-addrlist.o: http.h language.h array.h string-private.h ../config.h
+http-addrlist.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-addrlist.o: pwg-private.h http-private.h ../cups/http.h md5-private.h
http-addrlist.o: ipp-private.h ../cups/ipp.h language-private.h
-http-addrlist.o: ../cups/transcode.h pwg-private.h
-http-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-support.o: array.h file.h language.h string-private.h ../config.h
-http-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.o: ../cups/transcode.h
+http-support.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-support.o: http.h language.h array.h string-private.h ../config.h
+http-support.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-support.o: pwg-private.h http-private.h ../cups/http.h md5-private.h
http-support.o: ipp-private.h ../cups/ipp.h language-private.h
-http-support.o: ../cups/transcode.h pwg-private.h
-ipp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ipp.o: file.h language.h string-private.h ../config.h debug-private.h
-ipp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-ipp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ipp-support.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-ipp-support.o: array.h file.h language.h string-private.h ../config.h
-ipp-support.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.o: ../cups/transcode.h
+ipp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp.o: language.h array.h string-private.h ../config.h debug-private.h
+ipp.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ipp.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ipp.o: language-private.h ../cups/transcode.h
+ipp-support.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp-support.o: language.h array.h string-private.h ../config.h
+ipp-support.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h
+ipp-support.o: pwg-private.h http-private.h ../cups/http.h md5-private.h
ipp-support.o: ipp-private.h ../cups/ipp.h language-private.h
-ipp-support.o: ../cups/transcode.h pwg-private.h
-langprintf.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-langprintf.o: array.h file.h language.h string-private.h ../config.h
-langprintf.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-langprintf.o: ipp-private.h ../cups/ipp.h language-private.h
-langprintf.o: ../cups/transcode.h pwg-private.h
-language.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-language.o: array.h file.h language.h string-private.h ../config.h
-language.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-language.o: ipp-private.h ../cups/ipp.h language-private.h
-language.o: ../cups/transcode.h pwg-private.h
-localize.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-localize.o: array.h file.h language.h string-private.h ../config.h
-localize.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-localize.o: ipp-private.h ../cups/ipp.h language-private.h
-localize.o: ../cups/transcode.h pwg-private.h ppd-private.h
-mark.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-mark.o: file.h language.h string-private.h ../config.h debug-private.h
-mark.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-mark.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.o: ../cups/transcode.h
+langprintf.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+langprintf.o: language.h array.h string-private.h ../config.h debug-private.h
+langprintf.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+langprintf.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+langprintf.o: language-private.h ../cups/transcode.h
+language.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+language.o: language.h array.h string-private.h ../config.h debug-private.h
+language.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+language.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+language.o: language-private.h ../cups/transcode.h
+localize.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+localize.o: language.h array.h string-private.h ../config.h debug-private.h
+localize.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+localize.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+localize.o: language-private.h ../cups/transcode.h
+mark.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+mark.o: language.h array.h string-private.h ../config.h debug-private.h
+mark.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+mark.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+mark.o: language-private.h ../cups/transcode.h
md5.o: md5-private.h string-private.h ../config.h
md5passwd.o: http-private.h ../config.h ../cups/http.h md5-private.h
md5passwd.o: ipp-private.h ../cups/ipp.h string-private.h
-notify.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-notify.o: array.h file.h language.h string-private.h ../config.h
-notify.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-notify.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-notify.o: pwg-private.h
+notify.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+notify.o: language.h array.h string-private.h ../config.h debug-private.h
+notify.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+notify.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+notify.o: language-private.h ../cups/transcode.h
options.o: cups.h string-private.h ../config.h debug-private.h
-page.o: string-private.h ../config.h debug-private.h ppd.h array.h
+page.o: string-private.h ../config.h debug-private.h ppd.h cups.h array.h
page.o: versioning.h file.h
-ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ppd.o: file.h language.h string-private.h ../config.h debug-private.h
-ppd.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-ppd.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ppd.o: ppd-private.h
-pwg-file.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-file.o: array.h file.h language.h string-private.h ../config.h
-pwg-file.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-file.o: ipp-private.h ../cups/ipp.h language-private.h
-pwg-file.o: ../cups/transcode.h pwg-private.h
-pwg-media.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-media.o: array.h file.h language.h string-private.h ../config.h
-pwg-media.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-media.o: ipp-private.h ../cups/ipp.h language-private.h
-pwg-media.o: ../cups/transcode.h pwg-private.h
-pwg-ppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-ppd.o: array.h file.h language.h string-private.h ../config.h
-pwg-ppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-ppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-pwg-ppd.o: pwg-private.h
-request.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-request.o: array.h file.h language.h string-private.h ../config.h
-request.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-request.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-request.o: pwg-private.h
+ppd.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ppd.o: language.h array.h string-private.h ../config.h debug-private.h
+ppd.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ppd.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ppd.o: language-private.h ../cups/transcode.h
+pwg-file.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-file.o: language.h array.h string-private.h ../config.h debug-private.h
+pwg-file.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-file.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-file.o: language-private.h ../cups/transcode.h
+pwg-media.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-media.o: language.h array.h string-private.h ../config.h debug-private.h
+pwg-media.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-media.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-media.o: language-private.h ../cups/transcode.h
+pwg-ppd.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-ppd.o: language.h array.h string-private.h ../config.h debug-private.h
+pwg-ppd.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-ppd.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-ppd.o: language-private.h ../cups/transcode.h
+request.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+request.o: language.h array.h string-private.h ../config.h debug-private.h
+request.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+request.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+request.o: language-private.h ../cups/transcode.h
sidechannel.o: sidechannel.h versioning.h string-private.h ../config.h
sidechannel.o: debug-private.h
-snmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-snmp.o: file.h language.h string-private.h ../config.h debug-private.h
-snmp.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-snmp.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-snmp.o: snmp-private.h
+snmp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+snmp.o: language.h array.h string-private.h ../config.h debug-private.h
+snmp.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+snmp.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+snmp.o: language-private.h ../cups/transcode.h snmp-private.h
snprintf.o: string-private.h ../config.h
string.o: string-private.h ../config.h debug-private.h array.h versioning.h
-tempfile.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-tempfile.o: array.h file.h language.h string-private.h ../config.h
-tempfile.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-tempfile.o: ipp-private.h ../cups/ipp.h language-private.h
-tempfile.o: ../cups/transcode.h pwg-private.h
-transcode.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-transcode.o: array.h file.h language.h string-private.h ../config.h
-transcode.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-transcode.o: ipp-private.h ../cups/ipp.h language-private.h
-transcode.o: ../cups/transcode.h pwg-private.h
-usersys.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-usersys.o: array.h file.h language.h string-private.h ../config.h
-usersys.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-usersys.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-usersys.o: pwg-private.h
-util.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-util.o: file.h language.h string-private.h ../config.h debug-private.h
-util.o: http-private.h ../cups/http.h md5-private.h ipp-private.h
-util.o: ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+tempfile.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+tempfile.o: language.h array.h string-private.h ../config.h debug-private.h
+tempfile.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+tempfile.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+tempfile.o: language-private.h ../cups/transcode.h
+transcode.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+transcode.o: language.h array.h string-private.h ../config.h debug-private.h
+transcode.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+transcode.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+transcode.o: language-private.h ../cups/transcode.h
+usersys.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+usersys.o: language.h array.h string-private.h ../config.h debug-private.h
+usersys.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+usersys.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+usersys.o: language-private.h ../cups/transcode.h
+util.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+util.o: language.h array.h string-private.h ../config.h debug-private.h
+util.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+util.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+util.o: language-private.h ../cups/transcode.h
testadmin.o: adminutil.h cups.h string-private.h ../config.h
testarray.o: string-private.h ../config.h debug-private.h array.h
testarray.o: versioning.h dir.h
-testconflicts.o: cups.h string-private.h ../config.h
-testcups.o: string-private.h ../config.h cups.h
+testconflicts.o: cups.h ppd.h array.h versioning.h file.h string-private.h
+testconflicts.o: ../config.h
+testcups.o: string-private.h ../config.h cups.h ppd.h array.h versioning.h
+testcups.o: file.h
testfile.o: string-private.h ../config.h debug-private.h file.h versioning.h
testhttp.o: string-private.h ../config.h http-private.h ../cups/http.h
testhttp.o: md5-private.h ipp-private.h ../cups/ipp.h
@@ -195,218 +207,231 @@ testi18n.o: string-private.h ../config.h language-private.h
testi18n.o: ../cups/transcode.h language.h array.h versioning.h
testipp.o: ../cups/file.h versioning.h string-private.h ../config.h
testipp.o: ipp-private.h ../cups/ipp.h
-testoptions.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testoptions.o: array.h file.h language.h string-private.h ../config.h
-testoptions.o: debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testoptions.o: language.h array.h string-private.h ../config.h
+testoptions.o: debug-private.h ppd-private.h ../cups/ppd.h cups.h
+testoptions.o: pwg-private.h http-private.h ../cups/http.h md5-private.h
testoptions.o: ipp-private.h ../cups/ipp.h language-private.h
-testoptions.o: ../cups/transcode.h pwg-private.h
-testlang.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testlang.o: array.h file.h language.h string-private.h ../config.h
-testlang.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-testlang.o: ipp-private.h ../cups/ipp.h language-private.h
-testlang.o: ../cups/transcode.h pwg-private.h
-testppd.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testppd.o: array.h file.h language.h string-private.h ../config.h
-testppd.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-testppd.o: ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-testppd.o: pwg-private.h
-testpwg.o: pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testpwg.o: array.h file.h language.h
-testsnmp.o: cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testsnmp.o: array.h file.h language.h string-private.h ../config.h
-testsnmp.o: debug-private.h http-private.h ../cups/http.h md5-private.h
-testsnmp.o: ipp-private.h ../cups/ipp.h language-private.h
-testsnmp.o: ../cups/transcode.h pwg-private.h snmp-private.h
+testoptions.o: ../cups/transcode.h
+testlang.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testlang.o: language.h array.h string-private.h ../config.h debug-private.h
+testlang.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testlang.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testlang.o: language-private.h ../cups/transcode.h
+testppd.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testppd.o: language.h array.h string-private.h ../config.h debug-private.h
+testppd.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testppd.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testppd.o: language-private.h ../cups/transcode.h
+testpwg.o: ppd-private.h ../cups/ppd.h cups.h array.h versioning.h file.h
+testpwg.o: pwg-private.h ../cups/cups.h ipp.h http.h language.h
+testsnmp.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testsnmp.o: language.h array.h string-private.h ../config.h debug-private.h
+testsnmp.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testsnmp.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testsnmp.o: language-private.h ../cups/transcode.h snmp-private.h
# DO NOT DELETE
-adminutil.32.o: adminutil.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-adminutil.32.o: adminutil.c array.h file.h language.h string-private.h ../config.h
-adminutil.32.o: adminutil.c debug-private.h http-private.h ../cups/http.h md5-private.h
-adminutil.32.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h
-adminutil.32.o: adminutil.c ../cups/transcode.h pwg-private.h adminutil.h cups.h
+adminutil.32.o: adminutil.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+adminutil.32.o: adminutil.c language.h array.h string-private.h ../config.h debug-private.h
+adminutil.32.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+adminutil.32.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+adminutil.32.o: adminutil.c language-private.h ../cups/transcode.h adminutil.h
array.32.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h
-attr.32.o: attr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-attr.32.o: attr.c file.h language.h string-private.h ../config.h debug-private.h
-attr.32.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-attr.32.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-attr.32.o: attr.c ppd-private.h
-auth.32.o: auth.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-auth.32.o: auth.c file.h language.h string-private.h ../config.h debug-private.h
-auth.32.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-auth.32.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.32.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+attr.32.o: attr.c language.h array.h string-private.h ../config.h debug-private.h
+attr.32.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+attr.32.o: attr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+attr.32.o: attr.c language-private.h ../cups/transcode.h
+auth.32.o: auth.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+auth.32.o: auth.c language.h array.h string-private.h ../config.h debug-private.h
+auth.32.o: auth.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+auth.32.o: auth.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+auth.32.o: auth.c language-private.h ../cups/transcode.h
backchannel.32.o: backchannel.c cups.h
-backend.32.o: backend.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-backend.32.o: backend.c array.h file.h language.h string-private.h ../config.h
-backend.32.o: backend.c debug-private.h http-private.h ../cups/http.h md5-private.h
-backend.32.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-backend.32.o: backend.c pwg-private.h backend.h
-conflicts.32.o: conflicts.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-conflicts.32.o: conflicts.c array.h file.h language.h string-private.h ../config.h
-conflicts.32.o: conflicts.c debug-private.h http-private.h ../cups/http.h md5-private.h
-conflicts.32.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h
-conflicts.32.o: conflicts.c ../cups/transcode.h pwg-private.h ppd-private.h
-custom.32.o: custom.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-custom.32.o: custom.c array.h file.h language.h string-private.h ../config.h
-custom.32.o: custom.c debug-private.h http-private.h ../cups/http.h md5-private.h
-custom.32.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-custom.32.o: custom.c pwg-private.h
-debug.32.o: debug.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-debug.32.o: debug.c array.h file.h language.h string-private.h ../config.h
-debug.32.o: debug.c debug-private.h http-private.h ../cups/http.h md5-private.h
-debug.32.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-debug.32.o: debug.c pwg-private.h
-dest.32.o: dest.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-dest.32.o: dest.c file.h language.h string-private.h ../config.h debug-private.h
-dest.32.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-dest.32.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backend.32.o: backend.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+backend.32.o: backend.c language.h array.h string-private.h ../config.h debug-private.h
+backend.32.o: backend.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+backend.32.o: backend.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+backend.32.o: backend.c language-private.h ../cups/transcode.h backend.h
+conflicts.32.o: conflicts.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+conflicts.32.o: conflicts.c language.h array.h string-private.h ../config.h debug-private.h
+conflicts.32.o: conflicts.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+conflicts.32.o: conflicts.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+conflicts.32.o: conflicts.c language-private.h ../cups/transcode.h
+custom.32.o: custom.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+custom.32.o: custom.c language.h array.h string-private.h ../config.h debug-private.h
+custom.32.o: custom.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+custom.32.o: custom.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+custom.32.o: custom.c language-private.h ../cups/transcode.h
+debug.32.o: debug.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+debug.32.o: debug.c language.h array.h string-private.h ../config.h debug-private.h
+debug.32.o: debug.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+debug.32.o: debug.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+debug.32.o: debug.c language-private.h ../cups/transcode.h
+dest.32.o: dest.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+dest.32.o: dest.c language.h array.h string-private.h ../config.h debug-private.h
+dest.32.o: dest.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+dest.32.o: dest.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+dest.32.o: dest.c language-private.h ../cups/transcode.h
dir.32.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h
-emit.32.o: emit.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-emit.32.o: emit.c file.h language.h string-private.h ../config.h debug-private.h
-emit.32.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-emit.32.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-encode.32.o: encode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-encode.32.o: encode.c array.h file.h language.h string-private.h ../config.h
-encode.32.o: encode.c debug-private.h http-private.h ../cups/http.h md5-private.h
-encode.32.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-encode.32.o: encode.c pwg-private.h
-file.32.o: file.c file-private.h cups-private.h ../cups/cups.h ipp.h http.h
-file.32.o: file.c versioning.h ppd.h array.h file.h language.h string-private.h
-file.32.o: file.c ../config.h debug-private.h http-private.h ../cups/http.h
-file.32.o: file.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h
-file.32.o: file.c ../cups/transcode.h pwg-private.h
-getdevices.32.o: getdevices.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getdevices.32.o: getdevices.c array.h file.h language.h string-private.h ../config.h
-getdevices.32.o: getdevices.c debug-private.h http-private.h ../cups/http.h md5-private.h
-getdevices.32.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h
-getdevices.32.o: getdevices.c ../cups/transcode.h pwg-private.h
+emit.32.o: emit.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+emit.32.o: emit.c language.h array.h string-private.h ../config.h debug-private.h
+emit.32.o: emit.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+emit.32.o: emit.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+emit.32.o: emit.c language-private.h ../cups/transcode.h
+encode.32.o: encode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+encode.32.o: encode.c language.h array.h string-private.h ../config.h debug-private.h
+encode.32.o: encode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+encode.32.o: encode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+encode.32.o: encode.c language-private.h ../cups/transcode.h
+file.32.o: file.c file-private.h cups-private.h ../cups/cups.h file.h versioning.h
+file.32.o: file.c ipp.h http.h language.h array.h string-private.h ../config.h
+file.32.o: file.c debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h
+file.32.o: file.c http-private.h ../cups/http.h md5-private.h ipp-private.h
+file.32.o: file.c ../cups/ipp.h language-private.h ../cups/transcode.h
+getdevices.32.o: getdevices.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getdevices.32.o: getdevices.c language.h array.h string-private.h ../config.h debug-private.h
+getdevices.32.o: getdevices.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getdevices.32.o: getdevices.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getdevices.32.o: getdevices.c language-private.h ../cups/transcode.h
getifaddrs.32.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h
getifaddrs.32.o: getifaddrs.c ipp-private.h ../cups/ipp.h
-getputfile.32.o: getputfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getputfile.32.o: getputfile.c array.h file.h language.h string-private.h ../config.h
-getputfile.32.o: getputfile.c debug-private.h http-private.h ../cups/http.h md5-private.h
-getputfile.32.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h
-getputfile.32.o: getputfile.c ../cups/transcode.h pwg-private.h
-globals.32.o: globals.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-globals.32.o: globals.c array.h file.h language.h string-private.h ../config.h
-globals.32.o: globals.c debug-private.h http-private.h ../cups/http.h md5-private.h
-globals.32.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-globals.32.o: globals.c pwg-private.h
-http.32.o: http.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-http.32.o: http.c file.h language.h string-private.h ../config.h debug-private.h
-http.32.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-http.32.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-http-addr.32.o: http-addr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-addr.32.o: http-addr.c array.h file.h language.h string-private.h ../config.h
-http-addr.32.o: http-addr.c debug-private.h http-private.h ../cups/http.h md5-private.h
-http-addr.32.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h
-http-addr.32.o: http-addr.c ../cups/transcode.h pwg-private.h
-http-addrlist.32.o: http-addrlist.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h
-http-addrlist.32.o: http-addrlist.c ppd.h array.h file.h language.h string-private.h ../config.h
-http-addrlist.32.o: http-addrlist.c debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.32.o: getputfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getputfile.32.o: getputfile.c language.h array.h string-private.h ../config.h debug-private.h
+getputfile.32.o: getputfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getputfile.32.o: getputfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getputfile.32.o: getputfile.c language-private.h ../cups/transcode.h
+globals.32.o: globals.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+globals.32.o: globals.c language.h array.h string-private.h ../config.h debug-private.h
+globals.32.o: globals.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+globals.32.o: globals.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+globals.32.o: globals.c language-private.h ../cups/transcode.h
+http.32.o: http.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http.32.o: http.c language.h array.h string-private.h ../config.h debug-private.h
+http.32.o: http.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http.32.o: http.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http.32.o: http.c language-private.h ../cups/transcode.h
+http-addr.32.o: http-addr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http-addr.32.o: http-addr.c language.h array.h string-private.h ../config.h debug-private.h
+http-addr.32.o: http-addr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http-addr.32.o: http-addr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http-addr.32.o: http-addr.c language-private.h ../cups/transcode.h
+http-addrlist.32.o: http-addrlist.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-addrlist.32.o: http-addrlist.c http.h language.h array.h string-private.h ../config.h
+http-addrlist.32.o: http-addrlist.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-addrlist.32.o: http-addrlist.c pwg-private.h http-private.h ../cups/http.h md5-private.h
http-addrlist.32.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h
-http-addrlist.32.o: http-addrlist.c ../cups/transcode.h pwg-private.h
-http-support.32.o: http-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-support.32.o: http-support.c array.h file.h language.h string-private.h ../config.h
-http-support.32.o: http-support.c debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.32.o: http-addrlist.c ../cups/transcode.h
+http-support.32.o: http-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-support.32.o: http-support.c http.h language.h array.h string-private.h ../config.h
+http-support.32.o: http-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-support.32.o: http-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h
http-support.32.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h
-http-support.32.o: http-support.c ../cups/transcode.h pwg-private.h
-ipp.32.o: ipp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ipp.32.o: ipp.c file.h language.h string-private.h ../config.h debug-private.h
-ipp.32.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-ipp.32.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ipp-support.32.o: ipp-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-ipp-support.32.o: ipp-support.c array.h file.h language.h string-private.h ../config.h
-ipp-support.32.o: ipp-support.c debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.32.o: http-support.c ../cups/transcode.h
+ipp.32.o: ipp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp.32.o: ipp.c language.h array.h string-private.h ../config.h debug-private.h
+ipp.32.o: ipp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ipp.32.o: ipp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ipp.32.o: ipp.c language-private.h ../cups/transcode.h
+ipp-support.32.o: ipp-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp-support.32.o: ipp-support.c language.h array.h string-private.h ../config.h
+ipp-support.32.o: ipp-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+ipp-support.32.o: ipp-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h
ipp-support.32.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h
-ipp-support.32.o: ipp-support.c ../cups/transcode.h pwg-private.h
-langprintf.32.o: langprintf.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-langprintf.32.o: langprintf.c array.h file.h language.h string-private.h ../config.h
-langprintf.32.o: langprintf.c debug-private.h http-private.h ../cups/http.h md5-private.h
-langprintf.32.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h
-langprintf.32.o: langprintf.c ../cups/transcode.h pwg-private.h
-language.32.o: language.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-language.32.o: language.c array.h file.h language.h string-private.h ../config.h
-language.32.o: language.c debug-private.h http-private.h ../cups/http.h md5-private.h
-language.32.o: language.c ipp-private.h ../cups/ipp.h language-private.h
-language.32.o: language.c ../cups/transcode.h pwg-private.h
-localize.32.o: localize.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-localize.32.o: localize.c array.h file.h language.h string-private.h ../config.h
-localize.32.o: localize.c debug-private.h http-private.h ../cups/http.h md5-private.h
-localize.32.o: localize.c ipp-private.h ../cups/ipp.h language-private.h
-localize.32.o: localize.c ../cups/transcode.h pwg-private.h ppd-private.h
-mark.32.o: mark.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-mark.32.o: mark.c file.h language.h string-private.h ../config.h debug-private.h
-mark.32.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-mark.32.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.32.o: ipp-support.c ../cups/transcode.h
+langprintf.32.o: langprintf.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+langprintf.32.o: langprintf.c language.h array.h string-private.h ../config.h debug-private.h
+langprintf.32.o: langprintf.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+langprintf.32.o: langprintf.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+langprintf.32.o: langprintf.c language-private.h ../cups/transcode.h
+language.32.o: language.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+language.32.o: language.c language.h array.h string-private.h ../config.h debug-private.h
+language.32.o: language.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+language.32.o: language.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+language.32.o: language.c language-private.h ../cups/transcode.h
+localize.32.o: localize.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+localize.32.o: localize.c language.h array.h string-private.h ../config.h debug-private.h
+localize.32.o: localize.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+localize.32.o: localize.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+localize.32.o: localize.c language-private.h ../cups/transcode.h
+mark.32.o: mark.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+mark.32.o: mark.c language.h array.h string-private.h ../config.h debug-private.h
+mark.32.o: mark.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+mark.32.o: mark.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+mark.32.o: mark.c language-private.h ../cups/transcode.h
md5.32.o: md5.c md5-private.h string-private.h ../config.h
md5passwd.32.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h
md5passwd.32.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h
-notify.32.o: notify.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-notify.32.o: notify.c array.h file.h language.h string-private.h ../config.h
-notify.32.o: notify.c debug-private.h http-private.h ../cups/http.h md5-private.h
-notify.32.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-notify.32.o: notify.c pwg-private.h
+notify.32.o: notify.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+notify.32.o: notify.c language.h array.h string-private.h ../config.h debug-private.h
+notify.32.o: notify.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+notify.32.o: notify.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+notify.32.o: notify.c language-private.h ../cups/transcode.h
options.32.o: options.c cups.h string-private.h ../config.h debug-private.h
-page.32.o: page.c string-private.h ../config.h debug-private.h ppd.h array.h
+page.32.o: page.c string-private.h ../config.h debug-private.h ppd.h cups.h array.h
page.32.o: page.c versioning.h file.h
-ppd.32.o: ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ppd.32.o: ppd.c file.h language.h string-private.h ../config.h debug-private.h
-ppd.32.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-ppd.32.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ppd.32.o: ppd.c ppd-private.h
-pwg-file.32.o: pwg-file.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-file.32.o: pwg-file.c array.h file.h language.h string-private.h ../config.h
-pwg-file.32.o: pwg-file.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-file.32.o: pwg-file.c ipp-private.h ../cups/ipp.h language-private.h
-pwg-file.32.o: pwg-file.c ../cups/transcode.h pwg-private.h
-pwg-media.32.o: pwg-media.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-media.32.o: pwg-media.c array.h file.h language.h string-private.h ../config.h
-pwg-media.32.o: pwg-media.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-media.32.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h
-pwg-media.32.o: pwg-media.c ../cups/transcode.h pwg-private.h
-pwg-ppd.32.o: pwg-ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-ppd.32.o: pwg-ppd.c array.h file.h language.h string-private.h ../config.h
-pwg-ppd.32.o: pwg-ppd.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-ppd.32.o: pwg-ppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-pwg-ppd.32.o: pwg-ppd.c pwg-private.h
-request.32.o: request.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-request.32.o: request.c array.h file.h language.h string-private.h ../config.h
-request.32.o: request.c debug-private.h http-private.h ../cups/http.h md5-private.h
-request.32.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-request.32.o: request.c pwg-private.h
+ppd.32.o: ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ppd.32.o: ppd.c language.h array.h string-private.h ../config.h debug-private.h
+ppd.32.o: ppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ppd.32.o: ppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ppd.32.o: ppd.c language-private.h ../cups/transcode.h
+pwg-file.32.o: pwg-file.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-file.32.o: pwg-file.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-file.32.o: pwg-file.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-file.32.o: pwg-file.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-file.32.o: pwg-file.c language-private.h ../cups/transcode.h
+pwg-media.32.o: pwg-media.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-media.32.o: pwg-media.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-media.32.o: pwg-media.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-media.32.o: pwg-media.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-media.32.o: pwg-media.c language-private.h ../cups/transcode.h
+pwg-ppd.32.o: pwg-ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-ppd.32.o: pwg-ppd.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-ppd.32.o: pwg-ppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-ppd.32.o: pwg-ppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-ppd.32.o: pwg-ppd.c language-private.h ../cups/transcode.h
+request.32.o: request.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+request.32.o: request.c language.h array.h string-private.h ../config.h debug-private.h
+request.32.o: request.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+request.32.o: request.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+request.32.o: request.c language-private.h ../cups/transcode.h
sidechannel.32.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h
sidechannel.32.o: sidechannel.c debug-private.h
-snmp.32.o: snmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-snmp.32.o: snmp.c file.h language.h string-private.h ../config.h debug-private.h
-snmp.32.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-snmp.32.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-snmp.32.o: snmp.c snmp-private.h
+snmp.32.o: snmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+snmp.32.o: snmp.c language.h array.h string-private.h ../config.h debug-private.h
+snmp.32.o: snmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+snmp.32.o: snmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+snmp.32.o: snmp.c language-private.h ../cups/transcode.h snmp-private.h
snprintf.32.o: snprintf.c string-private.h ../config.h
string.32.o: string.c string-private.h ../config.h debug-private.h array.h versioning.h
-tempfile.32.o: tempfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-tempfile.32.o: tempfile.c array.h file.h language.h string-private.h ../config.h
-tempfile.32.o: tempfile.c debug-private.h http-private.h ../cups/http.h md5-private.h
-tempfile.32.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h
-tempfile.32.o: tempfile.c ../cups/transcode.h pwg-private.h
-transcode.32.o: transcode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-transcode.32.o: transcode.c array.h file.h language.h string-private.h ../config.h
-transcode.32.o: transcode.c debug-private.h http-private.h ../cups/http.h md5-private.h
-transcode.32.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h
-transcode.32.o: transcode.c ../cups/transcode.h pwg-private.h
-usersys.32.o: usersys.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-usersys.32.o: usersys.c array.h file.h language.h string-private.h ../config.h
-usersys.32.o: usersys.c debug-private.h http-private.h ../cups/http.h md5-private.h
-usersys.32.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-usersys.32.o: usersys.c pwg-private.h
-util.32.o: util.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-util.32.o: util.c file.h language.h string-private.h ../config.h debug-private.h
-util.32.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-util.32.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+tempfile.32.o: tempfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+tempfile.32.o: tempfile.c language.h array.h string-private.h ../config.h debug-private.h
+tempfile.32.o: tempfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+tempfile.32.o: tempfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+tempfile.32.o: tempfile.c language-private.h ../cups/transcode.h
+transcode.32.o: transcode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+transcode.32.o: transcode.c language.h array.h string-private.h ../config.h debug-private.h
+transcode.32.o: transcode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+transcode.32.o: transcode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+transcode.32.o: transcode.c language-private.h ../cups/transcode.h
+usersys.32.o: usersys.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+usersys.32.o: usersys.c language.h array.h string-private.h ../config.h debug-private.h
+usersys.32.o: usersys.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+usersys.32.o: usersys.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+usersys.32.o: usersys.c language-private.h ../cups/transcode.h
+util.32.o: util.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+util.32.o: util.c language.h array.h string-private.h ../config.h debug-private.h
+util.32.o: util.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+util.32.o: util.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+util.32.o: util.c language-private.h ../cups/transcode.h
testadmin.32.o: testadmin.c adminutil.h cups.h string-private.h ../config.h
testarray.32.o: testarray.c string-private.h ../config.h debug-private.h array.h
testarray.32.o: testarray.c versioning.h dir.h
-testconflicts.32.o: testconflicts.c cups.h string-private.h ../config.h
-testcups.32.o: testcups.c string-private.h ../config.h cups.h
+testconflicts.32.o: testconflicts.c cups.h ppd.h array.h versioning.h file.h string-private.h
+testconflicts.32.o: testconflicts.c ../config.h
+testcups.32.o: testcups.c string-private.h ../config.h cups.h ppd.h array.h versioning.h
+testcups.32.o: testcups.c file.h
testfile.32.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h
testhttp.32.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h
testhttp.32.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h
@@ -414,218 +439,231 @@ testi18n.32.o: testi18n.c string-private.h ../config.h language-private.h
testi18n.32.o: testi18n.c ../cups/transcode.h language.h array.h versioning.h
testipp.32.o: testipp.c ../cups/file.h versioning.h string-private.h ../config.h
testipp.32.o: testipp.c ipp-private.h ../cups/ipp.h
-testoptions.32.o: testoptions.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testoptions.32.o: testoptions.c array.h file.h language.h string-private.h ../config.h
-testoptions.32.o: testoptions.c debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.32.o: testoptions.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testoptions.32.o: testoptions.c language.h array.h string-private.h ../config.h
+testoptions.32.o: testoptions.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+testoptions.32.o: testoptions.c pwg-private.h http-private.h ../cups/http.h md5-private.h
testoptions.32.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h
-testoptions.32.o: testoptions.c ../cups/transcode.h pwg-private.h
-testlang.32.o: testlang.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testlang.32.o: testlang.c array.h file.h language.h string-private.h ../config.h
-testlang.32.o: testlang.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testlang.32.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h
-testlang.32.o: testlang.c ../cups/transcode.h pwg-private.h
-testppd.32.o: testppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testppd.32.o: testppd.c array.h file.h language.h string-private.h ../config.h
-testppd.32.o: testppd.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testppd.32.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-testppd.32.o: testppd.c pwg-private.h
-testpwg.32.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testpwg.32.o: testpwg.c array.h file.h language.h
-testsnmp.32.o: testsnmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testsnmp.32.o: testsnmp.c array.h file.h language.h string-private.h ../config.h
-testsnmp.32.o: testsnmp.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testsnmp.32.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h
-testsnmp.32.o: testsnmp.c ../cups/transcode.h pwg-private.h snmp-private.h
+testoptions.32.o: testoptions.c ../cups/transcode.h
+testlang.32.o: testlang.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testlang.32.o: testlang.c language.h array.h string-private.h ../config.h debug-private.h
+testlang.32.o: testlang.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testlang.32.o: testlang.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testlang.32.o: testlang.c language-private.h ../cups/transcode.h
+testppd.32.o: testppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testppd.32.o: testppd.c language.h array.h string-private.h ../config.h debug-private.h
+testppd.32.o: testppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testppd.32.o: testppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testppd.32.o: testppd.c language-private.h ../cups/transcode.h
+testpwg.32.o: testpwg.c ppd-private.h ../cups/ppd.h cups.h array.h versioning.h file.h
+testpwg.32.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h language.h
+testsnmp.32.o: testsnmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testsnmp.32.o: testsnmp.c language.h array.h string-private.h ../config.h debug-private.h
+testsnmp.32.o: testsnmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testsnmp.32.o: testsnmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testsnmp.32.o: testsnmp.c language-private.h ../cups/transcode.h snmp-private.h
# DO NOT DELETE
-adminutil.64.o: adminutil.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-adminutil.64.o: adminutil.c array.h file.h language.h string-private.h ../config.h
-adminutil.64.o: adminutil.c debug-private.h http-private.h ../cups/http.h md5-private.h
-adminutil.64.o: adminutil.c ipp-private.h ../cups/ipp.h language-private.h
-adminutil.64.o: adminutil.c ../cups/transcode.h pwg-private.h adminutil.h cups.h
+adminutil.64.o: adminutil.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+adminutil.64.o: adminutil.c language.h array.h string-private.h ../config.h debug-private.h
+adminutil.64.o: adminutil.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+adminutil.64.o: adminutil.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+adminutil.64.o: adminutil.c language-private.h ../cups/transcode.h adminutil.h
array.64.o: array.c string-private.h ../config.h debug-private.h array.h versioning.h
-attr.64.o: attr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-attr.64.o: attr.c file.h language.h string-private.h ../config.h debug-private.h
-attr.64.o: attr.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-attr.64.o: attr.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-attr.64.o: attr.c ppd-private.h
-auth.64.o: auth.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-auth.64.o: auth.c file.h language.h string-private.h ../config.h debug-private.h
-auth.64.o: auth.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-auth.64.o: auth.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+attr.64.o: attr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+attr.64.o: attr.c language.h array.h string-private.h ../config.h debug-private.h
+attr.64.o: attr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+attr.64.o: attr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+attr.64.o: attr.c language-private.h ../cups/transcode.h
+auth.64.o: auth.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+auth.64.o: auth.c language.h array.h string-private.h ../config.h debug-private.h
+auth.64.o: auth.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+auth.64.o: auth.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+auth.64.o: auth.c language-private.h ../cups/transcode.h
backchannel.64.o: backchannel.c cups.h
-backend.64.o: backend.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-backend.64.o: backend.c array.h file.h language.h string-private.h ../config.h
-backend.64.o: backend.c debug-private.h http-private.h ../cups/http.h md5-private.h
-backend.64.o: backend.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-backend.64.o: backend.c pwg-private.h backend.h
-conflicts.64.o: conflicts.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-conflicts.64.o: conflicts.c array.h file.h language.h string-private.h ../config.h
-conflicts.64.o: conflicts.c debug-private.h http-private.h ../cups/http.h md5-private.h
-conflicts.64.o: conflicts.c ipp-private.h ../cups/ipp.h language-private.h
-conflicts.64.o: conflicts.c ../cups/transcode.h pwg-private.h ppd-private.h
-custom.64.o: custom.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-custom.64.o: custom.c array.h file.h language.h string-private.h ../config.h
-custom.64.o: custom.c debug-private.h http-private.h ../cups/http.h md5-private.h
-custom.64.o: custom.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-custom.64.o: custom.c pwg-private.h
-debug.64.o: debug.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-debug.64.o: debug.c array.h file.h language.h string-private.h ../config.h
-debug.64.o: debug.c debug-private.h http-private.h ../cups/http.h md5-private.h
-debug.64.o: debug.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-debug.64.o: debug.c pwg-private.h
-dest.64.o: dest.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-dest.64.o: dest.c file.h language.h string-private.h ../config.h debug-private.h
-dest.64.o: dest.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-dest.64.o: dest.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+backend.64.o: backend.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+backend.64.o: backend.c language.h array.h string-private.h ../config.h debug-private.h
+backend.64.o: backend.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+backend.64.o: backend.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+backend.64.o: backend.c language-private.h ../cups/transcode.h backend.h
+conflicts.64.o: conflicts.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+conflicts.64.o: conflicts.c language.h array.h string-private.h ../config.h debug-private.h
+conflicts.64.o: conflicts.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+conflicts.64.o: conflicts.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+conflicts.64.o: conflicts.c language-private.h ../cups/transcode.h
+custom.64.o: custom.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+custom.64.o: custom.c language.h array.h string-private.h ../config.h debug-private.h
+custom.64.o: custom.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+custom.64.o: custom.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+custom.64.o: custom.c language-private.h ../cups/transcode.h
+debug.64.o: debug.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+debug.64.o: debug.c language.h array.h string-private.h ../config.h debug-private.h
+debug.64.o: debug.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+debug.64.o: debug.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+debug.64.o: debug.c language-private.h ../cups/transcode.h
+dest.64.o: dest.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+dest.64.o: dest.c language.h array.h string-private.h ../config.h debug-private.h
+dest.64.o: dest.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+dest.64.o: dest.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+dest.64.o: dest.c language-private.h ../cups/transcode.h
dir.64.o: dir.c string-private.h ../config.h debug-private.h dir.h versioning.h
-emit.64.o: emit.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-emit.64.o: emit.c file.h language.h string-private.h ../config.h debug-private.h
-emit.64.o: emit.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-emit.64.o: emit.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-encode.64.o: encode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-encode.64.o: encode.c array.h file.h language.h string-private.h ../config.h
-encode.64.o: encode.c debug-private.h http-private.h ../cups/http.h md5-private.h
-encode.64.o: encode.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-encode.64.o: encode.c pwg-private.h
-file.64.o: file.c file-private.h cups-private.h ../cups/cups.h ipp.h http.h
-file.64.o: file.c versioning.h ppd.h array.h file.h language.h string-private.h
-file.64.o: file.c ../config.h debug-private.h http-private.h ../cups/http.h
-file.64.o: file.c md5-private.h ipp-private.h ../cups/ipp.h language-private.h
-file.64.o: file.c ../cups/transcode.h pwg-private.h
-getdevices.64.o: getdevices.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getdevices.64.o: getdevices.c array.h file.h language.h string-private.h ../config.h
-getdevices.64.o: getdevices.c debug-private.h http-private.h ../cups/http.h md5-private.h
-getdevices.64.o: getdevices.c ipp-private.h ../cups/ipp.h language-private.h
-getdevices.64.o: getdevices.c ../cups/transcode.h pwg-private.h
+emit.64.o: emit.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+emit.64.o: emit.c language.h array.h string-private.h ../config.h debug-private.h
+emit.64.o: emit.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+emit.64.o: emit.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+emit.64.o: emit.c language-private.h ../cups/transcode.h
+encode.64.o: encode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+encode.64.o: encode.c language.h array.h string-private.h ../config.h debug-private.h
+encode.64.o: encode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+encode.64.o: encode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+encode.64.o: encode.c language-private.h ../cups/transcode.h
+file.64.o: file.c file-private.h cups-private.h ../cups/cups.h file.h versioning.h
+file.64.o: file.c ipp.h http.h language.h array.h string-private.h ../config.h
+file.64.o: file.c debug-private.h ppd-private.h ../cups/ppd.h cups.h pwg-private.h
+file.64.o: file.c http-private.h ../cups/http.h md5-private.h ipp-private.h
+file.64.o: file.c ../cups/ipp.h language-private.h ../cups/transcode.h
+getdevices.64.o: getdevices.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getdevices.64.o: getdevices.c language.h array.h string-private.h ../config.h debug-private.h
+getdevices.64.o: getdevices.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getdevices.64.o: getdevices.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getdevices.64.o: getdevices.c language-private.h ../cups/transcode.h
getifaddrs.64.o: getifaddrs.c http-private.h ../config.h ../cups/http.h md5-private.h
getifaddrs.64.o: getifaddrs.c ipp-private.h ../cups/ipp.h
-getputfile.64.o: getputfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-getputfile.64.o: getputfile.c array.h file.h language.h string-private.h ../config.h
-getputfile.64.o: getputfile.c debug-private.h http-private.h ../cups/http.h md5-private.h
-getputfile.64.o: getputfile.c ipp-private.h ../cups/ipp.h language-private.h
-getputfile.64.o: getputfile.c ../cups/transcode.h pwg-private.h
-globals.64.o: globals.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-globals.64.o: globals.c array.h file.h language.h string-private.h ../config.h
-globals.64.o: globals.c debug-private.h http-private.h ../cups/http.h md5-private.h
-globals.64.o: globals.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-globals.64.o: globals.c pwg-private.h
-http.64.o: http.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-http.64.o: http.c file.h language.h string-private.h ../config.h debug-private.h
-http.64.o: http.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-http.64.o: http.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-http-addr.64.o: http-addr.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-addr.64.o: http-addr.c array.h file.h language.h string-private.h ../config.h
-http-addr.64.o: http-addr.c debug-private.h http-private.h ../cups/http.h md5-private.h
-http-addr.64.o: http-addr.c ipp-private.h ../cups/ipp.h language-private.h
-http-addr.64.o: http-addr.c ../cups/transcode.h pwg-private.h
-http-addrlist.64.o: http-addrlist.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h
-http-addrlist.64.o: http-addrlist.c ppd.h array.h file.h language.h string-private.h ../config.h
-http-addrlist.64.o: http-addrlist.c debug-private.h http-private.h ../cups/http.h md5-private.h
+getputfile.64.o: getputfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+getputfile.64.o: getputfile.c language.h array.h string-private.h ../config.h debug-private.h
+getputfile.64.o: getputfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+getputfile.64.o: getputfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+getputfile.64.o: getputfile.c language-private.h ../cups/transcode.h
+globals.64.o: globals.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+globals.64.o: globals.c language.h array.h string-private.h ../config.h debug-private.h
+globals.64.o: globals.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+globals.64.o: globals.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+globals.64.o: globals.c language-private.h ../cups/transcode.h
+http.64.o: http.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http.64.o: http.c language.h array.h string-private.h ../config.h debug-private.h
+http.64.o: http.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http.64.o: http.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http.64.o: http.c language-private.h ../cups/transcode.h
+http-addr.64.o: http-addr.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+http-addr.64.o: http-addr.c language.h array.h string-private.h ../config.h debug-private.h
+http-addr.64.o: http-addr.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+http-addr.64.o: http-addr.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+http-addr.64.o: http-addr.c language-private.h ../cups/transcode.h
+http-addrlist.64.o: http-addrlist.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-addrlist.64.o: http-addrlist.c http.h language.h array.h string-private.h ../config.h
+http-addrlist.64.o: http-addrlist.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-addrlist.64.o: http-addrlist.c pwg-private.h http-private.h ../cups/http.h md5-private.h
http-addrlist.64.o: http-addrlist.c ipp-private.h ../cups/ipp.h language-private.h
-http-addrlist.64.o: http-addrlist.c ../cups/transcode.h pwg-private.h
-http-support.64.o: http-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-http-support.64.o: http-support.c array.h file.h language.h string-private.h ../config.h
-http-support.64.o: http-support.c debug-private.h http-private.h ../cups/http.h md5-private.h
+http-addrlist.64.o: http-addrlist.c ../cups/transcode.h
+http-support.64.o: http-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h
+http-support.64.o: http-support.c http.h language.h array.h string-private.h ../config.h
+http-support.64.o: http-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+http-support.64.o: http-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h
http-support.64.o: http-support.c ipp-private.h ../cups/ipp.h language-private.h
-http-support.64.o: http-support.c ../cups/transcode.h pwg-private.h
-ipp.64.o: ipp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ipp.64.o: ipp.c file.h language.h string-private.h ../config.h debug-private.h
-ipp.64.o: ipp.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-ipp.64.o: ipp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ipp-support.64.o: ipp-support.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-ipp-support.64.o: ipp-support.c array.h file.h language.h string-private.h ../config.h
-ipp-support.64.o: ipp-support.c debug-private.h http-private.h ../cups/http.h md5-private.h
+http-support.64.o: http-support.c ../cups/transcode.h
+ipp.64.o: ipp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp.64.o: ipp.c language.h array.h string-private.h ../config.h debug-private.h
+ipp.64.o: ipp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ipp.64.o: ipp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ipp.64.o: ipp.c language-private.h ../cups/transcode.h
+ipp-support.64.o: ipp-support.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ipp-support.64.o: ipp-support.c language.h array.h string-private.h ../config.h
+ipp-support.64.o: ipp-support.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+ipp-support.64.o: ipp-support.c pwg-private.h http-private.h ../cups/http.h md5-private.h
ipp-support.64.o: ipp-support.c ipp-private.h ../cups/ipp.h language-private.h
-ipp-support.64.o: ipp-support.c ../cups/transcode.h pwg-private.h
-langprintf.64.o: langprintf.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-langprintf.64.o: langprintf.c array.h file.h language.h string-private.h ../config.h
-langprintf.64.o: langprintf.c debug-private.h http-private.h ../cups/http.h md5-private.h
-langprintf.64.o: langprintf.c ipp-private.h ../cups/ipp.h language-private.h
-langprintf.64.o: langprintf.c ../cups/transcode.h pwg-private.h
-language.64.o: language.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-language.64.o: language.c array.h file.h language.h string-private.h ../config.h
-language.64.o: language.c debug-private.h http-private.h ../cups/http.h md5-private.h
-language.64.o: language.c ipp-private.h ../cups/ipp.h language-private.h
-language.64.o: language.c ../cups/transcode.h pwg-private.h
-localize.64.o: localize.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-localize.64.o: localize.c array.h file.h language.h string-private.h ../config.h
-localize.64.o: localize.c debug-private.h http-private.h ../cups/http.h md5-private.h
-localize.64.o: localize.c ipp-private.h ../cups/ipp.h language-private.h
-localize.64.o: localize.c ../cups/transcode.h pwg-private.h ppd-private.h
-mark.64.o: mark.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-mark.64.o: mark.c file.h language.h string-private.h ../config.h debug-private.h
-mark.64.o: mark.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-mark.64.o: mark.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+ipp-support.64.o: ipp-support.c ../cups/transcode.h
+langprintf.64.o: langprintf.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+langprintf.64.o: langprintf.c language.h array.h string-private.h ../config.h debug-private.h
+langprintf.64.o: langprintf.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+langprintf.64.o: langprintf.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+langprintf.64.o: langprintf.c language-private.h ../cups/transcode.h
+language.64.o: language.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+language.64.o: language.c language.h array.h string-private.h ../config.h debug-private.h
+language.64.o: language.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+language.64.o: language.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+language.64.o: language.c language-private.h ../cups/transcode.h
+localize.64.o: localize.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+localize.64.o: localize.c language.h array.h string-private.h ../config.h debug-private.h
+localize.64.o: localize.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+localize.64.o: localize.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+localize.64.o: localize.c language-private.h ../cups/transcode.h
+mark.64.o: mark.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+mark.64.o: mark.c language.h array.h string-private.h ../config.h debug-private.h
+mark.64.o: mark.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+mark.64.o: mark.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+mark.64.o: mark.c language-private.h ../cups/transcode.h
md5.64.o: md5.c md5-private.h string-private.h ../config.h
md5passwd.64.o: md5passwd.c http-private.h ../config.h ../cups/http.h md5-private.h
md5passwd.64.o: md5passwd.c ipp-private.h ../cups/ipp.h string-private.h
-notify.64.o: notify.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-notify.64.o: notify.c array.h file.h language.h string-private.h ../config.h
-notify.64.o: notify.c debug-private.h http-private.h ../cups/http.h md5-private.h
-notify.64.o: notify.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-notify.64.o: notify.c pwg-private.h
+notify.64.o: notify.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+notify.64.o: notify.c language.h array.h string-private.h ../config.h debug-private.h
+notify.64.o: notify.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+notify.64.o: notify.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+notify.64.o: notify.c language-private.h ../cups/transcode.h
options.64.o: options.c cups.h string-private.h ../config.h debug-private.h
-page.64.o: page.c string-private.h ../config.h debug-private.h ppd.h array.h
+page.64.o: page.c string-private.h ../config.h debug-private.h ppd.h cups.h array.h
page.64.o: page.c versioning.h file.h
-ppd.64.o: ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-ppd.64.o: ppd.c file.h language.h string-private.h ../config.h debug-private.h
-ppd.64.o: ppd.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-ppd.64.o: ppd.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-ppd.64.o: ppd.c ppd-private.h
-pwg-file.64.o: pwg-file.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-file.64.o: pwg-file.c array.h file.h language.h string-private.h ../config.h
-pwg-file.64.o: pwg-file.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-file.64.o: pwg-file.c ipp-private.h ../cups/ipp.h language-private.h
-pwg-file.64.o: pwg-file.c ../cups/transcode.h pwg-private.h
-pwg-media.64.o: pwg-media.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-media.64.o: pwg-media.c array.h file.h language.h string-private.h ../config.h
-pwg-media.64.o: pwg-media.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-media.64.o: pwg-media.c ipp-private.h ../cups/ipp.h language-private.h
-pwg-media.64.o: pwg-media.c ../cups/transcode.h pwg-private.h
-pwg-ppd.64.o: pwg-ppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-pwg-ppd.64.o: pwg-ppd.c array.h file.h language.h string-private.h ../config.h
-pwg-ppd.64.o: pwg-ppd.c debug-private.h http-private.h ../cups/http.h md5-private.h
-pwg-ppd.64.o: pwg-ppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-pwg-ppd.64.o: pwg-ppd.c pwg-private.h
-request.64.o: request.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-request.64.o: request.c array.h file.h language.h string-private.h ../config.h
-request.64.o: request.c debug-private.h http-private.h ../cups/http.h md5-private.h
-request.64.o: request.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-request.64.o: request.c pwg-private.h
+ppd.64.o: ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+ppd.64.o: ppd.c language.h array.h string-private.h ../config.h debug-private.h
+ppd.64.o: ppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+ppd.64.o: ppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+ppd.64.o: ppd.c language-private.h ../cups/transcode.h
+pwg-file.64.o: pwg-file.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-file.64.o: pwg-file.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-file.64.o: pwg-file.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-file.64.o: pwg-file.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-file.64.o: pwg-file.c language-private.h ../cups/transcode.h
+pwg-media.64.o: pwg-media.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-media.64.o: pwg-media.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-media.64.o: pwg-media.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-media.64.o: pwg-media.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-media.64.o: pwg-media.c language-private.h ../cups/transcode.h
+pwg-ppd.64.o: pwg-ppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+pwg-ppd.64.o: pwg-ppd.c language.h array.h string-private.h ../config.h debug-private.h
+pwg-ppd.64.o: pwg-ppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+pwg-ppd.64.o: pwg-ppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+pwg-ppd.64.o: pwg-ppd.c language-private.h ../cups/transcode.h
+request.64.o: request.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+request.64.o: request.c language.h array.h string-private.h ../config.h debug-private.h
+request.64.o: request.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+request.64.o: request.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+request.64.o: request.c language-private.h ../cups/transcode.h
sidechannel.64.o: sidechannel.c sidechannel.h versioning.h string-private.h ../config.h
sidechannel.64.o: sidechannel.c debug-private.h
-snmp.64.o: snmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-snmp.64.o: snmp.c file.h language.h string-private.h ../config.h debug-private.h
-snmp.64.o: snmp.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-snmp.64.o: snmp.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
-snmp.64.o: snmp.c snmp-private.h
+snmp.64.o: snmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+snmp.64.o: snmp.c language.h array.h string-private.h ../config.h debug-private.h
+snmp.64.o: snmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+snmp.64.o: snmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+snmp.64.o: snmp.c language-private.h ../cups/transcode.h snmp-private.h
snprintf.64.o: snprintf.c string-private.h ../config.h
string.64.o: string.c string-private.h ../config.h debug-private.h array.h versioning.h
-tempfile.64.o: tempfile.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-tempfile.64.o: tempfile.c array.h file.h language.h string-private.h ../config.h
-tempfile.64.o: tempfile.c debug-private.h http-private.h ../cups/http.h md5-private.h
-tempfile.64.o: tempfile.c ipp-private.h ../cups/ipp.h language-private.h
-tempfile.64.o: tempfile.c ../cups/transcode.h pwg-private.h
-transcode.64.o: transcode.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-transcode.64.o: transcode.c array.h file.h language.h string-private.h ../config.h
-transcode.64.o: transcode.c debug-private.h http-private.h ../cups/http.h md5-private.h
-transcode.64.o: transcode.c ipp-private.h ../cups/ipp.h language-private.h
-transcode.64.o: transcode.c ../cups/transcode.h pwg-private.h
-usersys.64.o: usersys.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-usersys.64.o: usersys.c array.h file.h language.h string-private.h ../config.h
-usersys.64.o: usersys.c debug-private.h http-private.h ../cups/http.h md5-private.h
-usersys.64.o: usersys.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-usersys.64.o: usersys.c pwg-private.h
-util.64.o: util.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h array.h
-util.64.o: util.c file.h language.h string-private.h ../config.h debug-private.h
-util.64.o: util.c http-private.h ../cups/http.h md5-private.h ipp-private.h
-util.64.o: util.c ../cups/ipp.h language-private.h ../cups/transcode.h pwg-private.h
+tempfile.64.o: tempfile.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+tempfile.64.o: tempfile.c language.h array.h string-private.h ../config.h debug-private.h
+tempfile.64.o: tempfile.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+tempfile.64.o: tempfile.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+tempfile.64.o: tempfile.c language-private.h ../cups/transcode.h
+transcode.64.o: transcode.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+transcode.64.o: transcode.c language.h array.h string-private.h ../config.h debug-private.h
+transcode.64.o: transcode.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+transcode.64.o: transcode.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+transcode.64.o: transcode.c language-private.h ../cups/transcode.h
+usersys.64.o: usersys.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+usersys.64.o: usersys.c language.h array.h string-private.h ../config.h debug-private.h
+usersys.64.o: usersys.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+usersys.64.o: usersys.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+usersys.64.o: usersys.c language-private.h ../cups/transcode.h
+util.64.o: util.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+util.64.o: util.c language.h array.h string-private.h ../config.h debug-private.h
+util.64.o: util.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+util.64.o: util.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+util.64.o: util.c language-private.h ../cups/transcode.h
testadmin.64.o: testadmin.c adminutil.h cups.h string-private.h ../config.h
testarray.64.o: testarray.c string-private.h ../config.h debug-private.h array.h
testarray.64.o: testarray.c versioning.h dir.h
-testconflicts.64.o: testconflicts.c cups.h string-private.h ../config.h
-testcups.64.o: testcups.c string-private.h ../config.h cups.h
+testconflicts.64.o: testconflicts.c cups.h ppd.h array.h versioning.h file.h string-private.h
+testconflicts.64.o: testconflicts.c ../config.h
+testcups.64.o: testcups.c string-private.h ../config.h cups.h ppd.h array.h versioning.h
+testcups.64.o: testcups.c file.h
testfile.64.o: testfile.c string-private.h ../config.h debug-private.h file.h versioning.h
testhttp.64.o: testhttp.c string-private.h ../config.h http-private.h ../cups/http.h
testhttp.64.o: testhttp.c md5-private.h ipp-private.h ../cups/ipp.h
@@ -633,25 +671,26 @@ testi18n.64.o: testi18n.c string-private.h ../config.h language-private.h
testi18n.64.o: testi18n.c ../cups/transcode.h language.h array.h versioning.h
testipp.64.o: testipp.c ../cups/file.h versioning.h string-private.h ../config.h
testipp.64.o: testipp.c ipp-private.h ../cups/ipp.h
-testoptions.64.o: testoptions.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testoptions.64.o: testoptions.c array.h file.h language.h string-private.h ../config.h
-testoptions.64.o: testoptions.c debug-private.h http-private.h ../cups/http.h md5-private.h
+testoptions.64.o: testoptions.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testoptions.64.o: testoptions.c language.h array.h string-private.h ../config.h
+testoptions.64.o: testoptions.c debug-private.h ppd-private.h ../cups/ppd.h cups.h
+testoptions.64.o: testoptions.c pwg-private.h http-private.h ../cups/http.h md5-private.h
testoptions.64.o: testoptions.c ipp-private.h ../cups/ipp.h language-private.h
-testoptions.64.o: testoptions.c ../cups/transcode.h pwg-private.h
-testlang.64.o: testlang.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testlang.64.o: testlang.c array.h file.h language.h string-private.h ../config.h
-testlang.64.o: testlang.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testlang.64.o: testlang.c ipp-private.h ../cups/ipp.h language-private.h
-testlang.64.o: testlang.c ../cups/transcode.h pwg-private.h
-testppd.64.o: testppd.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testppd.64.o: testppd.c array.h file.h language.h string-private.h ../config.h
-testppd.64.o: testppd.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testppd.64.o: testppd.c ipp-private.h ../cups/ipp.h language-private.h ../cups/transcode.h
-testppd.64.o: testppd.c pwg-private.h
-testpwg.64.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testpwg.64.o: testpwg.c array.h file.h language.h
-testsnmp.64.o: testsnmp.c cups-private.h ../cups/cups.h ipp.h http.h versioning.h ppd.h
-testsnmp.64.o: testsnmp.c array.h file.h language.h string-private.h ../config.h
-testsnmp.64.o: testsnmp.c debug-private.h http-private.h ../cups/http.h md5-private.h
-testsnmp.64.o: testsnmp.c ipp-private.h ../cups/ipp.h language-private.h
-testsnmp.64.o: testsnmp.c ../cups/transcode.h pwg-private.h snmp-private.h
+testoptions.64.o: testoptions.c ../cups/transcode.h
+testlang.64.o: testlang.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testlang.64.o: testlang.c language.h array.h string-private.h ../config.h debug-private.h
+testlang.64.o: testlang.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testlang.64.o: testlang.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testlang.64.o: testlang.c language-private.h ../cups/transcode.h
+testppd.64.o: testppd.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testppd.64.o: testppd.c language.h array.h string-private.h ../config.h debug-private.h
+testppd.64.o: testppd.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testppd.64.o: testppd.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testppd.64.o: testppd.c language-private.h ../cups/transcode.h
+testpwg.64.o: testpwg.c ppd-private.h ../cups/ppd.h cups.h array.h versioning.h file.h
+testpwg.64.o: testpwg.c pwg-private.h ../cups/cups.h ipp.h http.h language.h
+testsnmp.64.o: testsnmp.c cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
+testsnmp.64.o: testsnmp.c language.h array.h string-private.h ../config.h debug-private.h
+testsnmp.64.o: testsnmp.c ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
+testsnmp.64.o: testsnmp.c ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
+testsnmp.64.o: testsnmp.c language-private.h ../cups/transcode.h snmp-private.h
diff --git a/cups/adminutil.h b/cups/adminutil.h
index 45b497049..f05691677 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -22,6 +22,7 @@
* Include necessary headers...
*/
+# include
# include "cups.h"
diff --git a/cups/cups-private.h b/cups/cups-private.h
index 5fa1a242c..0a0e9e2bc 100644
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -25,6 +25,7 @@
# include
# include "string-private.h"
# include "debug-private.h"
+# include "ppd-private.h"
# include "http-private.h"
# include "ipp-private.h"
# include "language-private.h"
diff --git a/cups/cups.h b/cups/cups.h
index c460e8f89..2a256c2e4 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,9 +1,9 @@
/*
* "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $"
*
- * API definitions for the Common UNIX Printing System (CUPS).
+ * API definitions for CUPS.
*
- * Copyright 2007-2009 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -29,8 +29,8 @@
typedef off_t ssize_t; /* @private@ */
# endif /* WIN32 && !__CUPS_SSIZE_T_DEFINED */
+# include "file.h"
# include "ipp.h"
-# include "ppd.h"
# include "language.h"
@@ -212,8 +212,6 @@ extern void cupsEncodeOptions(ipp_t *ipp, int num_options,
extern void cupsFreeOptions(int num_options, cups_option_t *options);
extern const char *cupsGetOption(const char *name, int num_options,
cups_option_t *options);
-extern int cupsMarkOptions(ppd_file_t *ppd, int num_options,
- cups_option_t *options);
extern int cupsParseOptions(const char *arg, int num_options,
cups_option_t **options);
@@ -289,10 +287,6 @@ extern int cupsCreateJob(http_t *http, const char *name,
cups_option_t *options) _CUPS_API_1_4;
extern ipp_status_t cupsFinishDocument(http_t *http,
const char *name) _CUPS_API_1_4;
-extern int cupsGetConflicts(ppd_file_t *ppd, const char *option,
- const char *choice,
- cups_option_t **options)
- _CUPS_API_1_4;
extern ipp_status_t cupsGetDevices(http_t *http, int timeout,
const char *include_schemes,
const char *exclude_schemes,
@@ -310,11 +304,6 @@ extern ipp_t *cupsGetResponse(http_t *http,
const char *resource) _CUPS_API_1_4;
extern ssize_t cupsReadResponseData(http_t *http, char *buffer,
size_t length) _CUPS_API_1_4;
-extern int cupsResolveConflicts(ppd_file_t *ppd, const char *option,
- const char *choice,
- int *num_options,
- cups_option_t **options)
- _CUPS_API_1_4;
extern http_status_t cupsSendRequest(http_t *http, ipp_t *request,
const char *resource,
size_t length) _CUPS_API_1_4;
diff --git a/cups/http.c b/cups/http.c
index 3951b1fee..3293c8899 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -584,7 +584,7 @@ httpFlush(http_t *http) /* I - Connection to server */
http->blocking = blocking;
- if (http->state == oldstate && http->fd >= 0)
+ if (http->state == oldstate && http->state != HTTP_WAITING && http->fd >= 0)
{
/*
* Didn't get the data back, so close the current connection.
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index c4945fc7a..2120c0865 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -66,9 +66,11 @@ typedef struct /**** Attribute mapping data ****/
* Prototypes for private functions...
*/
-extern ipp_attribute_t *_ippAddAttr(ipp_t *, int);
+extern ipp_attribute_t *_ippAddAttr(ipp_t *ipp, int num_values);
+extern size_t _ippAttrString(ipp_attribute_t *attr, char *buffer,
+ size_t bufsize);
extern _ipp_option_t *_ippFindOption(const char *name);
-extern void _ippFreeAttr(ipp_attribute_t *);
+extern void _ippFreeAttr(ipp_attribute_t *attr);
/*
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 8e2ee8de2..c549a6f89 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -16,6 +16,7 @@
*
* Contents:
*
+ * _ippAttrString() - Convert the attribute's value to a string.
* ippErrorString() - Return a name for the given status code.
* ippErrorValue() - Return a status code for the given name.
* ippOpString() - Return a name for the given operation id.
@@ -24,6 +25,7 @@
* ippSetPort() - Set the default port number.
* ippTagString() - Return the tag name corresponding to a tag value.
* ippTagValue() - Return the tag value corresponding to a tag name.
+ * ipp_col_string() - Convert a collection to a string.
*/
/*
@@ -92,26 +94,43 @@ static const char * const ipp_status_oks[] = /* "OK" status codes */
static char * const ipp_std_ops[] =
{
/* 0x0000 - 0x000f */
- "", "", "Print-Job", "Print-URI",
- "Validate-Job", "Create-Job", "Send-Document",
- "Send-URI", "Cancel-Job", "Get-Job-Attributes",
- "Get-Jobs", "Get-Printer-Attributes",
- "Hold-Job", "Release-Job", "Restart-Job", "",
+ "unknown-00",
+ "unknown-01",
+ "Print-Job",
+ "Print-URI",
+ "Validate-Job",
+ "Create-Job",
+ "Send-Document",
+ "Send-URI",
+ "Cancel-Job",
+ "Get-Job-Attributes",
+ "Get-Jobs",
+ "Get-Printer-Attributes",
+ "Hold-Job",
+ "Release-Job",
+ "Restart-Job",
+ "unknown-0f",
/* 0x0010 - 0x001f */
- "Pause-Printer", "Resume-Printer",
- "Purge-Jobs", "Set-Printer-Attributes",
+ "Pause-Printer",
+ "Resume-Printer",
+ "Purge-Jobs",
+ "Set-Printer-Attributes",
"Set-Job-Attributes",
"Get-Printer-Supported-Values",
"Create-Printer-Subscription",
"Create-Job-Subscription",
"Get-Subscription-Attributes",
- "Get-Subscriptions", "Renew-Subscription",
- "Cancel-Subscription", "Get-Notifications",
- "Send-Notifications", "", "",
+ "Get-Subscriptions",
+ "Renew-Subscription",
+ "Cancel-Subscription",
+ "Get-Notifications",
+ "Send-Notifications",
+ "unknown-1e",
+ "unknown-1f",
/* 0x0020 - 0x002f */
- "",
+ "unknown-20",
"Get-Printer-Support-Files",
"Enable-Printer",
"Disable-Printer",
@@ -128,9 +147,19 @@ static char * const ipp_std_ops[] =
"Suspend-Current-Job",
"Resume-Job",
- /* 0x0030 - 0x0031 */
+ /* 0x0030 - 0x003b */
"Promote-Job",
- "Schedule-Job-After"
+ "Schedule-Job-After",
+ "unknown-32",
+ "Cancel-Document",
+ "Get-Document-Attributes",
+ "Get-Documents",
+ "Delete-Document",
+ "Set-Document-Attributes",
+ "Cancel-Jobs",
+ "Cancel-My-Jobs",
+ "Resubmit-Job",
+ "Close-Job"
},
* const ipp_cups_ops[] =
{
@@ -238,6 +267,244 @@ static char * const ipp_std_ops[] =
"mimeMediaType", /* 0x49 */
"memberAttrName" /* 0x4a */
};
+static const char * const job_states[] =
+{ /* job-state enums */
+ "pending",
+ "pending-held",
+ "processing",
+ "processing-stopped"
+ "canceled",
+ "aborted",
+ "completed"
+};
+static const char * const printer_states[] =
+{ /* printer-state enums */
+ "idle",
+ "processing",
+ "stopped",
+};
+
+
+/*
+ * Local functions...
+ */
+
+static size_t ipp_col_string(ipp_t *col, char *buffer, size_t bufsize);
+
+
+/*
+ * '_ippAttrString()' - Convert the attribute's value to a string.
+ *
+ * Returns the number of bytes that would be written, not including the
+ * trailing nul. The buffer pointer can be NULL to get the required length,
+ * just like (v)snprintf.
+ */
+
+size_t /* O - Number of bytes less nul */
+_ippAttrString(ipp_attribute_t *attr, /* I - Attribute */
+ char *buffer, /* I - String buffer or NULL */
+ size_t bufsize) /* I - Size of string buffer */
+{
+ int i; /* Looping var */
+ char *bufptr, /* Pointer into buffer */
+ *bufend, /* End of buffer */
+ temp[256]; /* Temporary string */
+ const char *ptr; /* Pointer into string */
+ ipp_value_t *val; /* Current value */
+
+
+ if (!attr || !attr->name)
+ {
+ if (buffer)
+ *buffer = '\0';
+
+ return (0);
+ }
+
+ bufptr = buffer;
+ if (buffer)
+ bufend = buffer + bufsize - 1;
+ else
+ bufend = NULL;
+
+ for (i = attr->num_values, val = attr->values; i > 0; i --, val ++)
+ {
+ if (val > attr->values)
+ {
+ if (bufptr < bufend)
+ *bufptr++ = ',';
+ else
+ bufptr ++;
+ }
+
+ switch (attr->value_tag)
+ {
+ case IPP_TAG_ENUM :
+ if (!strcmp(attr->name, "printer-state") &&
+ val->integer >= IPP_PRINTER_IDLE &&
+ val->integer <= IPP_PRINTER_STOPPED)
+ {
+ ptr = printer_states[val->integer - IPP_PRINTER_IDLE];
+
+ if (bufptr < bufend)
+ strlcpy(bufptr, ptr, bufend - bufptr + 1);
+
+ bufptr += strlen(ptr);
+ break;
+ }
+ else if (!strcmp(attr->name, "job-state") &&
+ val->integer >= IPP_JOB_PENDING &&
+ val->integer <= IPP_JOB_COMPLETED)
+ {
+ ptr = job_states[val->integer - IPP_JOB_PENDING];
+
+ if (bufptr < bufend)
+ strlcpy(bufptr, ptr, bufend - bufptr + 1);
+
+ bufptr += strlen(ptr);
+ break;
+ }
+
+ case IPP_TAG_INTEGER :
+ if (bufptr < bufend)
+ bufptr += snprintf(bufptr, bufend - bufptr + 1, "%d", val->integer);
+ else
+ bufptr += snprintf(temp, sizeof(temp), "%d", val->integer);
+ break;
+
+ case IPP_TAG_BOOLEAN :
+ if (bufptr < bufend)
+ strlcpy(bufptr, val->boolean ? "true" : "false",
+ bufend - bufptr + 1);
+
+ bufptr += val->boolean ? 4 : 5;
+ break;
+
+ case IPP_TAG_RANGE :
+ if (bufptr < bufend)
+ bufptr += snprintf(bufptr, bufend - bufptr + 1, "%d-%d",
+ val->range.lower, val->range.upper);
+ else
+ bufptr += snprintf(temp, sizeof(temp), "%d-%d", val->range.lower,
+ val->range.upper);
+ break;
+
+ case IPP_TAG_RESOLUTION :
+ if (bufptr < bufend)
+ bufptr += snprintf(bufptr, bufend - bufptr + 1, "%dx%d%s",
+ val->resolution.xres, val->resolution.yres,
+ val->resolution.units == IPP_RES_PER_INCH ?
+ "dpi" : "dpc");
+ else
+ bufptr += snprintf(temp, sizeof(temp), "%dx%d%s",
+ val->resolution.xres, val->resolution.yres,
+ val->resolution.units == IPP_RES_PER_INCH ?
+ "dpi" : "dpc");
+ break;
+
+ case IPP_TAG_DATE :
+ {
+ unsigned year; /* Year */
+
+ year = (val->date[0] << 8) + val->date[1];
+
+ if (val->date[9] == 0 && val->date[10] == 0)
+ snprintf(temp, sizeof(temp), "%04u-%02u-%02uT%02u:%02u:%02uZ",
+ year, val->date[2], val->date[3], val->date[4],
+ val->date[5], val->date[6]);
+ else
+ snprintf(temp, sizeof(temp),
+ "%04u-%02u-%02uT%02u:%02u:%02u%c%02u%02u",
+ year, val->date[2], val->date[3], val->date[4],
+ val->date[5], val->date[6], val->date[8], val->date[9],
+ val->date[10]);
+
+ if (bufptr < bufend)
+ strlcpy(bufptr, temp, bufend - bufptr + 1);
+
+ bufptr += strlen(temp);
+ }
+ break;
+
+ case IPP_TAG_TEXT :
+ case IPP_TAG_NAME :
+ case IPP_TAG_KEYWORD :
+ case IPP_TAG_CHARSET :
+ case IPP_TAG_URI :
+ case IPP_TAG_MIMETYPE :
+ case IPP_TAG_LANGUAGE :
+ case IPP_TAG_TEXTLANG :
+ case IPP_TAG_NAMELANG :
+ for (ptr = val->string.text; *ptr; ptr ++)
+ {
+ if (*ptr == '\\' || *ptr == '\"')
+ {
+ if (bufptr < bufend)
+ *bufptr = '\\';
+ bufptr ++;
+ }
+
+ if (bufptr < bufend)
+ *bufptr = *ptr;
+ bufptr ++;
+ }
+ break;
+
+ case IPP_TAG_BEGIN_COLLECTION :
+ if (bufptr < bufend)
+ bufptr += ipp_col_string(val->collection, bufptr,
+ bufend - bufptr + 1);
+ else
+ bufptr += ipp_col_string(val->collection, NULL, 0);
+ break;
+
+ case IPP_TAG_STRING :
+ for (ptr = val->string.text; *ptr; ptr ++)
+ {
+ if (*ptr == '\\' || isspace(*ptr & 255))
+ {
+ if (bufptr < bufend)
+ *bufptr = '\\';
+ bufptr ++;
+
+ if (bufptr < bufend)
+ *bufptr = *ptr;
+ bufptr ++;
+ }
+ else if (!isprint(*ptr & 255))
+ {
+ if (bufptr < bufend)
+ bufptr += snprintf(bufptr, bufend - bufptr + 1, "\\%03o",
+ *ptr & 255);
+ else
+ bufptr += snprintf(temp, sizeof(temp), "\\%03o",
+ *ptr & 255);
+ }
+ else
+ {
+ if (bufptr < bufend)
+ *bufptr = *ptr;
+ bufptr ++;
+ }
+ }
+ break;
+
+ default :
+ ptr = ippTagString(attr->value_tag);
+ if (bufptr < bufend)
+ strlcpy(bufptr, ptr, bufend - bufptr + 1);
+ bufptr += strlen(ptr);
+ break;
+ }
+ }
+
+ if (bufptr < bufend)
+ *bufptr = '\0';
+ else if (bufend)
+ *bufend = '\0';
+
+ return (bufptr - buffer);
+}
/*
@@ -325,7 +592,7 @@ ippOpString(ipp_op_t op) /* I - Operation ID */
* See if the operation ID is a known value...
*/
- if (op >= IPP_PRINT_JOB && op <= IPP_SCHEDULE_JOB_AFTER)
+ if (op >= IPP_PRINT_JOB && op <= IPP_CLOSE_JOB)
return (ipp_std_ops[op]);
else if (op == IPP_PRIVATE)
return ("windows-ext");
diff --git a/cups/ipp.c b/cups/ipp.c
index cd4014336..3e90b8b4d 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -181,6 +181,8 @@ ippAddCollection(ipp_t *ipp, /* I - IPP message */
attr->value_tag = IPP_TAG_BEGIN_COLLECTION;
attr->values[0].collection = value;
+ value->use ++;
+
return (attr);
}
@@ -219,10 +221,15 @@ ippAddCollections(
attr->value_tag = IPP_TAG_BEGIN_COLLECTION;
if (values != NULL)
+ {
for (i = 0, value = attr->values;
i < num_values;
i ++, value ++)
+ {
value->collection = (ipp_t *)values[i];
+ value->collection->use ++;
+ }
+ }
return (attr);
}
@@ -794,6 +801,10 @@ ippDelete(ipp_t *ipp) /* I - IPP message */
if (!ipp)
return;
+ ipp->use --;
+ if (ipp->use > 0)
+ return;
+
for (attr = ipp->attrs; attr != NULL; attr = next)
{
next = attr->next;
@@ -968,6 +979,7 @@ ippNew(void)
temp->request.any.version[0] = 1;
temp->request.any.version[1] = 1;
+ temp->use = 1;
}
DEBUG_printf(("1ippNew: Returning %p", temp));
@@ -3009,7 +3021,7 @@ ipp_read_http(http_t *http, /* I - Client connection */
int tbytes, /* Total bytes read */
bytes; /* Bytes read this pass */
char len[32]; /* Length string */
-
+
DEBUG_printf(("7ipp_read_http(http=%p, buffer=%p, length=%d)",
http, buffer, (int)length));
diff --git a/cups/ipp.h b/cups/ipp.h
index ae8d99988..12126e260 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -231,6 +231,15 @@ typedef enum ipp_op_e /**** IPP operations ****/
IPP_RESUME_JOB, /* Resume the current job @private@ */
IPP_PROMOTE_JOB, /* Promote a job to print sooner @private@ */
IPP_SCHEDULE_JOB_AFTER, /* Schedule a job to print after another @private@ */
+ IPP_CANCEL_DOCUMENT = 0x0033, /* Cancel-Document @private@ */
+ IPP_GET_DOCUMENT_ATTRIBUTES, /* Get-Document-Attributes @private@ */
+ IPP_GET_DOCUMENTS, /* Get-Documents @private@ */
+ IPP_DELETE_DOCUMENT, /* Delete-Document @private@ */
+ IPP_SET_DOCUMENT_ATTRIBUTES, /* Set-Document-Attributes @private@ */
+ IPP_CANCEL_JOBS, /* Cancel-Jobs */
+ IPP_CANCEL_MY_JOBS, /* Cancel-My-Jobs */
+ IPP_RESUBMIT_JOB, /* Resubmit-Job */
+ IPP_CLOSE_JOB, /* Close-Job */
IPP_PRIVATE = 0x4000, /* Reserved @private@ */
CUPS_GET_DEFAULT, /* Get the default printer */
CUPS_GET_PRINTERS, /* Get a list of printers and/or classes */
@@ -404,6 +413,9 @@ struct ipp_s /**** IPP Request/Response/Notification ****/
/**** New in CUPS 1.2 ****/
ipp_attribute_t *prev; /* Previous attribute (for read) @since CUPS 1.2/Mac OS X 10.5@ */
+
+/**** New in CUPS 1.5 ****/
+ int use; /* Use count */
};
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index 996693105..f7ade9407 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -31,7 +31,8 @@
* Include necessary headers...
*/
-# include
+# include
+# include "pwg-private.h"
/*
@@ -78,6 +79,23 @@ extern char *_ppdNormalizeMakeAndModel(const char *make_and_model,
size_t bufsize);
extern int _ppdParseOptions(const char *s, int num_options,
cups_option_t **options);
+extern _pwg_t *_pwgCreateWithPPD(ppd_file_t *ppd);
+extern const char *_pwgGetInputSlot(_pwg_t *pwg, ipp_t *job,
+ const char *keyword);
+extern const char *_pwgGetMediaType(_pwg_t *pwg, ipp_t *job,
+ const char *keyword);
+extern const char *_pwgGetPageSize(_pwg_t *pwg, ipp_t *job,
+ const char *keyword, int *exact);
+extern _pwg_size_t *_pwgGetSize(_pwg_t *pwg, const char *page_size);
+extern const char *_pwgGetSource(_pwg_t *pwg, const char *input_slot);
+extern const char *_pwgGetType(_pwg_t *pwg, const char *media_type);
+extern const char *_pwgInputSlotForSource(const char *media_source,
+ char *name, size_t namesize);
+extern _pwg_media_t *_pwgMediaForPPD(const char *ppd);
+extern const char *_pwgMediaTypeForType(const char *media_source,
+ char *name, size_t namesize);
+extern const char *_pwgPageSizeForMedia(_pwg_media_t *media,
+ char *name, size_t namesize);
/*
diff --git a/cups/ppd.h b/cups/ppd.h
index dfda690dc..a84bcadcc 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -32,6 +32,7 @@
*/
# include
+# include "cups.h"
# include "array.h"
# include "file.h"
@@ -343,6 +344,8 @@ typedef struct ppd_file_s /**** PPD File ****/
* Prototypes...
*/
+extern int cupsMarkOptions(ppd_file_t *ppd, int num_options,
+ cups_option_t *options);
extern void ppdClose(ppd_file_t *ppd);
extern int ppdCollect(ppd_file_t *ppd, ppd_section_t section,
ppd_choice_t ***choices);
@@ -399,19 +402,29 @@ extern ppd_option_t *ppdNextOption(ppd_file_t *ppd) _CUPS_API_1_2;
extern int ppdLocalize(ppd_file_t *ppd) _CUPS_API_1_2;
extern ppd_file_t *ppdOpen2(cups_file_t *fp) _CUPS_API_1_2;
-/**** New in CUPS 1.3 ****/
+/**** New in CUPS 1.3/Mac OS X 10.5 ****/
extern const char *ppdLocalizeIPPReason(ppd_file_t *ppd,
const char *reason,
const char *scheme,
char *buffer,
size_t bufsize) _CUPS_API_1_3;
-/**** New in CUPS 1.4 ****/
+/**** New in CUPS 1.4/Mac OS X 10.6 ****/
+extern int cupsGetConflicts(ppd_file_t *ppd, const char *option,
+ const char *choice,
+ cups_option_t **options)
+ _CUPS_API_1_4;
+extern int cupsResolveConflicts(ppd_file_t *ppd, const char *option,
+ const char *choice,
+ int *num_options,
+ cups_option_t **options)
+ _CUPS_API_1_4;
extern int ppdInstallableConflict(ppd_file_t *ppd,
const char *option,
- const char *choice);
+ const char *choice)
+ _CUPS_API_1_4;
extern ppd_attr_t *ppdLocalizeAttr(ppd_file_t *ppd, const char *keyword,
- const char *spec);
+ const char *spec) _CUPS_API_1_4;
extern const char *ppdLocalizeMarkerName(ppd_file_t *ppd,
const char *name) _CUPS_API_1_4;
extern int ppdPageSizeLimits(ppd_file_t *ppd,
diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index a41c4cbf1..909c90a8e 100644
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -104,7 +104,7 @@ static _pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_IN("na_arch-b_12x18in", "arch-b", "ARCHB", 12, 18),
_PWG_MEDIA_IN("na_12x19_12x19in", NULL, NULL, 12, 19),
_PWG_MEDIA_IN("na_b-plus_12x19.17in", NULL, "SuperB", 12, 19.17),
- _PWG_MEDIA_IN("na_super-b_13x19in", NULL, NULL, 13, 19),
+ _PWG_MEDIA_IN("na_super-b_13x19in", "super-b", NULL, 13, 19),
_PWG_MEDIA_IN("na_c_17x22in", "c", "AnsiC", 17, 22),
_PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24),
_PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34),
diff --git a/cups/pwg-ppd.c b/cups/pwg-ppd.c
index a0fc0837c..ca3d88fb8 100644
--- a/cups/pwg-ppd.c
+++ b/cups/pwg-ppd.c
@@ -71,7 +71,6 @@ _pwgCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
ppd_name[PPD_MAX_NAME]; /* Normalized PPD name */
const char *pwg_name; /* Standard PWG media name */
_pwg_media_t *pwg_media; /* PWG media data */
- struct lconv *loc; /* Locale conversion data */
DEBUG_printf(("_pwgCreateWithPPD(ppd=%p)", ppd));
@@ -110,8 +109,6 @@ _pwgCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
goto create_error;
}
- loc = localeconv();
-
for (i = ppd->num_sizes, pwg_size = pwg->sizes, ppd_size = ppd->sizes;
i > 0;
i --, ppd_size ++)
@@ -233,29 +230,23 @@ _pwgCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
!strcasecmp(choice->choice, "Default"))
pwg_name = "auto";
else if (!strcasecmp(choice->choice, "Cassette"))
- pwg_name = "main-tray";
+ pwg_name = "main";
else if (!strncasecmp(choice->choice, "Multipurpose", 12) ||
!strcasecmp(choice->choice, "MP") ||
!strcasecmp(choice->choice, "MPTray"))
- pwg_name = "alternate-tray";
+ pwg_name = "alternate";
else if (!strcasecmp(choice->choice, "LargeCapacity"))
- pwg_name = "large-capacity-tray";
+ pwg_name = "large-capacity";
else if (!strncasecmp(choice->choice, "Lower", 5))
- pwg_name = "bottom-tray";
+ pwg_name = "bottom";
else if (!strncasecmp(choice->choice, "Middle", 6))
- pwg_name = "middle-tray";
+ pwg_name = "middle";
else if (!strncasecmp(choice->choice, "Upper", 5))
- pwg_name = "top-tray";
- else if (!strcasecmp(choice->choice, "Rear"))
- pwg_name = "rear-feed";
+ pwg_name = "top";
else if (!strncasecmp(choice->choice, "Side", 4))
- pwg_name = "side-feed";
- else if (!strcasecmp(choice->choice, "Envelope"))
- pwg_name = "envelope-feed";
- else if (!strcasecmp(choice->choice, "Manual"))
- pwg_name = "manual-feed";
+ pwg_name = "side";
else if (!strcasecmp(choice->choice, "Roll") ||
- !strcasecmp(choice->choice, "Roll"))
+ !strcasecmp(choice->choice, "Roll1"))
pwg_name = "main-roll";
else if (!strcasecmp(choice->choice, "Roll2"))
pwg_name = "alternate-roll";
@@ -284,7 +275,7 @@ _pwgCreateWithPPD(ppd_file_t *ppd) /* I - PPD file */
sizeof(_pwg_map_t))) == NULL)
{
DEBUG_printf(("_pwgCreateWithPPD: Unable to allocate %d _pwg_map_t's "
- "for MediaType.", input_slot->num_choices));
+ "for MediaType.", media_type->num_choices));
goto create_error;
}
@@ -496,7 +487,7 @@ _pwgGetPageSize(_pwg_t *pwg, /* I - PWG mapping data */
if (!_pwgInitSize(&jobsize, job, &margins_set))
return (NULL);
- }
+ }
else
{
/*
@@ -753,23 +744,23 @@ _pwgInputSlotForSource(
char *name, /* I - Name buffer */
size_t namesize) /* I - Size of name buffer */
{
- if (strcasecmp(media_source, "main-tray"))
+ if (strcasecmp(media_source, "main"))
strlcpy(name, "Cassette", namesize);
- else if (strcasecmp(media_source, "alternate-tray"))
+ else if (strcasecmp(media_source, "alternate"))
strlcpy(name, "Multipurpose", namesize);
- else if (strcasecmp(media_source, "large-capacity-tray"))
+ else if (strcasecmp(media_source, "large-capacity"))
strlcpy(name, "LargeCapacity", namesize);
- else if (strcasecmp(media_source, "bottom-tray"))
+ else if (strcasecmp(media_source, "bottom"))
strlcpy(name, "Lower", namesize);
- else if (strcasecmp(media_source, "middle-tray"))
+ else if (strcasecmp(media_source, "middle"))
strlcpy(name, "Middle", namesize);
- else if (strcasecmp(media_source, "top-tray"))
+ else if (strcasecmp(media_source, "top"))
strlcpy(name, "Upper", namesize);
- else if (strcasecmp(media_source, "rear-feed"))
+ else if (strcasecmp(media_source, "rear"))
strlcpy(name, "Rear", namesize);
- else if (strcasecmp(media_source, "side-feed"))
+ else if (strcasecmp(media_source, "side"))
strlcpy(name, "Side", namesize);
- else if (strcasecmp(media_source, "envelope-feed"))
+ else if (strcasecmp(media_source, "envelope"))
strlcpy(name, "Envelope", namesize);
else if (strcasecmp(media_source, "main-roll"))
strlcpy(name, "Roll", namesize);
diff --git a/cups/pwg-private.h b/cups/pwg-private.h
index 4bf074e84..fa266a2bf 100644
--- a/cups/pwg-private.h
+++ b/cups/pwg-private.h
@@ -48,6 +48,10 @@ extern "C" {
* Types and structures...
*/
+# ifndef _CUPS_PPD_H_
+typedef struct ppd_file_s ppd_file_t;
+# endif /* _CUPS_PPD_H_ */
+
typedef struct _pwg_media_s /**** Common media size data ****/
{
const char *pwg, /* PWG 5101.1 "self describing" name */
@@ -84,8 +88,7 @@ typedef struct _pwg_s /**** PWG-PPD conversion data ****/
custom_min_length; /* Minimum custom length in 2540ths */
char *custom_max_keyword, /* Maximum custom size PWG keyword */
*custom_min_keyword, /* Minimum custom size PWG keyword */
- custom_ppd_size[PPD_MAX_NAME];
- /* Custom PPD size name */
+ custom_ppd_size[41]; /* Custom PPD size name */
_pwg_size_t custom_size; /* Custom size record */
int num_sources; /* Number of media sources */
_pwg_map_t *sources; /* Media sources */
@@ -99,33 +102,16 @@ typedef struct _pwg_s /**** PWG-PPD conversion data ****/
*/
extern _pwg_t *_pwgCreateWithFile(const char *filename);
-extern _pwg_t *_pwgCreateWithPPD(ppd_file_t *ppd);
extern void _pwgDestroy(_pwg_t *pwg);
extern void _pwgGenerateSize(char *keyword, size_t keysize,
const char *prefix,
const char *ppdname,
int width, int length);
-extern const char *_pwgGetInputSlot(_pwg_t *pwg, ipp_t *job,
- const char *keyword);
-extern const char *_pwgGetMediaType(_pwg_t *pwg, ipp_t *job,
- const char *keyword);
-extern const char *_pwgGetPageSize(_pwg_t *pwg, ipp_t *job,
- const char *keyword, int *exact);
-extern _pwg_size_t *_pwgGetSize(_pwg_t *pwg, const char *page_size);
-extern const char *_pwgGetSource(_pwg_t *pwg, const char *input_slot);
-extern const char *_pwgGetType(_pwg_t *pwg, const char *media_type);
extern int _pwgInitSize(_pwg_size_t *size, ipp_t *job,
int *margins_set);
-extern const char *_pwgInputSlotForSource(const char *media_source,
- char *name, size_t namesize);
extern _pwg_media_t *_pwgMediaForLegacy(const char *legacy);
-extern _pwg_media_t *_pwgMediaForPPD(const char *ppd);
extern _pwg_media_t *_pwgMediaForPWG(const char *pwg);
extern _pwg_media_t *_pwgMediaForSize(int width, int length);
-extern const char *_pwgMediaTypeForType(const char *media_source,
- char *name, size_t namesize);
-extern const char *_pwgPageSizeForMedia(_pwg_media_t *media,
- char *name, size_t namesize);
extern int _pwgWriteFile(_pwg_t *pwg, const char *filename);
diff --git a/cups/raster.h b/cups/raster.h
index 86d4a255c..4848dacc2 100644
--- a/cups/raster.h
+++ b/cups/raster.h
@@ -24,7 +24,9 @@
* Include necessary headers...
*/
-# include
+# include "cups.h"
+# include "ppd.h"
+
# ifdef __cplusplus
extern "C" {
diff --git a/cups/testconflicts.c b/cups/testconflicts.c
index 831582128..7bfe420bf 100644
--- a/cups/testconflicts.c
+++ b/cups/testconflicts.c
@@ -23,6 +23,7 @@
*/
#include "cups.h"
+#include "ppd.h"
#include "string-private.h"
diff --git a/cups/testcups.c b/cups/testcups.c
index 22ee86607..f595568f6 100644
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -26,6 +26,7 @@
#include "string-private.h"
#include "cups.h"
+#include "ppd.h"
#include
@@ -90,7 +91,7 @@ main(int argc, /* I - Number of command-line arguments */
cupsLastErrorString());
return (1);
}
-
+
interval = atoi(argv[3]);
if (cupsStartDocument(CUPS_HTTP_DEFAULT, argv[1], job_id, argv[2],
diff --git a/cups/testipp.c b/cups/testipp.c
index 5e9b657c2..ce27728b0 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -16,7 +16,11 @@
*
* Contents:
*
- * main() - Main entry.
+ * main() - Main entry.
+ * hex_dump() - Produce a hex dump of a buffer.
+ * print_attributes() - Print the attributes in a request...
+ * read_cb() - Read data from a buffer.
+ * write_cb() - Write data into a buffer.
*/
/*
@@ -239,6 +243,7 @@ main(int argc, /* I - Number of command-line arguments */
ippAddInteger(size, IPP_TAG_ZERO, IPP_TAG_INTEGER, "x-dimension", 21590);
ippAddInteger(size, IPP_TAG_ZERO, IPP_TAG_INTEGER, "y-dimension", 27940);
ippAddCollection(cols[0], IPP_TAG_JOB, "media-size", size);
+ ippDelete(size);
ippAddString(cols[0], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-color", NULL,
"blue");
ippAddString(cols[0], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-type", NULL,
@@ -249,6 +254,7 @@ main(int argc, /* I - Number of command-line arguments */
ippAddInteger(size, IPP_TAG_ZERO, IPP_TAG_INTEGER, "x-dimension", 21000);
ippAddInteger(size, IPP_TAG_ZERO, IPP_TAG_INTEGER, "y-dimension", 29700);
ippAddCollection(cols[1], IPP_TAG_JOB, "media-size", size);
+ ippDelete(size);
ippAddString(cols[1], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-color", NULL,
"plaid");
ippAddString(cols[1], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-type", NULL,
@@ -256,6 +262,8 @@ main(int argc, /* I - Number of command-line arguments */
ippAddCollections(request, IPP_TAG_JOB, "media-col", 2,
(const ipp_t **)cols);
+ ippDelete(cols[0]);
+ ippDelete(cols[1]);
length = ippLength(request);
if (length != sizeof(collection))
@@ -274,7 +282,8 @@ main(int argc, /* I - Number of command-line arguments */
printf("Write Sample to Memory: ");
wused = 0;
- while ((state = ippWriteIO(wbuffer, write_cb, 1, NULL, request)) != IPP_DATA)
+ while ((state = ippWriteIO(wbuffer, write_cb, 1, NULL,
+ request)) != IPP_DATA)
if (state == IPP_ERROR)
break;
@@ -363,119 +372,124 @@ main(int argc, /* I - Number of command-line arguments */
else
puts("PASS");
- fputs("ippFindAttribute(media-size 1): ", stdout);
- if ((media_size = ippFindAttribute(media_col->values[0].collection,
- "media-size",
- IPP_TAG_BEGIN_COLLECTION)) == NULL)
+ if (media_col)
{
+ fputs("ippFindAttribute(media-size 1): ", stdout);
if ((media_size = ippFindAttribute(media_col->values[0].collection,
- "media-col",
- IPP_TAG_ZERO)) == NULL)
- puts("FAIL (not found)");
- else
- printf("FAIL (wrong type - %s)\n", ippTagString(media_size->value_tag));
-
- status = 1;
- }
- else
- {
- if ((attr = ippFindAttribute(media_size->values[0].collection,
- "x-dimension", IPP_TAG_INTEGER)) == NULL)
+ "media-size",
+ IPP_TAG_BEGIN_COLLECTION)) == NULL)
{
- if ((attr = ippFindAttribute(media_size->values[0].collection,
- "x-dimension", IPP_TAG_ZERO)) == NULL)
- puts("FAIL (missing x-dimension)");
+ if ((media_size = ippFindAttribute(media_col->values[0].collection,
+ "media-col",
+ IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (not found)");
else
- printf("FAIL (wrong type for x-dimension - %s)\n",
- ippTagString(attr->value_tag));
+ printf("FAIL (wrong type - %s)\n",
+ ippTagString(media_size->value_tag));
status = 1;
}
- else if (attr->values[0].integer != 21590)
- {
- printf("FAIL (wrong value for x-dimension - %d)\n",
- attr->values[0].integer);
- status = 1;
- }
- else if ((attr = ippFindAttribute(media_size->values[0].collection,
- "y-dimension",
- IPP_TAG_INTEGER)) == NULL)
+ else
{
if ((attr = ippFindAttribute(media_size->values[0].collection,
- "y-dimension", IPP_TAG_ZERO)) == NULL)
- puts("FAIL (missing y-dimension)");
+ "x-dimension", IPP_TAG_INTEGER)) == NULL)
+ {
+ if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "x-dimension", IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (missing x-dimension)");
+ else
+ printf("FAIL (wrong type for x-dimension - %s)\n",
+ ippTagString(attr->value_tag));
+
+ status = 1;
+ }
+ else if (attr->values[0].integer != 21590)
+ {
+ printf("FAIL (wrong value for x-dimension - %d)\n",
+ attr->values[0].integer);
+ status = 1;
+ }
+ else if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "y-dimension",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "y-dimension", IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (missing y-dimension)");
+ else
+ printf("FAIL (wrong type for y-dimension - %s)\n",
+ ippTagString(attr->value_tag));
+
+ status = 1;
+ }
+ else if (attr->values[0].integer != 27940)
+ {
+ printf("FAIL (wrong value for y-dimension - %d)\n",
+ attr->values[0].integer);
+ status = 1;
+ }
else
- printf("FAIL (wrong type for y-dimension - %s)\n",
- ippTagString(attr->value_tag));
-
- status = 1;
+ puts("PASS");
}
- else if (attr->values[0].integer != 27940)
- {
- printf("FAIL (wrong value for y-dimension - %d)\n",
- attr->values[0].integer);
- status = 1;
- }
- else
- puts("PASS");
- }
- fputs("ippFindAttribute(media-size 2): ", stdout);
- if ((media_size = ippFindAttribute(media_col->values[1].collection,
- "media-size",
- IPP_TAG_BEGIN_COLLECTION)) == NULL)
- {
+ fputs("ippFindAttribute(media-size 2): ", stdout);
if ((media_size = ippFindAttribute(media_col->values[1].collection,
- "media-col",
- IPP_TAG_ZERO)) == NULL)
- puts("FAIL (not found)");
- else
- printf("FAIL (wrong type - %s)\n", ippTagString(media_size->value_tag));
-
- status = 1;
- }
- else
- {
- if ((attr = ippFindAttribute(media_size->values[0].collection,
- "x-dimension",
- IPP_TAG_INTEGER)) == NULL)
+ "media-size",
+ IPP_TAG_BEGIN_COLLECTION)) == NULL)
{
- if ((attr = ippFindAttribute(media_size->values[0].collection,
- "x-dimension", IPP_TAG_ZERO)) == NULL)
- puts("FAIL (missing x-dimension)");
+ if ((media_size = ippFindAttribute(media_col->values[1].collection,
+ "media-col",
+ IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (not found)");
else
- printf("FAIL (wrong type for x-dimension - %s)\n",
- ippTagString(attr->value_tag));
+ printf("FAIL (wrong type - %s)\n",
+ ippTagString(media_size->value_tag));
status = 1;
}
- else if (attr->values[0].integer != 21000)
- {
- printf("FAIL (wrong value for x-dimension - %d)\n",
- attr->values[0].integer);
- status = 1;
- }
- else if ((attr = ippFindAttribute(media_size->values[0].collection,
- "y-dimension",
- IPP_TAG_INTEGER)) == NULL)
+ else
{
if ((attr = ippFindAttribute(media_size->values[0].collection,
- "y-dimension", IPP_TAG_ZERO)) == NULL)
- puts("FAIL (missing y-dimension)");
+ "x-dimension",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "x-dimension", IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (missing x-dimension)");
+ else
+ printf("FAIL (wrong type for x-dimension - %s)\n",
+ ippTagString(attr->value_tag));
+
+ status = 1;
+ }
+ else if (attr->values[0].integer != 21000)
+ {
+ printf("FAIL (wrong value for x-dimension - %d)\n",
+ attr->values[0].integer);
+ status = 1;
+ }
+ else if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "y-dimension",
+ IPP_TAG_INTEGER)) == NULL)
+ {
+ if ((attr = ippFindAttribute(media_size->values[0].collection,
+ "y-dimension", IPP_TAG_ZERO)) == NULL)
+ puts("FAIL (missing y-dimension)");
+ else
+ printf("FAIL (wrong type for y-dimension - %s)\n",
+ ippTagString(attr->value_tag));
+
+ status = 1;
+ }
+ else if (attr->values[0].integer != 29700)
+ {
+ printf("FAIL (wrong value for y-dimension - %d)\n",
+ attr->values[0].integer);
+ status = 1;
+ }
else
- printf("FAIL (wrong type for y-dimension - %s)\n",
- ippTagString(attr->value_tag));
-
- status = 1;
+ puts("PASS");
}
- else if (attr->values[0].integer != 29700)
- {
- printf("FAIL (wrong value for y-dimension - %d)\n",
- attr->values[0].integer);
- status = 1;
- }
- else
- puts("PASS");
}
ippDelete(request);
diff --git a/cups/testpwg.c b/cups/testpwg.c
index ef2b7426f..051d734cd 100644
--- a/cups/testpwg.c
+++ b/cups/testpwg.c
@@ -23,7 +23,7 @@
* Include necessary headers...
*/
-#include "pwg-private.h"
+#include "ppd-private.h"
/*
diff --git a/cups/versioning.h b/cups/versioning.h
index 96972ee74..7d506f893 100644
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -1,9 +1,9 @@
/*
* "$Id$"
*
- * API versioning definitions for the Common UNIX Printing System (CUPS).
+ * API versioning definitions for CUPS.
*
- * Copyright 2007-2008 by Apple Inc.
+ * Copyright 2007-2010 by Apple Inc.
*
* These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright
@@ -69,6 +69,10 @@
# define _CUPS_DEPRECATED
# endif /* __GNUC__ && __GNUC__ > 2 */
+# ifndef __GNUC__
+# define __attribute__(x)
+# endif /* !__GNUC__ */
+
#endif /* !_CUPS_VERSIONING_H_ */
/*
diff --git a/doc/Makefile b/doc/Makefile
index be2d65e2b..bab8f31e6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -71,6 +71,8 @@ HELPFILES = \
help/man-cupstestppd.html \
help/man-drv.html \
help/man-filter.html \
+ help/man-ipptool.html \
+ help/man-ipptoolfile.html \
help/man-lp.html \
help/man-lpadmin.html \
help/man-lpc.html \
diff --git a/doc/help/api-cgi.html b/doc/help/api-cgi.html
index 418fb76bc..bdcd5c21f 100644
--- a/doc/help/api-cgi.html
+++ b/doc/help/api-cgi.html
@@ -377,6 +377,7 @@ div.contents ul.subcontents li {
Overview
Functions
- cgiCheckVariables
+- cgiClearVariables
- cgiCompileSearch
- cgiCopyTemplateFile
@@ -386,26 +387,28 @@ div.contents ul.subcontents li {
- cgiEndMultipart
- cgiFormEncode
- cgiFreeSearch
-- cgiGetArray
+- cgiGetArray
- cgiGetAttributes
+- cgiGetCookie
- cgiGetFile
- cgiGetIPPObjects
- cgiGetSize
- cgiGetTemplateDir
-- cgiGetVariable
-- cgiInitialize
+- cgiGetVariable
+- cgiInitialize
- cgiIsPOST
- cgiMoveJobs
- cgiPrintCommand
- cgiPrintTestPage
- cgiRewriteURL
- cgiSetArray
+- cgiSetCookie
- cgiSetIPPObjectVars
- cgiSetIPPVars
- cgiSetServerVersion
- cgiSetSize
-- cgiSetVariable
+- cgiSetVariable
- cgiShowIPPError
- cgiShowJobs
- cgiStartHTML
@@ -463,6 +466,10 @@ int cgiCheckVariables (
1 if all variables present, 0 otherwise
Discussion
Names may be separated by spaces and/or commas.
+
+Clear all form variables.
+
+void cgiClearVariables (void);
Compile a search string.
@@ -557,7 +564,7 @@ void cgiFreeSearch (
- Search context
-Get an element from a form array...
+Get an element from a form array.
const char *cgiGetArray (
const char *name,
@@ -587,6 +594,19 @@ void cgiGetAttributes (
- tmpl
- Base filename
+
+Get a cookie value.
+
+const char *cgiGetCookie (
+ const char *name
+);
+Parameters
+
+- name
+- Name of cookie
+
+Return Value
+Value or NULL
Get the file (if any) that was submitted in the form.
@@ -629,7 +649,7 @@ char *cgiGetTemplateDir (void);
Return Value
Template directory
-Get a CGI variable from the database...
+Get a CGI variable from the database.
const char *cgiGetVariable (
const char *name
@@ -643,9 +663,9 @@ const char *cgiGetVariable (
Value of variable
Discussion
Returns NULL if the variable doesn't exist. If the variable is an
-array of values, returns the last element...
+array of values, returns the last element.
-Initialize the CGI variable "database"...
+Initialize the CGI variable "database".
int cgiInitialize (void);
Return Value
@@ -751,6 +771,32 @@ void cgiSetArray (
Discussion
If the variable array is smaller than (element + 1), the intervening
elements are set to NULL.
+
+Set a cookie value.
+
+void cgiSetCookie (
+ const char *name,
+ const char *value,
+ const char *path,
+ const char *domain,
+ time_t expires,
+ int secure
+);
+Parameters
+
+- name
+- Name
+- value
+- Value
+- path
+- Path (typically "/")
+- domain
+- Domain name
+- expires
+- Expiration date (0 for session)
+- secure
+- Require SSL
+
Set CGI variables from an IPP object.
@@ -814,7 +860,7 @@ void cgiSetSize (
Number of elements (0 to N)
-Set a CGI variable in the database...
+Set a CGI variable in the database.
void cgiSetVariable (
const char *name,
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 816960814..d53d09f0f 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -398,7 +398,7 @@ div.contents ul.subcontents li {
cupsCancelJob
cupsCancelJob2
cupsCreateJob
-cupsEncryption
+cupsEncryption
cupsFinishDocument
cupsFreeDests
cupsFreeJobs
@@ -419,7 +419,7 @@ div.contents ul.subcontents li {
server if it has changed.">cupsGetPPD3
cupsGetPassword
cupsGetPassword2
+password callback.">cupsGetPassword2
cupsGetPrinters
cupsGetServerPPD
cupsLangDefault
@@ -442,14 +442,14 @@ default server.">cupsPrintFiles
specified server.">cupsPrintFiles2
cupsRemoveDest
cupsRemoveOption
-cupsServer
+cupsServer
cupsSetDefaultDest
cupsSetDests
cupsSetDests2
cupsSetEncryption
cupsSetPasswordCB
cupsSetPasswordCB2
-cupsSetServer
+cupsSetServer
cupsSetUser
cupsStartDocument
cupsTempFd
@@ -479,7 +479,7 @@ specified server.">cupsPrintFiles2
CUPS API introduction for the Common UNIX Printing System (CUPS).
- Copyright 2007-2008 by Apple Inc.
+ Copyright 2007-2010 by Apple Inc.
Copyright 1997-2006 by Easy Software Products, all rights reserved.
These coded instructions, statements, and computer programs are the
@@ -558,12 +558,13 @@ instance will return the default instance for that destination.
"printer-is-accepting-jobs" |
- "1" if the destination is accepting new jobs, "0" if not. |
+ "true" if the destination is accepting new jobs, "false" if
+ not. |
"printer-is-shared" |
- "1" if the destination is being shared with other computers, "0" if
- not. |
+ "true" if the destination is being shared with other computers,
+ "false" if not. |
"printer-location" |
@@ -1157,7 +1158,7 @@ instead.
-Get the default encryption settings.
+Get the current encryption settings.
http_encryption_t cupsEncryption (void);
Return Value
@@ -1166,7 +1167,12 @@ http_encryption_t cupsEncryption (void);
The default encryption setting comes from the CUPS_ENCRYPTION
environment variable, then the ~/.cups/client.conf file, and finally the
/etc/cups/client.conf file. If not set, the default is
-HTTP_ENCRYPT_IF_REQUESTED
.
+HTTP_ENCRYPT_IF_REQUESTED
.
+
+Note: The current encryption setting is tracked separately for each thread
+in a program. Multi-threaded programs that override the setting via the
+cupsSetEncryption
function need to do so in each thread for the same
+setting to be used.
Finish sending a document.
@@ -1577,10 +1583,15 @@ const char *cupsGetPassword (
Password
Discussion
Uses the current password callback function. Returns NULL
if the
-user does not provide a password.
+user does not provide a password.
+
+Note: The current password callback function is tracked separately for each
+thread in a program. Multi-threaded programs that override the setting via
+the cupsSetPasswordCB
or cupsSetPasswordCB2
functions need to
+do so in each thread for the same function to be used.
Get a password from the user using the advanced
-callback.
+password callback.
const char *cupsGetPassword2 (
const char *prompt,
@@ -1603,7 +1614,12 @@ const char *cupsGetPassword2 (
Password
Discussion
Uses the current password callback function. Returns NULL
if the
-user does not provide a password.
+user does not provide a password.
+
+Note: The current password callback function is tracked separately for each
+thread in a program. Multi-threaded programs that override the setting via
+the cupsSetPasswordCB
or cupsSetPasswordCB2
functions need to
+do so in each thread for the same function to be used.
@@ -1941,14 +1957,24 @@ int cupsRemoveOption (
Return Value
New number of options
-Return the hostname/address of the default server.
+Return the hostname/address of the current server.
const char *cupsServer (void);
Return Value
Server name
Discussion
-The returned value can be a fully-qualified hostname, a numeric
-IPv4 or IPv6 address, or a domain socket pathname.
+The default server comes from the CUPS_SERVER environment variable, then the
+~/.cups/client.conf file, and finally the /etc/cups/client.conf file. If not
+set, the default is the local system - either "localhost" or a domain socket
+path.
+
+The returned value can be a fully-qualified hostname, a numeric IPv4 or IPv6
+address, or a domain socket pathname.
+
+Note: The current server is tracked separately for each thread in a program.
+Multi-threaded programs that override the server via the
+cupsSetServer
function need to do so in each thread for the same
+server to be used.
Set the default destination.
@@ -2021,6 +2047,15 @@ void cupsSetEncryption (
e
New encryption preference
+Discussion
+The default encryption setting comes from the CUPS_ENCRYPTION
+environment variable, then the ~/.cups/client.conf file, and finally the
+/etc/cups/client.conf file. If not set, the default is
+HTTP_ENCRYPT_IF_REQUESTED
.
+
+Note: The current encryption setting is tracked separately for each thread
+in a program. Multi-threaded programs that override the setting need to do
+so in each thread for the same setting to be used.
Set the password callback for CUPS.
@@ -2033,7 +2068,14 @@ void cupsSetPasswordCB (
Callback function
Discussion
-Pass NULL
to restore the default (console) password callback.
+Pass NULL
to restore the default (console) password callback, which
+reads the password from the console. Programs should call either this
+function or cupsSetPasswordCB2
, as only one callback can be registered
+by a program per thread.
+
+Note: The current password callback is tracked separately for each thread
+in a program. Multi-threaded programs that override the callback need to do
+so in each thread for the same callback to be used.
Set the advanced password callback for CUPS.
@@ -2049,11 +2091,18 @@ void cupsSetPasswordCB2 (
User data pointer
Discussion
-Pass NULL
to restore the default (console) password callback.
+
Pass NULL
to restore the default (console) password callback, which
+reads the password from the console. Programs should call either this
+function or cupsSetPasswordCB2
, as only one callback can be registered
+by a program per thread.
+
+Note: The current password callback is tracked separately for each thread
+in a program. Multi-threaded programs that override the callback need to do
+so in each thread for the same callback to be used.
-Set the default server name.
+Set the default server name and port.
void cupsSetServer (
const char *server
@@ -2065,8 +2114,14 @@ void cupsSetServer (
Discussion
The "server" string can be a fully-qualified hostname, a numeric
-IPv4 or IPv6 address, or a domain socket pathname. Pass NULL
to
-restore the default server name.
+IPv4 or IPv6 address, or a domain socket pathname. Hostnames and numeric IP
+addresses can be optionally followed by a colon and port number to override
+the default port 631, e.g. "hostname:8631". Pass NULL
to restore the
+default server name and port.
+
+Note: The current server is tracked separately for each thread in a program.
+Multi-threaded programs that override the server need to do so in each
+thread for the same server to be used.
Set the default user name.
@@ -2079,7 +2134,11 @@ void cupsSetUser (
User name
Discussion
-Pass NULL
to restore the default user name.
+Pass NULL
to restore the default user name.
+
+Note: The current user name is tracked separately for each thread in a
+program. Multi-threaded programs that override the user name need to do so
+in each thread for the same user name to be used.
Add a document to a job created with cupsCreateJob().
@@ -2186,6 +2245,11 @@ The temporary file is opened for writing.
const char *cupsUser (void);
Return Value
User name
+Discussion
+Note: The current user name is tracked separately for each thread in a
+program. Multi-threaded programs that override the user name with the
+cupsSetUser
function need to do so in each thread for the same user
+name to be used.
Destination
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index 0fad731af..6753a8d92 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -537,19 +537,19 @@ are server-oriented...">http_state_t
http_uri_status_t
http_version_t
ipp_attribute_t
- ipp_finish_t
+ ipp_finish_t
ipp_iocb_t
- ipp_jstate_t
- ipp_op_t
- ipp_orient_t
- ipp_pstate_t
- ipp_quality_t
+ ipp_jstate_t
+ ipp_op_t
+ ipp_orient_t
+ ipp_pstate_t
+ ipp_quality_t
ipp_request_t
- ipp_res_t
- ipp_state_t
+ ipp_res_t
+ ipp_state_t
ipp_t
- ipp_uchar_t
- ipp_tag_t
+ ipp_uchar_t
+ ipp_tag_t
ipp_value_t
Structures
@@ -576,16 +576,16 @@ are server-oriented...">http_state_e
http_uri_coding_e
http_uri_status_e
http_version_e
- ipp_finish_e
- ipp_jstate_e
- ipp_op_e
- ipp_orient_e
- ipp_pstate_e
- ipp_quality_e
- ipp_res_e
- ipp_state_e
- ipp_status_e
- ipp_tag_e
+ ipp_finish_e
+ ipp_jstate_e
+ ipp_op_e
+ ipp_orient_e
+ ipp_pstate_e
+ ipp_quality_e
+ ipp_res_e
+ ipp_state_e
+ ipp_status_e
+ ipp_tag_e