From bc44d92092094935265183305a38196ce2822756 Mon Sep 17 00:00:00 2001
From: jlovell
Date: Mon, 16 Jul 2007 23:34:09 +0000
Subject: [PATCH] Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@342 a1ca3aef-8c08-0410-bb20-df032aa958be
---
CHANGES-1.2.txt | 19 +
CHANGES.txt | 46 +-
CREDITS.txt | 2 +-
INSTALL.txt | 4 +-
LICENSE.txt | 63 +-
Makedefs.in | 23 +-
Makefile | 23 +-
README.txt | 65 +-
backend/Dependencies | 91 +-
backend/Makefile | 23 +-
backend/backend-private.h | 21 +-
backend/betest.c | 21 +-
backend/ieee1284.c | 21 +-
backend/ieee1394-linux.c | 5 +-
backend/ieee1394.c | 5 +-
backend/ieee1394.h | 5 +-
backend/ipp.c | 21 +-
backend/lpd.c | 25 +-
backend/parallel.c | 21 +-
backend/runloop.c | 21 +-
backend/scsi-irix.c | 5 +-
backend/scsi-linux.c | 5 +-
backend/scsi.c | 5 +-
backend/serial.c | 21 +-
backend/snmp.c | 31 +-
backend/socket.c | 21 +-
backend/test1284.c | 21 +-
backend/usb-darwin.c | 195 +-
backend/usb-unix.c | 21 +-
backend/usb.c | 21 +-
berkeley/Dependencies | 27 +-
berkeley/Makefile | 23 +-
berkeley/lpc.c | 23 +-
berkeley/lpq.c | 23 +-
berkeley/lpr.c | 23 +-
berkeley/lprm.c | 23 +-
cgi-bin/Dependencies | 112 +-
cgi-bin/Makefile | 23 +-
cgi-bin/admin.c | 23 +-
cgi-bin/cgi-private.h | 23 +-
cgi-bin/cgi.h | 23 +-
cgi-bin/classes.c | 23 +-
cgi-bin/help-index.c | 23 +-
cgi-bin/help-index.h | 23 +-
cgi-bin/help.c | 19 +-
cgi-bin/html.c | 23 +-
cgi-bin/ipp-var.c | 23 +-
cgi-bin/jobs.c | 23 +-
cgi-bin/printers.c | 23 +-
cgi-bin/search.c | 23 +-
cgi-bin/template.c | 23 +-
cgi-bin/testcgi.c | 23 +-
cgi-bin/testhi.c | 23 +-
cgi-bin/testtemplate.c | 23 +-
cgi-bin/var.c | 23 +-
conf/Makefile | 25 +-
conf/cupsd.conf.in | 8 +-
conf/mime.convs.in | 23 +-
conf/mime.types | 27 +-
conf/snmp.conf.in | 13 +
config-scripts/cups-3264.m4 | 19 +-
config-scripts/cups-common.m4 | 34 +-
config-scripts/cups-compiler.m4 | 23 +-
config-scripts/cups-defaults.m4 | 102 +-
config-scripts/cups-directories.m4 | 23 +-
config-scripts/cups-dnssd.m4 | 7 +-
config-scripts/cups-gssapi.m4 | 23 +-
config-scripts/cups-image.m4 | 23 +-
config-scripts/cups-largefile.m4 | 23 +-
config-scripts/cups-launchd.m4 | 23 +-
config-scripts/cups-ldap.m4 | 23 +-
config-scripts/cups-libtool.m4 | 23 +-
config-scripts/cups-manpages.m4 | 23 +-
config-scripts/cups-network.m4 | 23 +-
config-scripts/cups-opsys.m4 | 23 +-
config-scripts/cups-pam.m4 | 23 +-
config-scripts/cups-pap.m4 | 19 +-
config-scripts/cups-pdf.m4 | 23 +-
config-scripts/cups-poll.m4 | 19 +-
config-scripts/cups-scripting.m4 | 23 +-
config-scripts/cups-sharedlibs.m4 | 23 +-
config-scripts/cups-slp.m4 | 23 +-
config-scripts/cups-ssl.m4 | 23 +-
config-scripts/cups-threads.m4 | 23 +-
config.h.in | 30 +-
configure.in | 27 +-
cups-config.in | 23 +-
cups/Dependencies | 621 ++-
cups/Makefile | 23 +-
cups/adminutil.c | 28 +-
cups/adminutil.h | 23 +-
cups/api-array.shtml | 23 +-
cups/api-cups.shtml | 23 +-
cups/api-filedir.shtml | 23 +-
cups/api-filter.shtml | 23 +-
cups/api-httpipp.shtml | 23 +-
cups/api-ppd.shtml | 23 +-
cups/array.c | 23 +-
cups/array.h | 23 +-
cups/attr.c | 23 +-
cups/auth.c | 138 +-
cups/backchannel.c | 23 +-
cups/backend.c | 23 +-
cups/backend.h | 23 +-
cups/cups.h | 25 +-
cups/custom.c | 23 +-
cups/debug.h | 23 +-
cups/dest.c | 23 +-
cups/dir.c | 19 +-
cups/dir.h | 19 +-
cups/emit.c | 23 +-
cups/encode.c | 23 +-
cups/file.c | 23 +-
cups/file.h | 23 +-
cups/getifaddrs.c | 21 +-
cups/getputfile.c | 23 +-
cups/globals.c | 23 +-
cups/globals.h | 23 +-
cups/http-addr.c | 23 +-
cups/http-addrlist.c | 23 +-
cups/http-private.h | 23 +-
cups/http-support.c | 23 +-
cups/http.c | 26 +-
cups/http.h | 26 +-
cups/i18n.h | 23 +-
cups/ipp-private.h | 23 +-
cups/ipp-support.c | 23 +-
cups/ipp.c | 23 +-
cups/ipp.h | 23 +-
cups/langprintf.c | 23 +-
cups/language.c | 23 +-
cups/language.h | 23 +-
cups/libcups.exp | 1 +
cups/localize.c | 395 +-
cups/mark.c | 23 +-
cups/md5-apple.h | 23 +-
cups/md5passwd.c | 23 +-
cups/notify.c | 23 +-
cups/options.c | 23 +-
cups/page.c | 23 +-
cups/ppd.c | 29 +-
cups/ppd.h | 31 +-
cups/request.c | 23 +-
cups/sidechannel.c | 23 +-
cups/sidechannel.h | 23 +-
cups/snprintf.c | 23 +-
cups/string.c | 23 +-
cups/string.h | 23 +-
cups/tempfile.c | 23 +-
cups/test.ppd | 60 +-
cups/testadmin.c | 23 +-
cups/testarray.c | 23 +-
cups/testcups.c | 19 +-
cups/testfile.c | 23 +-
cups/testhttp.c | 23 +-
cups/testi18n.c | 25 +-
cups/testipp.c | 23 +-
cups/testlang.c | 23 +-
cups/testppd.c | 82 +-
cups/transcode.c | 25 +-
cups/transcode.h | 25 +-
cups/usersys.c | 23 +-
cups/util.c | 23 +-
data/HPGLprolog | 22 +-
data/Makefile | 23 +-
data/classified | 166 +-
data/confidential | 166 +-
data/secret | 166 +-
data/standard | 180 +-
data/testprint.ps | 73 +-
data/topsecret | 166 +-
data/unclassified | 166 +-
desktop/cups.desktop | 3 +
doc/Makefile | 21 +-
doc/de/index.html.in | 19 +-
doc/es/index.html.in | 20 +-
doc/et/index.html.in | 20 +-
doc/fr/index.html.in | 19 +-
doc/he/index.html.in | 20 +-
doc/help/api-array.html | 278 +-
doc/help/api-cups.html | 914 +--
doc/help/api-filedir.html | 364 +-
doc/help/api-filter.html | 94 +-
doc/help/api-httpipp.html | 2337 +++++---
doc/help/api-ppd.html | 1420 ++---
doc/help/api-raster.html | 817 +--
doc/help/license.html | 56 +-
doc/help/spec-cmp.html | 60 +-
doc/help/spec-ipp.html | 9 +
doc/help/spec-ppd.html | 173 +-
doc/help/whatsnew.html | 107 +-
doc/index.html.in | 21 +-
doc/it/index.html.in | 20 +-
doc/ja/index.html.in | 21 +-
doc/pl/index.html.in | 21 +-
doc/printing-overview.shtml | 125 -
doc/sv/index.html.in | 21 +-
doc/system-overview.shtml | 19 -
doc/zh_TW/index.html.in | 20 +-
driver/testdriver.c | 23 +-
filter/Dependencies | 852 +--
filter/Makefile | 23 +-
filter/api-raster.shtml | 21 +-
filter/common.c | 23 +-
filter/common.h | 23 +-
filter/error.c | 23 +-
filter/form-main.c | 23 +-
filter/form-ps.c | 23 +-
filter/form-tree.c | 23 +-
filter/form.h | 23 +-
filter/gziptoany.c | 23 +-
filter/hpgl-attr.c | 23 +-
filter/hpgl-char.c | 23 +-
filter/hpgl-config.c | 23 +-
filter/hpgl-input.c | 31 +-
filter/hpgl-main.c | 23 +-
filter/hpgl-polygon.c | 23 +-
filter/hpgl-prolog.c | 23 +-
filter/hpgl-vector.c | 23 +-
filter/hpgltops.h | 23 +-
filter/image-bmp.c | 23 +-
filter/image-colorspace.c | 23 +-
filter/image-gif.c | 23 +-
filter/image-jpeg.c | 23 +-
filter/image-photocd.c | 23 +-
filter/image-pix.c | 23 +-
filter/image-png.c | 23 +-
filter/image-pnm.c | 23 +-
filter/image-private.h | 23 +-
filter/image-sgi.c | 23 +-
filter/image-sgi.h | 23 +-
filter/image-sgilib.c | 23 +-
filter/image-sun.c | 23 +-
filter/image-tiff.c | 23 +-
filter/image-zoom.c | 23 +-
filter/image.c | 23 +-
filter/image.h | 23 +-
filter/imagetops.c | 23 +-
filter/imagetoraster.c | 23 +-
filter/interpret.c | 23 +-
filter/pstops.c | 23 +-
filter/raster.c | 23 +-
filter/raster.h | 23 +-
filter/rasterbench.c | 30 +-
filter/rastertoepson.c | 23 +-
filter/rastertohp.c | 23 +-
filter/rastertolabel.c | 23 +-
filter/testimage.c | 19 +-
filter/testraster.c | 30 +-
filter/textcommon.c | 23 +-
filter/textcommon.h | 23 +-
filter/texttops.c | 23 +-
fonts/Makefile | 23 +-
init/cups.sh.in | 23 +-
locale/Dependencies | 7 +
locale/Makefile | 69 +-
locale/cups.header | 19 +-
locale/cups.pot | 1773 +++---
locale/cups_da.po | 2849 ++++++++++
locale/cups_de.po | 316 +-
locale/cups_es.po | 318 +-
locale/cups_et.po | 300 +-
locale/cups_fi.po | 2849 ++++++++++
locale/cups_fr.po | 306 +-
locale/cups_he.po | 4752 +++++++++-------
locale/cups_it.po | 314 +-
locale/cups_ja.po | 306 +-
locale/cups_ko.po | 2849 ++++++++++
locale/cups_no.po | 2849 ++++++++++
locale/cups_pl.po | 322 +-
locale/cups_pt.po | 2849 ++++++++++
locale/cups_ru.po | 2849 ++++++++++
locale/cups_sv.po | 306 +-
locale/cups_zh.po | 2849 ++++++++++
locale/cups_zh_TW.po | 4894 ++++++++++-------
locale/po2strings.c | 144 +
locale/strings2po.c | 175 +
locale/translate.c | 23 +-
man/Makefile | 25 +-
man/accept.man | 27 +-
man/backend.man | 27 +-
man/cancel.man | 23 +-
man/classes.conf.man | 27 +-
man/client.conf.man.in | 27 +-
man/cups-config.man | 27 +-
man/cups-deviced.man.in | 27 +-
man/cups-driverd.man.in | 27 +-
man/cups-lpd.man.in | 27 +-
man/cups-polld.man | 27 +-
man/cups-snmp.conf.man | 23 +-
man/cupsaddsmb.man.in | 27 +-
man/cupsctl.man | 105 +
man/cupsd.conf.man.in | 27 +-
man/cupsd.man.in | 27 +-
man/cupsenable.man | 27 +-
man/cupsfilter.man | 70 +
man/cupstestdsc.man | 23 +-
man/cupstestppd.man | 27 +-
man/filter.man | 31 +-
man/lp.man | 27 +-
man/lpadmin.man | 27 +-
man/lpc.man | 27 +-
man/lpinfo.man | 27 +-
man/lpmove.man | 27 +-
man/lpoptions.man.in | 27 +-
man/lppasswd.man | 27 +-
man/lpq.man | 27 +-
man/lpr.man | 27 +-
man/lprm.man | 27 +-
man/lpstat.man | 27 +-
man/mailto.conf.man | 23 +-
man/mantohtml.c | 23 +-
man/mime.convs.man | 27 +-
man/mime.types.man | 27 +-
man/printers.conf.man | 27 +-
man/subscriptions.conf.man | 23 +-
monitor/Dependencies | 15 +-
monitor/Makefile | 23 +-
monitor/bcp.c | 23 +-
monitor/tbcp.c | 23 +-
notifier/Dependencies | 18 +-
notifier/Makefile | 23 +-
notifier/mailto.c | 23 +-
notifier/rss.c | 23 +-
notifier/testnotify.c | 23 +-
packaging/InstallationCheck | 11 +
packaging/LICENSE.rtf | 333 +-
packaging/WELCOME.rtf | 20 +-
packaging/cups-info.plist.in | 2 +
packaging/cups.list.in | 52 +-
packaging/cups.readme | 290 -
packaging/cups.spec.in | 33 +-
packaging/installer.tif | Bin 6226 -> 98758 bytes
pdftops/Dependencies | 214 +-
pdftops/Makefile | 8 +-
pdftops/pdftops.cxx | 23 +-
ppd/Makefile | 33 +-
ppd/deskjet.ppd | 807 ++-
ppd/deskjet2.ppd | 218 -
ppd/dymo.ppd | 560 +-
ppd/epson24.ppd | 422 +-
ppd/epson9.ppd | 392 +-
ppd/intelbar.ppd | 1327 ++++-
ppd/laserjet.ppd | 832 ++-
ppd/okidat24.ppd | 416 +-
ppd/okidata9.ppd | 386 +-
ppd/sample.drv | 1000 ++--
ppd/stcolor.ppd | 482 +-
ppd/stcolor2.ppd | 482 +-
ppd/stphoto.ppd | 482 +-
ppd/stphoto2.ppd | 482 +-
ppd/zebra.ppd | 3369 +++++++++++-
ppd/zebracpl.ppd | 1781 +++++-
ppd/zebraep1.ppd | 1658 +++++-
ppd/zebraep2.ppd | 1767 +++++-
scheduler/Dependencies | 434 +-
scheduler/Makefile | 42 +-
scheduler/auth.c | 93 +-
scheduler/auth.h | 23 +-
scheduler/banners.c | 23 +-
scheduler/banners.h | 23 +-
scheduler/cert.c | 23 +-
scheduler/cert.h | 23 +-
scheduler/classes.c | 23 +-
scheduler/classes.h | 23 +-
scheduler/client.c | 46 +-
scheduler/client.h | 23 +-
scheduler/conf.c | 40 +-
scheduler/conf.h | 23 +-
scheduler/cups-deviced.c | 23 +-
scheduler/cups-driverd.c | 26 +-
scheduler/cups-lpd.c | 167 +-
scheduler/cups-polld.c | 23 +-
scheduler/cups.pam | 2 -
scheduler/cupsd.h | 21 +-
scheduler/cupsfilter.c | 801 +++
scheduler/dirsvc.c | 52 +-
scheduler/dirsvc.h | 27 +-
scheduler/env.c | 23 +-
scheduler/filter.c | 23 +-
scheduler/ipp.c | 166 +-
scheduler/job.c | 136 +-
scheduler/job.h | 29 +-
scheduler/listen.c | 23 +-
scheduler/log.c | 23 +-
scheduler/main.c | 22 +-
scheduler/mime.c | 23 +-
scheduler/mime.h | 23 +-
scheduler/network.c | 21 +-
scheduler/network.h | 21 +-
scheduler/policy.c | 23 +-
scheduler/policy.h | 23 +-
scheduler/printers.c | 91 +-
scheduler/printers.h | 23 +-
scheduler/process.c | 23 +-
scheduler/quotas.c | 23 +-
scheduler/select.c | 23 +-
scheduler/server.c | 23 +-
scheduler/statbuf.c | 23 +-
scheduler/statbuf.h | 23 +-
scheduler/subscriptions.c | 23 +-
scheduler/subscriptions.h | 23 +-
scheduler/sysman.c | 23 +-
scheduler/sysman.h | 23 +-
scheduler/testdirsvc.c | 23 +-
scheduler/testlpd.c | 23 +-
scheduler/testmime.c | 23 +-
scheduler/testspeed.c | 23 +-
scheduler/testsub.c | 23 +-
scheduler/type.c | 23 +-
scheduler/util.c | 23 +-
scheduler/util.h | 23 +-
scripting/java/src/com/easysw/cups/Cups.java | 21 +-
.../java/src/com/easysw/cups/CupsJob.java | 21 +-
.../java/src/com/easysw/cups/CupsPrinter.java | 21 +-
scripting/java/src/com/easysw/cups/IPP.java | 21 +-
.../src/com/easysw/cups/IPPAttribute.java | 21 +-
.../java/src/com/easysw/cups/IPPCalendar.java | 21 +-
.../java/src/com/easysw/cups/IPPDefs.java | 21 +-
.../java/src/com/easysw/cups/IPPError.java | 21 +-
.../java/src/com/easysw/cups/IPPHttp.java | 21 +-
.../java/src/com/easysw/cups/IPPMD5.java | 21 +-
.../java/src/com/easysw/cups/IPPRequest.java | 21 +-
.../java/src/com/easysw/cups/IPPStatus.java | 21 +-
.../src/com/easysw/cups/IPPURLConnection.java | 21 +-
.../java/src/com/easysw/cups/IPPValue.java | 21 +-
scripting/java/src/com/easysw/cups/cups.nfo | 21 +-
scripting/php/Dependencies | 7 +-
scripting/php/Makefile | 19 +-
scripting/php/phpcups.c | 71 +-
scripting/php/phpcups.h | 23 +-
scripting/php/phpcups.php | 19 +-
standards/Makefile | 23 +-
standards/rfctohtml.c | 23 +-
systemv/Dependencies | 94 +-
systemv/Makefile | 41 +-
systemv/accept.c | 23 +-
systemv/cancel.c | 23 +-
systemv/cupsaddsmb.c | 26 +-
systemv/cupsctl.c | 219 +
systemv/cupstestdsc.c | 23 +-
systemv/cupstestppd.c | 27 +-
systemv/lp.c | 23 +-
systemv/lpadmin.c | 23 +-
systemv/lpinfo.c | 23 +-
systemv/lpmove.c | 23 +-
systemv/lpoptions.c | 23 +-
systemv/lppasswd.c | 23 +-
systemv/lpstat.c | 23 +-
templates/Makefile | 23 +-
templates/de/edit-config.tmpl.in | 4 +-
templates/de/help-header.tmpl | 2 +-
templates/edit-config.tmpl.in | 4 +-
templates/es/edit-config.tmpl.in | 4 +-
templates/es/help-header.tmpl | 2 +-
templates/et/edit-config.tmpl.in | 4 +-
templates/et/help-header.tmpl | 2 +-
templates/fr/edit-config.tmpl.in | 4 +-
templates/fr/help-header.tmpl | 2 +-
templates/he/edit-config.tmpl.in | 4 +-
templates/he/help-header.tmpl | 2 +-
templates/help-header.tmpl | 2 +-
templates/it/edit-config.tmpl.in | 4 +-
templates/it/help-header.tmpl | 2 +-
templates/ja/edit-config.tmpl.in | 4 +-
templates/pl/edit-config.tmpl.in | 4 +-
templates/pl/help-header.tmpl | 2 +-
templates/sv/edit-config.tmpl.in | 4 +-
templates/sv/help-header.tmpl | 2 +-
templates/trailer.tmpl | 5 +-
templates/zh_TW/edit-config.tmpl.in | 4 +-
templates/zh_TW/help-header.tmpl | 2 +-
test/4.4-subscription-ops.test | 8 +-
test/5.1-lpadmin.sh | 23 +-
test/5.2-lpc.sh | 23 +-
test/5.3-lpq.sh | 23 +-
test/5.4-lpstat.sh | 23 +-
test/5.5-lp.sh | 25 +-
test/5.6-lpr.sh | 23 +-
test/5.7-lprm.sh | 23 +-
test/5.8-cancel.sh | 23 +-
test/5.9-lpinfo.sh | 23 +-
test/Dependencies | 9 +-
test/Makefile | 23 +-
test/ipptest.c | 23 +-
test/run-stp-tests.sh | 42 +-
test/str-header.html | 4 +-
test/testfile.pdf | Bin 36613 -> 80513 bytes
test/testfile.ps | 250 +-
test/testhp.ppd | 23 +-
test/testps.ppd | 23 +-
tools/makebuttons | 19 +-
tools/testosx | 35 +-
vcnet/config.h | 23 +-
494 files changed, 53193 insertions(+), 20834 deletions(-)
create mode 100644 conf/snmp.conf.in
delete mode 100644 doc/printing-overview.shtml
delete mode 100644 doc/system-overview.shtml
create mode 100644 locale/Dependencies
create mode 100644 locale/cups_da.po
create mode 100644 locale/cups_fi.po
create mode 100644 locale/cups_ko.po
create mode 100644 locale/cups_no.po
create mode 100644 locale/cups_pt.po
create mode 100644 locale/cups_ru.po
create mode 100644 locale/cups_zh.po
create mode 100644 locale/po2strings.c
create mode 100644 locale/strings2po.c
create mode 100644 man/cupsctl.man
create mode 100644 man/cupsfilter.man
create mode 100755 packaging/InstallationCheck
delete mode 100644 packaging/cups.readme
delete mode 100644 ppd/deskjet2.ppd
delete mode 100644 scheduler/cups.pam
create mode 100644 scheduler/cupsfilter.c
create mode 100644 systemv/cupsctl.c
diff --git a/CHANGES-1.2.txt b/CHANGES-1.2.txt
index 0ae2d9ba1..7b0b1f2de 100644
--- a/CHANGES-1.2.txt
+++ b/CHANGES-1.2.txt
@@ -3,6 +3,25 @@ CHANGES-1.2.txt
CHANGES IN CUPS V1.2.12
+ - The PHP cups_print_file() function crashed if the options
+ array contained non-string option values (STR #2430)
+ - The image/tiff file matching rule incorrectly identified
+ some text files as TIFF files (STR #2431)
+ - The filter(7) man page incorrectly documented the
+ "PAGE: total #-pages" message (STR #2427)
+ - PCL text files were mis-identified as HP-GL/2 and
+ caused the HP-GL/2 filter to hang (STR #2423)
+ - When printing to a queue with user ACLs, the scheduler
+ incorrectly returned a quota error instead of a "not
+ allowed to print" error (STR #2409)
+ - cupsaddsmb could get in a loop if no printer drivers
+ were installed (STR #2407)
+ - cupsRasterReadHeader() did not byte-swap the header
+ properly when compiled with certain versions of GCC.
+ - The IPP backend did not send the document-format
+ attribute for filtered jobs (STR #2411)
+ - Some PPD files could cause a crash in ppdOpen2 (STR
+ #2408)
- The web admin interface incorrectly handled the "share
printers" and "show remote printers" settings (STR
#2393)
diff --git a/CHANGES.txt b/CHANGES.txt
index e73cbd134..a66fe2dc5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,48 @@
-CHANGES.txt - 2007-06-21
+CHANGES.txt - 2007-07-16
------------------------
-CHANGES IN CUPS V1.3
+CHANGES IN CUPS V1.3??
- - Documentation updates (STR #1775, STR #2130, STR #2131,
- STR #2263, STR #2356, STR #2397)
+ - The USB backend could deadlock on Mac OS X while performing
+ a side-channel command.
+ - The scheduler did not prevent remote queues from being
+ shared/published.
+ - The scheduler did not remove the temporary request file on
+ authentication errors.
+ - ppdLocalizeIPPReason() did not handle "scheme:" schemes or
+ "file" URLs.
+ - ppdLocalizeIPPReason() was not exported on Mac OS X.
+
+
+CHANGES IN CUPS V1.3b1
+
+ - Copyright updates - CUPS is now owned by Apple Inc.
+ - Documentation updates (STR #1775, STR #2027, STR #2130,
+ STR #2131, STR #2263, STR #2356, STR #2397)
+ - Added new cupsfilter utility (STR #1734)
+ - Added new job-printer-state-message and
+ job-printer-state-reasons attributes to jobs (STR #2418)
+ - Added LDAP+SSL support (STR #1967)
+ - CUPS now supports authentication via peer credentials
+ over domain sockets (STR #2242, STR #2277)
+ - The CUPS sample driver PPDs are now generated by the PPD
+ compiler and include all of the localized languages by
+ default (STR #2164)
+ - You can now specify "AuthType Default" in the cupsd.conf
+ file to use the default authentication defined by the
+ DefaultAuthType directive.
+ - The SNMP backend no longer adds a default Address line
+ when none is specified in the snmp.conf file; this allows
+ the backend to be easily disabled as needed (STR #2434)
+ - Added a new cupsctl command for doing basic changes to
+ the cupsd.conf file (STR #1777)
+ - Added a new ppdLocalizeIPPReason() function to get the
+ localized text/URI for a given IPP reason keyword for a
+ driver.
+ - Removed the deskjet2.ppd driver, as it only worked with
+ a very small subset of HP DeskJet printers and was
+ confusing to users. The rastertohp driver still
+ supports the deskjet2.ppd options for existing queues.
- The scheduler did not add a trailing banner page if a
client did not specify the last document in a job (STR
#1711)
diff --git a/CREDITS.txt b/CREDITS.txt
index 99d92f29a..9cbf832ed 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -42,4 +42,4 @@ like to thank the following individuals for their contributions:
Yugami - LDAP browsing support.
If I've missed someone, please let me know by sending an email to
-"mike@easysw.com".
+"msweet@apple.com".
diff --git a/INSTALL.txt b/INSTALL.txt
index 329409b37..73e4c35ea 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.2rc1 - 2006-03-24
------------------------------------
+INSTALL - CUPS v1.3b1 - 2007-07-12
+----------------------------------
This file describes how to compile and install CUPS from source
code. For more information on CUPS see the file called
diff --git a/LICENSE.txt b/LICENSE.txt
index aee2abed0..bff03673d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,12 +1,10 @@
Common UNIX Printing System License Agreement
- Copyright 1997-2007 by Easy Software Products
- 44141 AIRPORT VIEW DR STE 204
- HOLLYWOOD, MARYLAND 20636 USA
+ Copyright 2007 by Apple Inc.
+ 1 Infinite Loop
+ Cupertino, CA 95014 USA
- Voice: +1.301.373.9600
- Email: cups-info@cups.org
- WWW: http://www.cups.org
+ WWW: http://www.cups.org/
INTRODUCTION
@@ -49,8 +47,8 @@ application, driver, or filter.
LICENSE EXCEPTIONS
-In addition, as the copyright holder of CUPS, Easy Software
-Products grants the following special exceptions:
+In addition, as the copyright holder of CUPS, Apple Inc. grants
+the following special exceptions:
1. Apple Operating System Development License Exception;
@@ -93,9 +91,9 @@ Products grants the following special exceptions:
2. OpenSSL Toolkit License Exception;
- a. Easy Software Products explicitly allows the
- compilation and distribution of the CUPS software
- with the OpenSSL Toolkit.
+ a. Apple Inc. explicitly allows the compilation and
+ distribution of the CUPS software with the OpenSSL
+ Toolkit.
No developer is required to provide these exceptions in a
derived work.
@@ -105,8 +103,8 @@ KERBEROS SUPPORT CODE
The Kerberos support code ("KSC") is copyright 2006 by Jelmer
Vernooij and is provided 'as-is', without any express or implied
-warranty. In no event will the author or Easy Software Products
-be held liable for any damages arising from the use of the KSC.
+warranty. In no event will the author or Apple Inc. be held
+liable for any damages arising from the use of the KSC.
Sources files containing KSC have the following text at the top
of each source file:
@@ -139,39 +137,12 @@ redistribute it freely, subject to the following restrictions:
TRADEMARKS
-Easy Software Products has trademarked the Common UNIX Printing
-System, CUPS, and CUPS logo. You may use these names and logos
-in any direct port or binary distribution of CUPS. Please
-contact Easy Software Products for written permission to use
-them in derivative products. Our intention is to protect the
-value of these trademarks and ensure that any derivative product
-meets the same high-quality standards as the original.
-
-
-BINARY DISTRIBUTION RIGHTS
-
-Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable
-to release source code for their additions and modifications to
-CUPS under the GNU GPL and LGPL. For information please contact
-us at the address shown above.
-
-The Common UNIX Printing System provides a "pdftops" filter that
-is based on the Xpdf software. For binary distribution licensing
-of this software, please contact:
-
- Derek B. Noonburg
- Email: derekn@glyphandcog.com
- WWW: http://www.glyphandcog.com/
-
-
-SUPPORT
-
-Easy Software Products sells software support for CUPS as well
-as a commercial printing product based on CUPS called ESP Print
-Pro. You can find out more at our web site:
-
- http://www.easysw.com/
+Apple Inc. has trademarked the Common UNIX Printing System, CUPS,
+and CUPS logo. You may use these names and logos in any direct port
+or binary distribution of CUPS. Please contact Apple Inc. for written
+permission to use them in derivative products. Our intention is to
+protect the value of these trademarks and ensure that any derivative
+product meets the same high-quality standards as the original.
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff --git a/Makedefs.in b/Makedefs.in
index 2474705d8..01480314c 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,25 +1,16 @@
#
-# "$Id: Makedefs.in 6564 2007-06-18 23:40:38Z mike $"
+# "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
#
# Common makefile definitions for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
#
@@ -280,5 +271,5 @@ DBUSDIR = @DBUSDIR@
#
-# End of "$Id: Makedefs.in 6564 2007-06-18 23:40:38Z mike $"
+# End of "$Id: Makedefs.in 6649 2007-07-11 21:46:42Z mike $"
#
diff --git a/Makefile b/Makefile
index 393e09571..86d47a429 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Top-level Makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636-3142 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include Makedefs
@@ -291,5 +282,5 @@ dist: all
#
-# End of "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/README.txt b/README.txt
index 26f52b8e1..6d04079cf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,13 @@
-README - CUPS v1.3svn - 2007-01-03
-----------------------------------
+README - CUPS v1.3b1 - 2007-07-13
+---------------------------------
+
+******************************************************************
+******************************************************************
+**** ****
+**** BETA SOFTWARE - USE AT YOUR OWN RISK ****
+**** ****
+******************************************************************
+******************************************************************
Looking for compile instructions? Read the file "INSTALL.txt"
instead...
@@ -8,10 +16,10 @@ instead...
INTRODUCTION
CUPS provides a portable printing layer for UNIX(r)-based
- operating systems. It has been developed by Easy Software
- Products to promote a standard printing solution for all UNIX
- vendors and users. CUPS provides the System V and Berkeley
- command-line interfaces.
+ operating systems. It was developed by Easy Software Products
+ and is now owned and maintained by Apple Inc. to promote a
+ standard printing solution for all UNIX vendors and users. CUPS
+ provides the System V and Berkeley command-line interfaces.
CUPS uses the Internet Printing Protocol ("IPP") as the basis
for managing print jobs and queues. The Line Printer Daemon
@@ -29,15 +37,8 @@ INTRODUCTION
EPSON, HP, OKIDATA, and Zebra printers are included that use
these filters.
- Drivers for thousands of printers are provided with our ESP
- Print Pro software, available at:
-
- http://www.easysw.com/printpro/
-
CUPS is licensed under the GNU General Public License and GNU
- Library General Public License. Please contact Easy Software
- Products for commercial support and "binary distribution"
- rights.
+ Library General Public License versions 2.
READING THE DOCUMENTATION
@@ -60,19 +61,13 @@ GETTING SUPPORT AND OTHER RESOURCES
http://www.cups.org/newsgroups.php
- Commercial support (with a guaranteed response time) is
- available from Easy Software Products. For more information
- see:
-
- http://www.easysw.com/cups/
-
See the CUPS web site at "http://www.cups.org/" for other
site links.
SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
- CUPS 1.2 includes a web-based administration tool that allows
+ CUPS 1.3 includes a web-based administration tool that allows
you to manage printers, classes, and jobs on your server.
Open the following URL in your browser to access the printer
administration tools:
@@ -101,6 +96,7 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
Driver PPD File
----------------------------- ------------
Dymo Label Printers dymo.ppd
+ Intellitech Intellibar intelbar.ppd
EPSON Stylus Color Series stcolor.ppd
EPSON Stylus Photo Series stphoto.ppd
EPSON Stylus New Color Series stcolor2.ppd
@@ -108,7 +104,6 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
EPSON 9-pin Series epson9.ppd
EPSON 24-pin Series epson24.ppd
HP DeskJet Series deskjet.ppd
- HP New DeskJet Series deskjet2.ppd
HP LaserJet Series laserjet.ppd
OKIDATA 9-Pin Series okidata9.ppd
OKIDATA 24-Pin Series okidat24.ppd
@@ -133,10 +128,7 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
The sample drivers provide basic printing capabilities, but
generally do not exercise the full potential of the printers
- or CUPS. For fully-functional commercial printer drivers
- check out our ESP Print Pro software at:
-
- http://www.easysw.com/printpro/
+ or CUPS.
PRINTING FILES
@@ -170,9 +162,9 @@ PRINTING FILES
LEGAL STUFF
- CUPS is Copyright 1993-2007 by Easy Software Products. CUPS,
- the CUPS logo, and the Common UNIX Printing System are the
- trademark property of Easy Software Products.
+ CUPS is Copyright 2007 by Apple Inc. CUPS, the CUPS logo, and
+ the Common UNIX Printing System are the trademark property of
+ Apple Inc.
The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
@@ -189,18 +181,3 @@ LEGAL STUFF
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
"doc/help/license.html" or "LICENSE.txt" files for more
information.
-
- For commercial licensing information, please contact:
-
- Attn: CUPS Licensing Information
- Easy Software Products
- 44141 Airport View Drive, Suite 204
- Hollywood, Maryland 20636 USA
-
- Voice: +1.301.373.9600
- Email: cups-info@cups.org
- WWW: http://www.cups.org/
-
- Note that commercial licensors may also require a license from
- Derek B. Noonburg who developed the Xpdf software used to print
- PDF files.
diff --git a/backend/Dependencies b/backend/Dependencies
index af2a02674..da928d11e 100644
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -1,43 +1,50 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-betest.o: ../cups/string.h ../config.h
-ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-ipp.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/backend.h ../cups/cups.h
-ipp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-ipp.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-lpd.o: ../cups/backend.h ../cups/http-private.h ../config.h ../cups/http.h
-lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/cups.h
-lpd.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-lpd.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-pap.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/backend.h
-parallel.o: backend-private.h ../cups/backend.h ../cups/sidechannel.h
-parallel.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-parallel.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-parallel.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-scsi.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-scsi.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-scsi.o: ../cups/string.h ../config.h ../cups/i18n.h ../cups/transcode.h
-serial.o: backend-private.h ../cups/backend.h ../cups/sidechannel.h
-serial.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-serial.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-serial.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-snmp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-snmp.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-snmp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h
-snmp.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-snmp.o: ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../cups/array.h
-snmp.o: ../cups/file.h
-socket.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/md5.h
-socket.o: ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-socket.o: ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h
-socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-socket.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
-test1284.o: ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h
-test1284.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
-test1284.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-test1284.o: ../cups/transcode.h
-usb.o: ../cups/backend.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-usb.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-usb.o: ../cups/string.h ../cups/i18n.h ../config.h
+betest.o: betest.c ../cups/string.h ../config.h
+ipp.o: ipp.c ../cups/http-private.h ../config.h ../cups/http.h \
+ ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/backend.h \
+ ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/language.h ../cups/i18n.h \
+ ../cups/transcode.h ../cups/string.h
+lpd.o: lpd.c ../cups/backend.h ../cups/http-private.h ../config.h \
+ ../cups/http.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h \
+ ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h
+pap.o: pap.c ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
+ ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
+ ../cups/backend.h ../cups/sidechannel.h ../cups/i18n.h \
+ ../cups/transcode.h
+parallel.o: parallel.c backend-private.h ../cups/backend.h \
+ ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
+ ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
+ ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
+ ../config.h
+scsi.o: scsi.c ../cups/backend.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
+ ../config.h scsi-linux.c
+serial.o: serial.c backend-private.h ../cups/backend.h \
+ ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
+ ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
+ ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
+ ../config.h
+snmp.o: snmp.c ../cups/http-private.h ../config.h ../cups/http.h \
+ ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+ ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h \
+ ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../cups/array.h \
+ ../cups/file.h
+socket.o: socket.c ../cups/http-private.h ../config.h ../cups/http.h \
+ ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
+ ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h \
+ ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h
+test1284.o: test1284.c ../cups/string.h ../config.h ieee1284.c \
+ backend-private.h ../cups/backend.h ../cups/sidechannel.h \
+ ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
+ ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h
+usb.o: usb.c ../cups/backend.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h \
+ ../cups/transcode.h usb-unix.c ieee1284.c backend-private.h \
+ ../cups/sidechannel.h ../cups/debug.h
diff --git a/backend/Makefile b/backend/Makefile
index 28337a0bc..69519208d 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6576 2007-06-20 00:23:32Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Backend makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
# This file is subject to the Apple OS-Developed Software exception.
#
@@ -228,5 +219,5 @@ include Dependencies
#
-# End of "$Id: Makefile 6576 2007-06-20 00:23:32Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/backend/backend-private.h b/backend/backend-private.h
index 59de3696a..d4a10b6a6 100644
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -1,25 +1,16 @@
/*
- * "$Id: backend-private.h 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: backend-private.h 6649 2007-07-11 21:46:42Z mike $"
*
* Backend support definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -74,5 +65,5 @@ extern ssize_t backendRunLoop(int print_fd, int device_fd, int use_bc,
/*
- * End of "$Id: backend-private.h 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: backend-private.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/betest.c b/backend/betest.c
index f0ea6cdb2..ae73a1f1c 100644
--- a/backend/betest.c
+++ b/backend/betest.c
@@ -1,25 +1,16 @@
/*
- * "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id: betest.c 6649 2007-07-11 21:46:42Z mike $"
*
* Backend test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -83,5 +74,5 @@ main(int argc, /* I - Number of command-line arguments (7 or 8) */
/*
- * End of "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id: betest.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 94b01843f..2e0f2b242 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -1,25 +1,16 @@
/*
- * "$Id: ieee1284.c 6293 2007-02-20 13:40:55Z mike $"
+ * "$Id: ieee1284.c 6649 2007-07-11 21:46:42Z mike $"
*
* IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -503,5 +494,5 @@ backendGetMakeModel(
/*
- * End of "$Id: ieee1284.c 6293 2007-02-20 13:40:55Z mike $".
+ * End of "$Id: ieee1284.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/ieee1394-linux.c b/backend/ieee1394-linux.c
index b95e8204e..2fc273a16 100644
--- a/backend/ieee1394-linux.c
+++ b/backend/ieee1394-linux.c
@@ -1,8 +1,9 @@
/*
- * "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $"
+ * "$Id: ieee1394-linux.c 6649 2007-07-11 21:46:42Z mike $"
*
* Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2002 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -873,5 +874,5 @@ ieee1394_error(void)
/*
- * End of "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $".
+ * End of "$Id: ieee1394-linux.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/ieee1394.c b/backend/ieee1394.c
index 3d88c7a08..f45bd96df 100644
--- a/backend/ieee1394.c
+++ b/backend/ieee1394.c
@@ -1,8 +1,9 @@
/*
- * "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $"
+ * "$Id: ieee1394.c 6649 2007-07-11 21:46:42Z mike $"
*
* IEEE-1394 backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2002 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -263,5 +264,5 @@ list_devices(void)
/*
- * End of "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $".
+ * End of "$Id: ieee1394.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/ieee1394.h b/backend/ieee1394.h
index 19181c5c0..6f397fea0 100644
--- a/backend/ieee1394.h
+++ b/backend/ieee1394.h
@@ -1,8 +1,9 @@
/*
- * "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id: ieee1394.h 6649 2007-07-11 21:46:42Z mike $"
*
* IEEE-1394 header for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2002 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -99,5 +100,5 @@ extern const char *ieee1394_error(void);
/*
- * End of "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id: ieee1394.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/ipp.c b/backend/ipp.c
index 43cca4975..457e36bfd 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,25 +1,16 @@
/*
- * "$Id: ipp.c 6582 2007-06-20 22:07:38Z mike $"
+ * "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $"
*
* IPP backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1720,5 +1711,5 @@ sigterm_handler(int sig) /* I - Signal */
/*
- * End of "$Id: ipp.c 6582 2007-06-20 22:07:38Z mike $".
+ * End of "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/lpd.c b/backend/lpd.c
index c7fb6b9a5..10f4b5c0b 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1,25 +1,16 @@
/*
- * "$Id: lpd.c 6403 2007-03-27 16:00:56Z mike $"
+ * "$Id: lpd.c 6649 2007-07-11 21:46:42Z mike $"
*
* Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -341,9 +332,9 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
*/
if (!strcasecmp(value, "standard"))
- order = MODE_STANDARD;
+ mode = MODE_STANDARD;
else if (!strcasecmp(value, "stream"))
- order = MODE_STREAM;
+ mode = MODE_STREAM;
else
fprintf(stderr, _("ERROR: Unknown print mode \"%s\"\n"), value);
}
@@ -1314,5 +1305,5 @@ sigterm_handler(int sig) /* I - Signal */
/*
- * End of "$Id: lpd.c 6403 2007-03-27 16:00:56Z mike $".
+ * End of "$Id: lpd.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/parallel.c b/backend/parallel.c
index a52d44f8b..febedf6f9 100644
--- a/backend/parallel.c
+++ b/backend/parallel.c
@@ -1,25 +1,16 @@
/*
- * "$Id: parallel.c 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: parallel.c 6649 2007-07-11 21:46:42Z mike $"
*
* Parallel port backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -671,5 +662,5 @@ side_cb(int print_fd, /* I - Print file */
/*
- * End of "$Id: parallel.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: parallel.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/runloop.c b/backend/runloop.c
index 647c79488..a3499e95f 100644
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -1,25 +1,16 @@
/*
- * "$Id: runloop.c 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: runloop.c 6649 2007-07-11 21:46:42Z mike $"
*
* Common run loop APIs for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -383,5 +374,5 @@ backendRunLoop(
/*
- * End of "$Id: runloop.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: runloop.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/scsi-irix.c b/backend/scsi-irix.c
index 4f735d595..3b3e43b0d 100644
--- a/backend/scsi-irix.c
+++ b/backend/scsi-irix.c
@@ -1,8 +1,9 @@
/*
- * "$Id: scsi-irix.c 6414 2007-03-30 13:40:57Z mike $"
+ * "$Id: scsi-irix.c 6649 2007-07-11 21:46:42Z mike $"
*
* IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2003-2005 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -231,5 +232,5 @@ print_device(const char *resource, /* I - SCSI device */
/*
- * End of "$Id: scsi-irix.c 6414 2007-03-30 13:40:57Z mike $".
+ * End of "$Id: scsi-irix.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/scsi-linux.c b/backend/scsi-linux.c
index 66a88a319..dbd1c7085 100644
--- a/backend/scsi-linux.c
+++ b/backend/scsi-linux.c
@@ -1,8 +1,9 @@
/*
- * "$Id: scsi-linux.c 6422 2007-03-30 20:49:37Z mike $"
+ * "$Id: scsi-linux.c 6649 2007-07-11 21:46:42Z mike $"
*
* Linux SCSI printer support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2003-2005 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -251,5 +252,5 @@ print_device(const char *resource, /* I - SCSI device */
/*
- * End of "$Id: scsi-linux.c 6422 2007-03-30 20:49:37Z mike $".
+ * End of "$Id: scsi-linux.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/scsi.c b/backend/scsi.c
index 91544b8b9..df525618b 100644
--- a/backend/scsi.c
+++ b/backend/scsi.c
@@ -1,8 +1,9 @@
/*
- * "$Id: scsi.c 6432 2007-04-02 21:50:28Z mike $"
+ * "$Id: scsi.c 6649 2007-07-11 21:46:42Z mike $"
*
* SCSI printer backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2003-2006 by Easy Software Products, all rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -223,5 +224,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
/*
- * End of "$Id: scsi.c 6432 2007-04-02 21:50:28Z mike $".
+ * End of "$Id: scsi.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/serial.c b/backend/serial.c
index 0aa11e90e..52ee566cd 100644
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -1,25 +1,16 @@
/*
- * "$Id: serial.c 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: serial.c 6649 2007-07-11 21:46:42Z mike $"
*
* Serial port backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1289,5 +1280,5 @@ side_cb(int print_fd, /* I - Print file */
/*
- * End of "$Id: serial.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: serial.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/snmp.c b/backend/snmp.c
index bcacf14c1..916430bd8 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,25 +1,16 @@
/*
- * "$Id: snmp.c 6495 2007-04-30 21:23:04Z mike $"
+ * "$Id: snmp.c 6649 2007-07-11 21:46:42Z mike $"
*
* SNMP discovery backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1826,8 +1817,14 @@ read_snmp_conf(const char *address) /* I - Single address to probe */
if (cupsArrayCount(Addresses) == 0)
{
- fputs("INFO: Using default SNMP Address @LOCAL\n", stderr);
- add_array(Addresses, "@LOCAL");
+ /*
+ * If we have no addresses, exit immediately...
+ */
+
+ fprintf(stderr,
+ "DEBUG: No address specified and no Address line in %s...\n",
+ filename);
+ exit(0);
}
if (cupsArrayCount(Communities) == 0)
@@ -2255,5 +2252,5 @@ update_cache(snmp_cache_t *device, /* I - Device */
/*
- * End of "$Id: snmp.c 6495 2007-04-30 21:23:04Z mike $".
+ * End of "$Id: snmp.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/socket.c b/backend/socket.c
index 0cb2629aa..68f9a29c5 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,25 +1,16 @@
/*
- * "$Id: socket.c 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: socket.c 6649 2007-07-11 21:46:42Z mike $"
*
* AppSocket backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -526,5 +517,5 @@ wait_bc(int device_fd, /* I - Socket */
/*
- * End of "$Id: socket.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: socket.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/test1284.c b/backend/test1284.c
index 918d53b4f..62905e2df 100644
--- a/backend/test1284.c
+++ b/backend/test1284.c
@@ -1,26 +1,17 @@
/*
- * "$Id: test1284.c 6403 2007-03-27 16:00:56Z mike $"
+ * "$Id: test1284.c 6649 2007-07-11 21:46:42Z mike $"
*
* IEEE-1284 support functions test program for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -93,5 +84,5 @@ main(int argc, /* I - Number of command-line args */
/*
- * End of "$Id: test1284.c 6403 2007-03-27 16:00:56Z mike $".
+ * End of "$Id: test1284.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index e78b15ed5..e71965d8c 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1,5 +1,5 @@
/*
-* "$Id: usb-darwin.c 6591 2007-06-21 20:35:28Z mike $"
+* "$Id: usb-darwin.c 6680 2007-07-16 18:46:16Z mike $"
*
* Copyright © 2005-2007 Apple Inc. All rights reserved.
*
@@ -104,6 +104,7 @@
* the printer after we've finished sending all the data
*/
#define WAIT_EOF_DELAY 7
+#define WAIT_SIDE_DELAY 3
#define DEFAULT_TIMEOUT 60L
#define USB_INTERFACE_KIND CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID190)
@@ -220,6 +221,7 @@ typedef struct globals_s
CFStringRef model;
CFStringRef serial;
UInt32 location;
+ UInt8 interfaceNum;
CFRunLoopTimerRef status_timer;
@@ -229,6 +231,11 @@ typedef struct globals_s
Boolean wait_eof;
int drain_output; /* Drain all pending output */
int bidi_flag; /* 0=unidirectional, 1=bidirectional */
+
+ pthread_mutex_t sidechannel_thread_mutex;
+ pthread_cond_t sidechannel_thread_cond;
+ int sidechannel_thread_stop;
+ int sidechannel_thread_done;
} globals_t;
@@ -256,7 +263,7 @@ static OSStatus copy_deviceid(classdriver_t **printer, CFStringRef *deviceID);
static void *read_thread(void *reference);
static void *sidechannel_thread(void *reference);
static void copy_deviceinfo(CFStringRef deviceIDString, CFStringRef *make, CFStringRef *model, CFStringRef *serial);
-static void copy_devicestring(io_service_t usbInterface, CFStringRef *deviceID, UInt32 *deviceLocation);
+static void copy_devicestring(io_service_t usbInterface, CFStringRef *deviceID, UInt32 *deviceLocation, UInt8 *interfaceNum);
static void device_added(void *userdata, io_iterator_t iterator);
static void get_device_id(cups_sc_status_t *status, char *data, int *datalen);
static void iterate_printers(iterator_callback_t callBack, void *userdata);
@@ -414,17 +421,14 @@ print_device(const char *uri, /* I - Device URI */
if (!print_fd)
{
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
+ struct sigaction action; /* POSIX signal action */
+
+
memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
action.sa_handler = SIG_IGN;
sigaction(SIGTERM, &action, NULL);
-#else
- signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
}
/*
@@ -444,6 +448,12 @@ print_device(const char *uri, /* I - Device URI */
if ((select(CUPS_SC_FD+1, &input_set, NULL, NULL, &stimeout)) >= 0)
{
+ g.sidechannel_thread_stop = 0;
+ g.sidechannel_thread_done = 0;
+
+ pthread_cond_init(&g.sidechannel_thread_cond, NULL);
+ pthread_mutex_init(&g.sidechannel_thread_mutex, NULL);
+
if (pthread_create(&sidechannel_thread_id, NULL, sidechannel_thread, NULL))
{
fputs(_("WARNING: Couldn't create side channel\n"), stderr);
@@ -623,7 +633,8 @@ print_device(const char *uri, /* I - Device URI */
OSStatus err = (*g.classdriver)->Abort(g.classdriver);
fprintf(stderr, _("ERROR: %ld: (canceled:%ld)\n"), (long)status, (long)err);
- return CUPS_BACKEND_STOP;
+ status = CUPS_BACKEND_STOP;
+ break;
}
fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
@@ -651,8 +662,22 @@ print_device(const char *uri, /* I - Device URI */
pthread_cond_signal(&g.readwrite_lock_cond);
pthread_mutex_unlock(&g.readwrite_lock_mutex);
+ g.sidechannel_thread_stop = 1;
+ pthread_mutex_lock(&g.sidechannel_thread_mutex);
+ if (!g.sidechannel_thread_done)
+ {
+ cond_timeout.tv_sec = time(NULL) + WAIT_SIDE_DELAY;
+ cond_timeout.tv_nsec = 0;
+ pthread_cond_timedwait(&g.sidechannel_thread_cond,
+ &g.sidechannel_thread_mutex, &cond_timeout);
+ }
+ pthread_mutex_unlock(&g.sidechannel_thread_mutex);
+
pthread_join(sidechannel_thread_id, NULL);
+ pthread_cond_destroy(&g.sidechannel_thread_cond);
+ pthread_mutex_destroy(&g.sidechannel_thread_mutex);
+
pthread_cond_destroy(&g.readwrite_lock_cond);
pthread_mutex_destroy(&g.readwrite_lock_mutex);
@@ -676,7 +701,8 @@ print_device(const char *uri, /* I - Device URI */
cond_timeout.tv_sec = time(NULL) + WAIT_EOF_DELAY;
cond_timeout.tv_nsec = 0;
- if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex, &cond_timeout) != 0)
+ if (pthread_cond_timedwait(&g.read_thread_cond, &g.read_thread_mutex,
+ &cond_timeout) != 0)
g.wait_eof = false;
}
pthread_mutex_unlock(&g.read_thread_mutex);
@@ -790,12 +816,13 @@ sidechannel_thread(void *reference)
char data[2048]; /* Request/response data */
int datalen; /* Request/response data size */
- for (;;)
+
+ do
{
datalen = sizeof(data);
if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
- break;
+ continue;
switch (command)
{
@@ -830,6 +857,13 @@ sidechannel_thread(void *reference)
break;
}
}
+ while (!g.sidechannel_thread_stop);
+
+ pthread_mutex_lock(&g.sidechannel_thread_mutex);
+ g.sidechannel_thread_done = 1;
+ pthread_cond_signal(&g.sidechannel_thread_cond);
+ pthread_mutex_unlock(&g.sidechannel_thread_mutex);
+
return NULL;
}
@@ -923,8 +957,9 @@ static Boolean list_device_cb(void *refcon,
{
CFStringRef deviceIDString = NULL;
UInt32 deviceLocation = 0;
+ UInt8 interfaceNum = 0;
- copy_devicestring(obj, &deviceIDString, &deviceLocation);
+ copy_devicestring(obj, &deviceIDString, &deviceLocation, &interfaceNum);
if (deviceIDString != NULL)
{
CFStringRef make = NULL, model = NULL, serial = NULL;
@@ -997,8 +1032,9 @@ static Boolean find_device_cb(void *refcon,
{
CFStringRef idString = NULL;
UInt32 location = -1;
+ UInt8 interfaceNum = 0;
- copy_devicestring(obj, &idString, &location);
+ copy_devicestring(obj, &idString, &location, &interfaceNum);
if (idString != NULL)
{
CFStringRef make = NULL, model = NULL, serial = NULL;
@@ -1028,6 +1064,8 @@ static Boolean find_device_cb(void *refcon,
if (g.location == 0 || g.location == location)
keepLooking = false;
}
+ if ( !keepLooking )
+ g.interfaceNum = interfaceNum;
}
}
@@ -1252,6 +1290,7 @@ static kern_return_t registry_open(CFStringRef *driverBundlePath)
if (g.classdriver != NULL)
{
+ (*g.classdriver)->interfaceNumber = g.interfaceNum;
kr = (*g.classdriver)->Open(g.classdriver, g.location, kUSBPrintingProtocolBidirectional);
if (kr != kIOReturnSuccess || (*g.classdriver)->interface == NULL)
{
@@ -1381,7 +1420,8 @@ static OSStatus copy_deviceid(classdriver_t **classdriver,
static void copy_devicestring(io_service_t usbInterface,
CFStringRef *deviceID,
- UInt32 *deviceLocation)
+ UInt32 *deviceLocation,
+ UInt8 *interfaceNumber )
{
IOCFPlugInInterface **iodev = NULL;
SInt32 score;
@@ -1400,6 +1440,7 @@ static void copy_devicestring(io_service_t usbInterface,
&intf)) == noErr)
{
(*intf)->GetLocationID(intf, deviceLocation);
+ (*intf)->GetInterfaceNumber(intf, interfaceNumber);
driverBundlePath = IORegistryEntryCreateCFProperty(usbInterface,
kUSBClassDriverProperty,
@@ -1643,36 +1684,54 @@ static void run_ppc_backend(int argc,
if (usb_ppc_status == NULL)
{
- /* Catch SIGTERM if we are _not_ printing data from
- * stdin (otherwise you can't cancel raw jobs...)
- */
+ /*
+ * Setup a SIGTERM handler then block it before forking...
+ */
- if (fd != 0)
- {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
- sigset(SIGTERM, sigterm_handler);
-#elif defined(HAVE_SIGACTION)
- struct sigaction action; /* Actions for POSIX signals */
- memset(&action, 0, sizeof(action));
- sigaddset(&action.sa_mask, SIGTERM);
- action.sa_handler = sigterm_handler;
- sigaction(SIGTERM, &action, NULL);
-#else
- signal(SIGTERM, sigterm_handler);
-#endif /* HAVE_SIGSET */
- }
+ struct sigaction action; /* POSIX signal action */
+ sigset_t newmask, /* New signal mask */
+ oldmask; /* Old signal mask */
+
+ memset(&action, 0, sizeof(action));
+ sigaddset(&action.sa_mask, SIGTERM);
+ action.sa_handler = sigterm_handler;
+ sigaction(SIGTERM, &action, NULL);
+
+ sigemptyset(&newmask);
+ sigaddset(&newmask, SIGTERM);
+ sigprocmask(SIG_BLOCK, &newmask, &oldmask);
if ((child_pid = fork()) == 0)
{
- /* Child comes here. */
+ /*
+ * Child comes here...
+ */
+
setenv("USB_PPC_STATUS", "1", false);
- /* Tell the kernel we want the next exec call to favor the ppc architecture... */
+ /*
+ * Unblock signals before doing the exec...
+ */
+
+ memset(&action, 0, sizeof(action));
+ sigemptyset(&action.sa_mask);
+ action.sa_handler = SIG_DFL;
+ sigaction(SIGTERM, &action, NULL);
+
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
+
+ /*
+ * Tell the kernel the next exec call should favor the ppc architecture...
+ */
+
int mib[] = { CTL_KERN, KERN_AFFINITY, 1, 1 };
int namelen = 4;
sysctl(mib, namelen, NULL, NULL, NULL, 0);
- /* Set up the arguments and call exec... */
+ /*
+ * Set up the arguments and call exec...
+ */
+
for (i = 0; i < argc && i < (sizeof(my_argv)/sizeof(my_argv[0])) - 1; i++)
my_argv[i] = argv[i];
@@ -1680,41 +1739,48 @@ static void run_ppc_backend(int argc,
execv("/usr/libexec/cups/backend/usb", my_argv);
- fprintf(stderr, "DEBUG: execv: %s\n", strerror(errno));
- exitstatus = errno;
+ perror("/usr/libexec/cups/backend/usb");
+ exit(errno);
}
- else if (child_pid > 0)
+ else if (child_pid < 0)
{
- /* Parent comes here.
- *
- * Close the fds we won't be using then wait for the child backend to exit.
- */
- close(fd);
- close(1);
+ /*
+ * Error - couldn't fork a new process!
+ */
+
+ perror("fork");
+ exit(errno);
+ }
- fprintf(stderr, "DEBUG: Started usb(ppc) backend (PID %d)\n", (int)child_pid);
+ /*
+ * Unblock signals...
+ */
- while ((waitpid_status = waitpid(child_pid, &childstatus, 0)) == (pid_t)-1 && errno == EINTR)
- usleep(1000);
+ sigprocmask(SIG_SETMASK, &oldmask, NULL);
- if (WIFSIGNALED(childstatus))
- {
- exitstatus = WTERMSIG(childstatus);
- fprintf(stderr, "DEBUG: usb(ppc) backend %d crashed on signal %d!\n", child_pid, exitstatus);
- }
- else
- {
- if ((exitstatus = WEXITSTATUS(childstatus)) != 0)
- fprintf(stderr, "DEBUG: usb(ppc) backend %d stopped with status %d!\n", child_pid, exitstatus);
- else
- fprintf(stderr, "DEBUG: PID %d exited with no errors\n", child_pid);
- }
+ /*
+ * Close the fds we won't be using then wait for the child backend to exit.
+ */
+
+ close(fd);
+ close(1);
+
+ fprintf(stderr, "DEBUG: Started usb(ppc) backend (PID %d)\n", (int)child_pid);
+
+ while ((waitpid_status = waitpid(child_pid, &childstatus, 0)) == (pid_t)-1 && errno == EINTR)
+ usleep(1000);
+
+ if (WIFSIGNALED(childstatus))
+ {
+ exitstatus = WTERMSIG(childstatus);
+ fprintf(stderr, "DEBUG: usb(ppc) backend %d crashed on signal %d!\n", child_pid, exitstatus);
}
else
{
- /* fork() error */
- fprintf(stderr, "DEBUG: fork: %s\n", strerror(errno));
- exitstatus = errno;
+ if ((exitstatus = WEXITSTATUS(childstatus)) != 0)
+ fprintf(stderr, "DEBUG: usb(ppc) backend %d stopped with status %d!\n", child_pid, exitstatus);
+ else
+ fprintf(stderr, "DEBUG: PID %d exited with no errors\n", child_pid);
}
}
else
@@ -1892,10 +1958,11 @@ static void get_device_id(cups_sc_status_t *status,
int *datalen)
{
UInt32 deviceLocation = 0;
+ UInt8 interfaceNum = 0;
CFStringRef deviceIDString = NULL;
/* GetDeviceID */
- copy_devicestring(g.printer_obj, &deviceIDString, &deviceLocation);
+ copy_devicestring(g.printer_obj, &deviceIDString, &deviceLocation, &interfaceNum);
if (deviceIDString)
{
CFStringGetCString(deviceIDString, data, *datalen, kCFStringEncodingUTF8);
@@ -1907,5 +1974,5 @@ static void get_device_id(cups_sc_status_t *status,
/*
- * End of "$Id: usb-darwin.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: usb-darwin.c 6680 2007-07-16 18:46:16Z mike $".
*/
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index c034a416f..ff9e825a0 100644
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,27 +1,18 @@
/*
- * "$Id: usb-unix.c 6591 2007-06-21 20:35:28Z mike $"
+ * "$Id: usb-unix.c 6649 2007-07-11 21:46:42Z mike $"
*
* USB port backend for the Common UNIX Printing System (CUPS).
*
* This file is included from "usb.c" when compiled on UNIX/Linux.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -620,5 +611,5 @@ side_cb(int print_fd, /* I - Print file */
/*
- * End of "$Id: usb-unix.c 6591 2007-06-21 20:35:28Z mike $".
+ * End of "$Id: usb-unix.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/backend/usb.c b/backend/usb.c
index 234650deb..2abd4df47 100644
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,25 +1,16 @@
/*
- * "$Id: usb.c 6414 2007-03-30 13:40:57Z mike $"
+ * "$Id: usb.c 6649 2007-07-11 21:46:42Z mike $"
*
* USB port backend for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -273,5 +264,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
/*
- * End of "$Id: usb.c 6414 2007-03-30 13:40:57Z mike $".
+ * End of "$Id: usb.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index 2c5dd988d..b22e00768 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -1,14 +1,13 @@
-# DO NOT DELETE
-
-lpc.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-lpc.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h
-lpc.o: ../cups/transcode.h ../cups/debug.h ../cups/string.h ../config.h
-lpq.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpq.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpq.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
-lpr.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
-lpr.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-lpr.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lprm.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-lprm.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h
-lprm.o: ../cups/transcode.h ../cups/string.h ../config.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+lpc.o: lpc.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
+ ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h \
+ ../cups/transcode.h ../cups/debug.h ../cups/string.h ../config.h
+lpq.o: lpq.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
+lpr.o: lpr.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/i18n.h ../cups/transcode.h
+lprm.o: lprm.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
+ ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h \
+ ../cups/transcode.h ../cups/string.h ../config.h
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 762605e56..1023c1a33 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
@@ -127,5 +118,5 @@ include Dependencies
#
-# End of "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 808ed674d..666308ebb 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,25 +1,16 @@
/*
- * "$Id: lpc.c 6070 2006-11-02 16:20:46Z mike $"
+ * "$Id: lpc.c 6649 2007-07-11 21:46:42Z mike $"
*
* "lpc" command for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -471,5 +462,5 @@ show_status(http_t *http, /* I - HTTP connection to server */
/*
- * End of "$Id: lpc.c 6070 2006-11-02 16:20:46Z mike $".
+ * End of "$Id: lpc.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 719e3b249..18b2e1ccd 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,25 +1,16 @@
/*
- * "$Id: lpq.c 5925 2006-09-05 19:43:11Z mike $"
+ * "$Id: lpq.c 6649 2007-07-11 21:46:42Z mike $"
*
* "lpq" command for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -676,5 +667,5 @@ usage(void)
/*
- * End of "$Id: lpq.c 5925 2006-09-05 19:43:11Z mike $".
+ * End of "$Id: lpq.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index c4bf045b9..a7223f2d7 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,25 +1,16 @@
/*
- * "$Id: lpr.c 6356 2007-03-19 13:54:48Z mike $"
+ * "$Id: lpr.c 6649 2007-07-11 21:46:42Z mike $"
*
* "lpr" command for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -529,5 +520,5 @@ sighandler(int s) /* I - Signal number */
/*
- * End of "$Id: lpr.c 6356 2007-03-19 13:54:48Z mike $".
+ * End of "$Id: lpr.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 23fbbb37d..d453af13c 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,25 +1,16 @@
/*
- * "$Id: lprm.c 5925 2006-09-05 19:43:11Z mike $"
+ * "$Id: lprm.c 6649 2007-07-11 21:46:42Z mike $"
*
* "lprm" command for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -294,5 +285,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: lprm.c 5925 2006-09-05 19:43:11Z mike $".
+ * End of "$Id: lprm.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies
index e87f276b8..42aa24791 100644
--- a/cgi-bin/Dependencies
+++ b/cgi-bin/Dependencies
@@ -1,56 +1,56 @@
-# DO NOT DELETE
-
-help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help-index.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-help-index.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-help-index.o: ../cups/transcode.h ../cups/string.h ../config.h ../cups/dir.h
-html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-html.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-html.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-html.o: ../cups/transcode.h ../cups/string.h ../config.h
-ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-ipp-var.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-ipp-var.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-ipp-var.o: ../cups/transcode.h ../cups/string.h ../config.h
-search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-search.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-search.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-search.o: ../cups/transcode.h ../cups/string.h ../config.h
-template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-template.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-template.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-template.o: ../cups/transcode.h ../cups/string.h ../config.h
-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-var.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-var.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-var.o: ../cups/transcode.h ../cups/string.h ../config.h
-admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-admin.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-admin.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-admin.o: ../cups/transcode.h ../cups/string.h ../config.h ../cups/adminutil.h
-admin.o: ../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/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-classes.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-classes.o: ../cups/transcode.h ../cups/string.h ../config.h
-help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-help.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-help.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-help.o: ../cups/transcode.h ../cups/string.h ../config.h
-jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-jobs.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-jobs.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-jobs.o: ../cups/transcode.h ../cups/string.h ../config.h
-printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-printers.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-printers.o: ../cups/array.h help-index.h ../cups/debug.h ../cups/i18n.h
-printers.o: ../cups/transcode.h ../cups/string.h ../config.h
-testcgi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-testcgi.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/array.h
-testcgi.o: help-index.h
-testhi.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-testhi.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/array.h
-testhi.o: help-index.h
-testtemplate.o: cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-testtemplate.o: ../cups/ppd.h ../cups/array.h ../cups/file.h
-testtemplate.o: ../cups/language.h ../cups/array.h help-index.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+help-index.o: help-index.c cgi-private.h cgi.h ../cups/cups.h \
+ ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h \
+ ../cups/file.h ../cups/language.h ../cups/array.h help-index.h \
+ ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
+ ../config.h ../cups/dir.h
+html.o: html.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+ipp-var.o: ipp-var.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+search.o: search.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+template.o: template.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h \
+ ../cups/adminutil.h ../cups/cups.h ../cups/file.h
+classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+printers.o: printers.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
+ ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
+testcgi.o: testcgi.c cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
+ ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
+ ../cups/array.h help-index.h
+testhi.o: testhi.c cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
+ ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
+ ../cups/array.h help-index.h
+testtemplate.o: testtemplate.c cgi.h ../cups/cups.h ../cups/ipp.h \
+ ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
+ ../cups/language.h ../cups/array.h help-index.h
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 5826668fc..5637c900f 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# CGI makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
@@ -176,5 +167,5 @@ include Dependencies
#
-# End of "$Id: Makefile 6563 2007-06-18 22:18:46Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index ca0987660..d73295a1d 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,25 +1,16 @@
/*
- * "$Id: admin.c 6440 2007-04-03 23:17:17Z mike $"
+ * "$Id: admin.c 6649 2007-07-11 21:46:42Z mike $"
*
* Administration CGI for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -3309,5 +3300,5 @@ match_string(const char *a, /* I - First string */
/*
- * End of "$Id: admin.c 6440 2007-04-03 23:17:17Z mike $".
+ * End of "$Id: admin.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index f50a7aabe..bdcbeac7a 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,25 +1,16 @@
/*
- * "$Id: cgi-private.h 6361 2007-03-19 16:01:28Z mike $"
+ * "$Id: cgi-private.h 6649 2007-07-11 21:46:42Z mike $"
*
* Private CGI definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
/*
@@ -40,5 +31,5 @@
/*
- * End of "$Id: cgi-private.h 6361 2007-03-19 16:01:28Z mike $".
+ * End of "$Id: cgi-private.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index 0ffe2950d..9f462dd20 100644
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -1,25 +1,16 @@
/*
- * "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $"
+ * "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $"
*
* CGI support library definitions.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_CGI_H_
@@ -105,5 +96,5 @@ extern const char *cgiText(const char *message);
#endif /* !_CUPS_CGI_H_ */
/*
- * End of "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $".
+ * End of "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 1c22d513e..51c07337f 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,25 +1,16 @@
/*
- * "$Id: classes.c 5571 2006-05-22 18:46:55Z mike $"
+ * "$Id: classes.c 6649 2007-07-11 21:46:42Z mike $"
*
* Class status CGI for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -463,5 +454,5 @@ show_class(http_t *http, /* I - Connection to server */
/*
- * End of "$Id: classes.c 5571 2006-05-22 18:46:55Z mike $".
+ * End of "$Id: classes.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index 8be6bc3a5..b32f8a7af 100644
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -1,25 +1,16 @@
/*
- * "$Id: help-index.c 6394 2007-03-25 00:01:14Z mike $"
+ * "$Id: help-index.c 6649 2007-07-11 21:46:42Z mike $"
*
* On-line help index routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -1336,5 +1327,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */
/*
- * End of "$Id: help-index.c 6394 2007-03-25 00:01:14Z mike $".
+ * End of "$Id: help-index.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index c7cbe2b54..bbee9ca13 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,25 +1,16 @@
/*
- * "$Id: help-index.h 6257 2007-02-11 01:11:57Z mike $"
+ * "$Id: help-index.h 6649 2007-07-11 21:46:42Z mike $"
*
* On-line help index definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_HELP_INDEX_H_
@@ -80,5 +71,5 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query,
#endif /* !_CUPS_HELP_INDEX_H_ */
/*
- * End of "$Id: help-index.h 6257 2007-02-11 01:11:57Z mike $".
+ * End of "$Id: help-index.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 0d554de71..85a6a7cae 100644
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -3,23 +3,14 @@
*
* On-line help CGI for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index 62e0cc517..4382e152a 100644
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,25 +1,16 @@
/*
- * "$Id: html.c 5548 2006-05-19 19:38:31Z mike $"
+ * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTML support functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -183,5 +174,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */
/*
- * End of "$Id: html.c 5548 2006-05-19 19:38:31Z mike $".
+ * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index f9dc54ca7..a2f18de57 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,25 +1,16 @@
/*
- * "$Id: ipp-var.c 6304 2007-02-22 22:06:23Z mike $"
+ * "$Id: ipp-var.c 6649 2007-07-11 21:46:42Z mike $"
*
* CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -1418,5 +1409,5 @@ cgiText(const char *message) /* I - Message */
/*
- * End of "$Id: ipp-var.c 6304 2007-02-22 22:06:23Z mike $".
+ * End of "$Id: ipp-var.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index f86aa9bb9..da4f1357c 100644
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -1,25 +1,16 @@
/*
- * "$Id: jobs.c 6277 2007-02-14 16:07:28Z mike $"
+ * "$Id: jobs.c 6649 2007-07-11 21:46:42Z mike $"
*
* Job status CGI for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -213,5 +204,5 @@ do_job_op(http_t *http, /* I - HTTP connection */
/*
- * End of "$Id: jobs.c 6277 2007-02-14 16:07:28Z mike $".
+ * End of "$Id: jobs.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index 50dc2b322..068547cb4 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,25 +1,16 @@
/*
- * "$Id: printers.c 5571 2006-05-22 18:46:55Z mike $"
+ * "$Id: printers.c 6649 2007-07-11 21:46:42Z mike $"
*
* Printer status CGI for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -638,5 +629,5 @@ show_printer(http_t *http, /* I - Connection to server */
/*
- * End of "$Id: printers.c 5571 2006-05-22 18:46:55Z mike $".
+ * End of "$Id: printers.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index 25a410f7d..9765064f0 100644
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -1,25 +1,16 @@
/*
- * "$Id: search.c 5962 2006-09-17 19:01:26Z mike $"
+ * "$Id: search.c 6649 2007-07-11 21:46:42Z mike $"
*
* Search routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -366,5 +357,5 @@ cgiFreeSearch(void *search) /* I - Search context */
/*
- * End of "$Id: search.c 5962 2006-09-17 19:01:26Z mike $".
+ * End of "$Id: search.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index d2fd9b8e3..9677e44fe 100644
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -1,25 +1,16 @@
/*
- * "$Id: template.c 5548 2006-05-19 19:38:31Z mike $"
+ * "$Id: template.c 6649 2007-07-11 21:46:42Z mike $"
*
* CGI template function.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -670,5 +661,5 @@ cgi_puturi(const char *s, /* I - String to output */
/*
- * End of "$Id: template.c 5548 2006-05-19 19:38:31Z mike $".
+ * End of "$Id: template.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index e9300af87..6d9285a02 100644
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $"
+ * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $"
*
* CGI test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -80,5 +71,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $".
+ * End of "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index 1d6e23f04..0ef102e74 100644
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testhi.c 6257 2007-02-11 01:11:57Z mike $"
+ * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $"
*
* Help index test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -118,5 +109,5 @@ list_nodes(const char *title, /* I - Title string */
/*
- * End of "$Id: testhi.c 6257 2007-02-11 01:11:57Z mike $".
+ * End of "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index fa4714a8a..9ecc95c1c 100644
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $"
+ * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $"
*
* CGI template test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -108,5 +99,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $".
+ * End of "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 113b8d026..8d4dab9ea 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,25 +1,16 @@
/*
- * "$Id: var.c 5548 2006-05-19 19:38:31Z mike $"
+ * "$Id: var.c 6649 2007-07-11 21:46:42Z mike $"
*
* CGI form variable and array functions.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -1027,5 +1018,5 @@ cgi_unlink_file(void)
/*
- * End of "$Id: var.c 5548 2006-05-19 19:38:31Z mike $".
+ * End of "$Id: var.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/conf/Makefile b/conf/Makefile
index 968e66004..4cac3841f 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Configuration file makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1993-2006 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
@@ -28,7 +19,7 @@ include ../Makedefs
# Config files...
#
-KEEP = cupsd.conf
+KEEP = cupsd.conf snmp.conf
REPLACE = mime.convs mime.types
@@ -102,5 +93,5 @@ uninstall:
#
-# End of "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index ee0b28fb4..96138db38 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
#
-# "$Id: cupsd.conf.in 6268 2007-02-12 02:46:11Z mike $"
+# "$Id: cupsd.conf.in 6634 2007-07-09 20:15:40Z mike $"
#
# Sample configuration file for the Common UNIX Printing System (CUPS)
# scheduler. See "man cupsd.conf" for a complete description of this
@@ -41,7 +41,7 @@ DefaultAuthType Basic
# Restrict access to configuration files...
- AuthType Basic
+ AuthType Default
Require user @SYSTEM
Order allow,deny
Allow localhost
@@ -57,7 +57,7 @@ DefaultAuthType Basic
# All administration operations require an adminstrator to authenticate...
- AuthType Basic
+ AuthType Default
Require user @SYSTEM
Order deny,allow
@@ -74,5 +74,5 @@ DefaultAuthType Basic
#
-# End of "$Id: cupsd.conf.in 6268 2007-02-12 02:46:11Z mike $".
+# End of "$Id: cupsd.conf.in 6634 2007-07-09 20:15:40Z mike $".
#
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index ec3291871..108e507b2 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
#
-# "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $"
+# "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $"
#
# DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
# VERSIONS OF CUPS. Instead, create a "local.convs" file that
@@ -7,23 +7,14 @@
#
# MIME converts file for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
########################################################################
@@ -118,5 +109,5 @@ image/x-sun-raster application/vnd.cups-raster 100 imagetoraster
@DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 -
#
-# End of "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $".
+# End of "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/conf/mime.types b/conf/mime.types
index ed53e7947..bda116265 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,5 +1,5 @@
#
-# "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $"
+# "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $"
#
# MIME types file for the Common UNIX Printing System (CUPS).
#
@@ -7,23 +7,14 @@
# VERSIONS OF CUPS. Instead, create a "local.types" file that
# reflects your local configuration changes.
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
########################################################################
@@ -84,7 +75,7 @@ application/postscript ai eps ps string(0,%!) string(0,<04>%!) \
contains(0,4096,"LANGUAGE = POSTSCRIPT") \
(contains(0,4096,<0a>%!) + \
!contains(0,4096,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL hpgl string(0,<1B>&)\
+application/vnd.hp-HPGL hpgl \
string(0,<1B>E<1B>%0B) \
string(0,<1B>%-1B) string(0,<201B>)\
string(0,BP;) string(0,IN;) string(0,DF;) \
@@ -105,7 +96,7 @@ image/jpeg jpeg jpg jpe string(0,) &&\
char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff tiff tif string(0,MM) string(0,II)
+image/tiff tiff tif string(0,MM<002A>) string(0,II<2A00>)
image/x-photocd pcd string(2048,PCD_IPI)
image/x-portable-anymap pnm
image/x-portable-bitmap pbm string(0,P1) string(0,P4)
@@ -180,5 +171,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \
application/octet-stream
#
-# End of "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $".
+# End of "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/conf/snmp.conf.in b/conf/snmp.conf.in
new file mode 100644
index 000000000..a85dbc7c8
--- /dev/null
+++ b/conf/snmp.conf.in
@@ -0,0 +1,13 @@
+#
+# "$Id$"
+#
+# Sample SNMP configuration file for CUPS. See "man smnp.conf" for a
+# complete description of this file.
+#
+
+@CUPS_SNMP_ADDRESS@
+@CUPS_SNMP_COMMUNITY@
+
+#
+# End of "$Id$".
+#
diff --git a/config-scripts/cups-3264.m4 b/config-scripts/cups-3264.m4
index 1ce80df9d..46d85f38b 100644
--- a/config-scripts/cups-3264.m4
+++ b/config-scripts/cups-3264.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
dnl
dnl 32/64-bit library support stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Setup support for separate 32/64-bit library generation...
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 2b84c2bfb..e360095e4 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-common.m4 6564 2007-06-18 23:40:38Z mike $"
+dnl "$Id: cups-common.m4 6682 2007-07-16 20:22:37Z mike $"
dnl
dnl Common configuration stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl We need at least autoconf 2.50...
@@ -29,11 +20,11 @@ dnl Set the name of the config header file...
AC_CONFIG_HEADER(config.h)
dnl Versio number information...
-CUPS_VERSION="1.3svn"
+CUPS_VERSION="1.3b1"
CUPS_REVISION=""
-if test -z "$CUPS_REVISION" -a -d .svn; then
- CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-fi
+#if test -z "$CUPS_REVISION" -a -d .svn; then
+# CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
+#fi
AC_SUBST(CUPS_VERSION)
AC_SUBST(CUPS_REVISION)
@@ -132,6 +123,7 @@ AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
+AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
dnl Checks for string functions.
@@ -243,7 +235,7 @@ case $uname in
dnl Check for Authorization Services support
AC_CHECK_HEADER(Security/Authorization.h, [
AC_DEFINE(HAVE_AUTHORIZATION_H)
- CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"])
+ CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"])
AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
;;
@@ -293,5 +285,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
dnl
-dnl End of "$Id: cups-common.m4 6564 2007-06-18 23:40:38Z mike $".
+dnl End of "$Id: cups-common.m4 6682 2007-07-16 20:22:37Z mike $".
dnl
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index e0426aa5b..c87069cac 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-compiler.m4 6562 2007-06-18 21:51:10Z mike $"
+dnl "$Id: cups-compiler.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Compiler stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Clear the debugging and non-shared library options unless the user asks
@@ -458,5 +449,5 @@ case $uname in
esac
dnl
-dnl End of "$Id: cups-compiler.m4 6562 2007-06-18 21:51:10Z mike $".
+dnl End of "$Id: cups-compiler.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 06393e115..6b6d46436 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,34 +1,28 @@
dnl
-dnl "$Id: cups-defaults.m4 6568 2007-06-18 23:58:08Z mike $"
+dnl "$Id: cups-defaults.m4 6656 2007-07-12 23:56:23Z mike $"
dnl
dnl Default cupsd configuration settings for the Common UNIX Printing System
dnl (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2006-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
-dnl Default langugages...
-AC_ARG_WITH(languages, [ --with-languages set installed languages, default="de es et fr he it ja pl sv zh_TW" ],
- if test "x$withval" != xno; then
- LANGUAGES="$withval"
- fi,
- LANGUAGES="de es et fr he it ja pl sv zh_TW")
+dnl Default languages...
+LANGUAGES="`ls -1 locale/*.po | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"
+
+AC_ARG_WITH(languages, [ --with-languages set installed languages, default=all ],[
+ case "$withval" in
+ none | no) LANGUAGES="" ;;
+ all) ;;
+ *) LANGUAGES="$withval" ;;
+ esac])
AC_SUBST(LANGUAGES)
dnl Default ConfigFilePerm
@@ -210,35 +204,35 @@ AC_ARG_WITH(cups_group, [ --with-cups-group set default group for CUPS],
AC_ARG_WITH(system_groups, [ --with-system-groups set default system groups for CUPS],
CUPS_SYSTEM_GROUPS="$withval",
if test x$uname = xDarwin; then
- GROUP_LIST="admin"
+ CUPS_SYSTEM_GROUPS="lpadmin admin"
else
- GROUP_LIST="lpadmin sys system root"
- fi
-
- AC_MSG_CHECKING(for default system groups)
- if test -f /etc/group; then
- CUPS_SYSTEM_GROUPS=""
- for group in $GROUP_LIST; do
- if test "`grep \^${group}: /etc/group`" != ""; then
- if test "x$CUPS_SYSTEM_GROUPS" = x; then
- CUPS_SYSTEM_GROUPS="$group"
- else
- CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
+ AC_MSG_CHECKING(for default system groups)
+ if test -f /etc/group; then
+ CUPS_SYSTEM_GROUPS=""
+ GROUP_LIST="lpadmin sys system root"
+ for group in $GROUP_LIST; do
+ if test "`grep \^${group}: /etc/group`" != ""; then
+ if test "x$CUPS_SYSTEM_GROUPS" = x; then
+ CUPS_SYSTEM_GROUPS="$group"
+ else
+ CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
+ fi
fi
- fi
- done
+ done
- if test "x$CUPS_SYSTEM_GROUPS" = x; then
- CUPS_SYSTEM_GROUPS="$GROUP_LIST"
- AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
+ if test "x$CUPS_SYSTEM_GROUPS" = x; then
+ CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+ AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
+ else
+ AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
+ fi
else
- AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
+ CUPS_SYSTEM_GROUPS="$GROUP_LIST"
+ AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
fi
- else
- CUPS_SYSTEM_GROUPS="$GROUP_LIST"
- AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
fi)
+
CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`"
AC_SUBST(CUPS_USER)
@@ -309,6 +303,26 @@ else
fi
AC_SUBST(DEFAULT_RAW_PRINTING)
+dnl Default SNMP options...
+AC_ARG_WITH(snmp-address, [ --with-snmp-address set SNMP query address, default=auto ],
+ if test "x$withval" = x; then
+ CUPS_SNMP_ADDRESS=""
+ else
+ CUPS_SNMP_ADDRESS="Address $withval"
+ fi,
+ if test "x$uname" = xDarwin; then
+ CUPS_SNMP_ADDRESS=""
+ else
+ CUPS_SNMP_ADDRESS="Address @LOCAL"
+ fi)
+
+AC_ARG_WITH(snmp-community, [ --with-snmp-community set SNMP community, default=public ],
+ CUPS_SNMP_COMMUNITY="Community $withval",
+ CUPS_SNMP_COMMUNITY="Community public")
+
+AC_SUBST(CUPS_SNMP_ADDRESS)
+AC_SUBST(CUPS_SNMP_COMMUNITY)
+
dnl
-dnl End of "$Id: cups-defaults.m4 6568 2007-06-18 23:58:08Z mike $".
+dnl End of "$Id: cups-defaults.m4 6656 2007-07-12 23:56:23Z mike $".
dnl
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 7728746c9..c34dfd090 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-directories.m4 6351 2007-03-19 04:53:49Z mike $"
+dnl "$Id: cups-directories.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Directory stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_PREFIX_DEFAULT(/)
@@ -365,5 +356,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
AC_SUBST(CUPS_STATEDIR)
dnl
-dnl End of "$Id: cups-directories.m4 6351 2007-03-19 04:53:49Z mike $".
+dnl End of "$Id: cups-directories.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index acdc98a02..001c79f9a 100644
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -7,8 +7,13 @@ dnl http://www.dns-sd.org
dnl http://www.multicastdns.org/
dnl http://developer.apple.com/networking/bonjour/
dnl
-dnl Copyright ...
+dnl Copyright 2007 by Apple Inc.
dnl
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(dnssd, [ --enable-dnssd turn on DNS Service Discovery support, default=yes])
diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index c1394afcd..2fed2e2e7 100644
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -3,26 +3,17 @@ dnl "$Id$"
dnl
dnl GSSAPI/Kerberos library detection.
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2006-2007 by Easy Software Products.
dnl
dnl This file contains Kerberos support code, copyright 2006 by
dnl Jelmer Vernooij.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(gssapi, [ --enable-gssapi turn on GSSAPI support, default=yes])
@@ -69,7 +60,7 @@ if test x$enable_gssapi != xno; then
AC_CHECK_FUNC(gsskrb5_register_acceptor_identity,
AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY))
- AC_CHECK_FUNC(krb5_cc_resolve, AC_DEFINE(KRB5_CC_RESOLVE))
+ AC_CHECK_FUNC(krb5_cc_resolve, AC_DEFINE(HAVE_KRB5_CC_RESOLVE))
AC_MSG_CHECKING(for GSS_C_NT_HOSTBASED_SERVICE)
if test $ac_cv_header_gssapi_gssapi_h = yes; then
@@ -104,7 +95,7 @@ AC_ARG_WITH(gssservicename, [ --with-gssservicename set default gss service n
if test x$default_gssservicename != xno; then
if test "x$default_gssservicename" = "xdefault"; then
- CUPS_DEFAULT_GSSSERVICENAME="IPP"
+ CUPS_DEFAULT_GSSSERVICENAME="ipp"
else
CUPS_DEFAULT_GSSSERVICENAME="$default_gssservicename"
fi
diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index 8c63cc9a5..58ed255ff 100644
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-image.m4 5579 2006-05-23 19:27:28Z mike $"
+dnl "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Image library/filter stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl See if we want the image filters included at all...
@@ -114,5 +105,5 @@ AC_SUBST(EXPORT_LIBZ)
AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
dnl
-dnl End of "$Id: cups-image.m4 5579 2006-05-23 19:27:28Z mike $".
+dnl End of "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4
index f5f6bf1ad..dbfcb499c 100644
--- a/config-scripts/cups-largefile.m4
+++ b/config-scripts/cups-largefile.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-largefile.m4 6330 2007-03-12 14:50:45Z mike $"
+dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Large file support stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Check for largefile support...
@@ -57,5 +48,5 @@ fi
AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
dnl
-dnl End of "$Id: cups-largefile.m4 6330 2007-03-12 14:50:45Z mike $".
+dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4
index ded893b07..02d89843b 100644
--- a/config-scripts/cups-launchd.m4
+++ b/config-scripts/cups-launchd.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl launchd stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
@@ -49,5 +40,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF)
AC_SUBST(LAUNCHDLIBS)
dnl
-dnl End of "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4
index d2171eb30..153c0dca6 100644
--- a/config-scripts/cups-ldap.m4
+++ b/config-scripts/cups-ldap.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-ldap.m4 5563 2006-05-21 17:18:40Z mike $"
+dnl "$Id: cups-ldap.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl LDAP configuration stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2003-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org/
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(ldap, [ --enable-ldap turn on LDAP support, default=yes])
@@ -46,5 +37,5 @@ AC_SUBST(LIBLDAP)
dnl
-dnl End of "$Id: cups-ldap.m4 5563 2006-05-21 17:18:40Z mike $".
+dnl End of "$Id: cups-ldap.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 5b68a7080..c88f41426 100644
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Libtool stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=LIBTOOL_PATH
@@ -45,5 +36,5 @@ if test x$LIBTOOL != x; then
fi
dnl
-dnl End of "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 71f1e60ba..13881c5bf 100644
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-manpages.m4 5798 2006-08-03 00:53:58Z mike $"
+dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Manpage stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Fix "mandir" variable...
@@ -109,5 +100,5 @@ AC_SUBST(MAN8EXT)
AC_SUBST(MAN8DIR)
dnl
-dnl End of "$Id: cups-manpages.m4 5798 2006-08-03 00:53:58Z mike $".
+dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 8da5f6266..30e7398e7 100644
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-network.m4 6365 2007-03-19 20:56:57Z mike $"
+dnl "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Networking stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_SEARCH_LIBS(socket, socket)
@@ -93,5 +84,5 @@ AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
[#include ])
dnl
-dnl End of "$Id: cups-network.m4 6365 2007-03-19 20:56:57Z mike $".
+dnl End of "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 964fe74bf..ae81eb481 100644
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-opsys.m4 6135 2006-12-06 18:22:38Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Operating system stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Get the operating system, version number, and architecture...
@@ -40,5 +31,5 @@ case "$uname" in
esac
dnl
-dnl "$Id: cups-opsys.m4 6135 2006-12-06 18:22:38Z mike $"
+dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index df445a2b7..4ceb2d4af 100644
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-pam.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl PAM stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(pam, [ --enable-pam turn on PAM support, default=yes])
@@ -94,5 +85,5 @@ AC_SUBST(PAMLIBS)
AC_SUBST(PAMMOD)
dnl
-dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-pam.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-pap.m4 b/config-scripts/cups-pap.m4
index 2fbed6776..b1fe05bc6 100644
--- a/config-scripts/cups-pap.m4
+++ b/config-scripts/cups-pap.m4
@@ -3,23 +3,14 @@ dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
dnl
dnl PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
# Currently the PAP backend is only supported on MacOS X with the AppleTalk
diff --git a/config-scripts/cups-pdf.m4 b/config-scripts/cups-pdf.m4
index f76974883..deac73ed8 100644
--- a/config-scripts/cups-pdf.m4
+++ b/config-scripts/cups-pdf.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-pdf.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])
@@ -39,5 +30,5 @@ fi
AC_SUBST(PDFTOPS)
dnl
-dnl End of "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-pdf.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4
index d0b6e9760..639530dba 100644
--- a/config-scripts/cups-poll.m4
+++ b/config-scripts/cups-poll.m4
@@ -3,23 +3,14 @@ dnl "$Id$"
dnl
dnl Select/poll stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))
diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index ee00b8a2e..71a6707e9 100644
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Scripting configuration stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Do we have Java?
@@ -100,5 +91,5 @@ if test "x$CUPS_PYTHON" != x; then
fi
dnl
-dnl End of "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 940fdac28..5eeface00 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-sharedlibs.m4 6135 2006-12-06 18:22:38Z mike $"
+dnl "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Shared library support for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
PICFLAG=1
@@ -192,5 +183,5 @@ AC_SUBST(IMGLIBS)
AC_SUBST(EXPORT_LDFLAGS)
dnl
-dnl End of "$Id: cups-sharedlibs.m4 6135 2006-12-06 18:22:38Z mike $".
+dnl End of "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-slp.m4 b/config-scripts/cups-slp.m4
index 0afbbca31..60141d49a 100644
--- a/config-scripts/cups-slp.m4
+++ b/config-scripts/cups-slp.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id: cups-slp.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(slp, [ --enable-slp turn on SLP support, default=yes])
@@ -44,5 +35,5 @@ AC_SUBST(LIBSLP)
dnl
-dnl End of "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id: cups-slp.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index a208b712f..b239bbaaf 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-ssl.m4 6237 2007-02-06 15:56:14Z mike $"
+dnl "$Id: cups-ssl.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(ssl, [ --enable-ssl turn on SSL/TLS support, default=yes])
@@ -133,5 +124,5 @@ AC_SUBST(EXPORT_SSLLIBS)
dnl
-dnl End of "$Id: cups-ssl.m4 6237 2007-02-06 15:56:14Z mike $".
+dnl End of "$Id: cups-ssl.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index a779aad84..2dfa8beff 100644
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: cups-threads.m4 6057 2006-10-23 00:17:26Z mike $"
+dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Threading stuff for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(threads, [ --enable-threads enable multi-threading support])
@@ -59,5 +50,5 @@ fi
AC_SUBST(PTHREAD_FLAGS)
dnl
-dnl End of "$Id: cups-threads.m4 6057 2006-10-23 00:17:26Z mike $".
+dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/config.h.in b/config.h.in
index 9bbbab61c..ebd9ab4bf 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,25 +1,16 @@
/*
- * "$Id: config.h.in 6569 2007-06-19 00:16:59Z mike $"
+ * "$Id: config.h.in 6649 2007-07-11 21:46:42Z mike $"
*
* Configuration file for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_CONFIG_H_
@@ -531,8 +522,15 @@
#undef HAVE_DLFCN_H
+/*
+ * Do we have ?
+ */
+
+#undef HAVE_SYS_UCRED_H
+
+
#endif /* !_CUPS_CONFIG_H_ */
/*
- * End of "$Id: config.h.in 6569 2007-06-19 00:16:59Z mike $".
+ * End of "$Id: config.h.in 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/configure.in b/configure.in
index bfbe2cd8d..c52453f83 100644
--- a/configure.in
+++ b/configure.in
@@ -1,25 +1,16 @@
dnl
-dnl "$Id: configure.in 6566 2007-06-18 23:56:23Z mike $"
+dnl "$Id: configure.in 6649 2007-07-11 21:46:42Z mike $"
dnl
dnl Configuration script for the Common UNIX Printing System (CUPS).
dnl
+dnl Copyright 2007 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
-dnl property of Easy Software Products and are protected by Federal
-dnl copyright law. Distribution and use rights are outlined in the file
-dnl "LICENSE.txt" which should have been included with this file. If this
-dnl file is missing or damaged please contact Easy Software Products
-dnl at:
-dnl
-dnl Attn: CUPS Licensing Information
-dnl Easy Software Products
-dnl 44141 Airport View Drive, Suite 204
-dnl Hollywood, Maryland 20636 USA
-dnl
-dnl Voice: (301) 373-9600
-dnl EMail: cups-info@cups.org
-dnl WWW: http://www.cups.org
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_INIT(cups/cups.h)
@@ -76,8 +67,8 @@ AC_SUBST(INSTALL_LANGUAGES)
AC_SUBST(UNINSTALL_LANGUAGES)
AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
- conf/cupsd.conf conf/mime.convs conf/pam.std doc/index.html
- doc/help/ref-cupsd-conf.html doc/help/standard.html
+ conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
+ doc/index.html doc/help/ref-cupsd-conf.html doc/help/standard.html
man/client.conf.man man/cups-deviced.man man/cups-driverd.man
man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
man/cupsd.conf.man man/lpoptions.man
@@ -87,5 +78,5 @@ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
chmod +x cups-config
dnl
-dnl End of "$Id: configure.in 6566 2007-06-18 23:56:23Z mike $".
+dnl End of "$Id: configure.in 6649 2007-07-11 21:46:42Z mike $".
dnl
diff --git a/cups-config.in b/cups-config.in
index 98e80a88f..66bf14997 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,26 +1,17 @@
#! /bin/sh
#
-# "$Id: cups-config.in 5919 2006-08-31 04:20:45Z mike $"
+# "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $"
#
# CUPS configuration utility.
#
+# Copyright 2007 by Apple Inc.
# Copyright 2001-2006 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
VERSION="@CUPS_VERSION@"
@@ -151,5 +142,5 @@ while test $# -gt 0; do
done
#
-# End of "$Id: cups-config.in 5919 2006-08-31 04:20:45Z mike $".
+# End of "$Id: cups-config.in 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/cups/Dependencies b/cups/Dependencies
index 0efee6e4a..167b8b5ae 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,297 +1,324 @@
-# DO NOT DELETE
-
-adminutil.o: adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-adminutil.o: globals.h string.h ../config.h http-private.h md5.h
-adminutil.o: ipp-private.h i18n.h transcode.h debug.h
-array.o: array.h string.h ../config.h debug.h
-attr.o: ppd.h array.h file.h debug.h string.h ../config.h
-auth.o: globals.h string.h ../config.h http-private.h http.h md5.h
-auth.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-auth.o: transcode.h debug.h
-backchannel.o: cups.h ipp.h http.h ppd.h array.h file.h language.h
-backend.o: backend.h string.h ../config.h
-custom.o: globals.h string.h ../config.h http-private.h http.h md5.h
-custom.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-custom.o: transcode.h debug.h
-dest.o: globals.h string.h ../config.h http-private.h http.h md5.h
-dest.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-dest.o: transcode.h
-dir.o: dir.h string.h ../config.h debug.h
-emit.o: ppd.h array.h file.h string.h ../config.h debug.h
-encode.o: cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
-encode.o: string.h ../config.h debug.h
-file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.o: debug.h
-getifaddrs.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.o: cups.h ppd.h array.h file.h language.h string.h debug.h
-globals.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-globals.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.o: transcode.h debug.h
-http.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.o: debug.h
-http-addr.o: globals.h string.h ../config.h http-private.h http.h md5.h
-http-addr.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-http-addr.o: i18n.h transcode.h debug.h
-http-addrlist.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-http-addrlist.o: globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.o: i18n.h transcode.h debug.h
-http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-http-support.o: language.h i18n.h transcode.h
-ipp.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.o: debug.h
-ipp-support.o: globals.h string.h ../config.h http-private.h http.h md5.h
-ipp-support.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-ipp-support.o: i18n.h transcode.h debug.h
-langprintf.o: globals.h string.h ../config.h http-private.h http.h md5.h
-langprintf.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-langprintf.o: i18n.h transcode.h
-language.o: globals.h string.h ../config.h http-private.h http.h md5.h
-language.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-language.o: transcode.h debug.h
-localize.o: globals.h string.h ../config.h http-private.h http.h md5.h
-localize.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-localize.o: transcode.h debug.h
-mark.o: cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-mark.o: ../config.h debug.h
-md5.o: md5.h string.h ../config.h
-md5passwd.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-md5passwd.o: string.h
-notify.o: globals.h string.h ../config.h http-private.h http.h md5.h
-notify.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-notify.o: transcode.h
-options.o: cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-options.o: ../config.h debug.h
-page.o: ppd.h array.h file.h string.h ../config.h
-ppd.o: globals.h string.h ../config.h http-private.h http.h md5.h
-ppd.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-ppd.o: transcode.h debug.h
-request.o: globals.h string.h ../config.h http-private.h http.h md5.h
-request.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-request.o: transcode.h debug.h
-sidechannel.o: sidechannel.h string.h ../config.h
-snprintf.o: string.h ../config.h
-string.o: array.h debug.h string.h ../config.h
-tempfile.o: globals.h string.h ../config.h http-private.h http.h md5.h
-tempfile.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-tempfile.o: transcode.h debug.h
-transcode.o: globals.h string.h ../config.h http-private.h http.h md5.h
-transcode.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-transcode.o: i18n.h transcode.h debug.h
-usersys.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-usersys.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.o: transcode.h debug.h
-util.o: globals.h string.h ../config.h http-private.h http.h md5.h
-util.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-util.o: transcode.h debug.h
-testadmin.o: adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-testadmin.o: string.h ../config.h
-testarray.o: ../cups/string.h ../config.h string.h array.h dir.h debug.h
-testfile.o: string.h ../config.h file.h debug.h
-testhttp.o: http.h string.h ../config.h
-testi18n.o: i18n.h transcode.h language.h array.h string.h ../config.h
-testipp.o: ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testlang.o: i18n.h transcode.h language.h array.h
-testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h
-# DO NOT DELETE
-
-adminutil.32.o: adminutil.c adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-adminutil.32.o: adminutil.c globals.h string.h ../config.h http-private.h md5.h
-adminutil.32.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h
-array.32.o: array.c array.h string.h ../config.h debug.h
-attr.32.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h
-auth.32.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h
-auth.32.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-auth.32.o: auth.c transcode.h debug.h
-backchannel.32.o: backchannel.c cups.h ipp.h http.h ppd.h array.h file.h language.h
-backend.32.o: backend.c backend.h string.h ../config.h
-custom.32.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h
-custom.32.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-custom.32.o: custom.c transcode.h debug.h
-dest.32.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h
-dest.32.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-dest.32.o: dest.c transcode.h
-dir.32.o: dir.c dir.h string.h ../config.h debug.h
-emit.32.o: emit.c ppd.h array.h file.h string.h ../config.h debug.h
-encode.32.o: encode.c cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
-encode.32.o: encode.c string.h ../config.h debug.h
-file.32.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.32.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.32.o: file.c debug.h
-getifaddrs.32.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.32.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.32.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h
-globals.32.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-globals.32.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.32.o: globals.c transcode.h debug.h
-http.32.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.32.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.32.o: http.c debug.h
-http-addr.32.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h
-http-addr.32.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-http-addr.32.o: http-addr.c i18n.h transcode.h debug.h
-http-addrlist.32.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-http-addrlist.32.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.32.o: http-addrlist.c i18n.h transcode.h debug.h
-http-support.32.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.32.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-http-support.32.o: http-support.c language.h i18n.h transcode.h
-ipp.32.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.32.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.32.o: ipp.c debug.h
-ipp-support.32.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h
-ipp-support.32.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-ipp-support.32.o: ipp-support.c i18n.h transcode.h debug.h
-langprintf.32.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h
-langprintf.32.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-langprintf.32.o: langprintf.c i18n.h transcode.h
-language.32.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h
-language.32.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-language.32.o: language.c transcode.h debug.h
-localize.32.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h
-localize.32.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-localize.32.o: localize.c transcode.h debug.h
-mark.32.o: mark.c cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-mark.32.o: mark.c ../config.h debug.h
-md5.32.o: md5.c md5.h string.h ../config.h
-md5passwd.32.o: md5passwd.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-md5passwd.32.o: md5passwd.c string.h
-notify.32.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h
-notify.32.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-notify.32.o: notify.c transcode.h
-options.32.o: options.c cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-options.32.o: options.c ../config.h debug.h
-page.32.o: page.c ppd.h array.h file.h string.h ../config.h
-ppd.32.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h
-ppd.32.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-ppd.32.o: ppd.c transcode.h debug.h
-request.32.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h
-request.32.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-request.32.o: request.c transcode.h debug.h
-sidechannel.32.o: sidechannel.c sidechannel.h string.h ../config.h
-snprintf.32.o: snprintf.c string.h ../config.h
-string.32.o: string.c array.h debug.h string.h ../config.h
-tempfile.32.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h
-tempfile.32.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-tempfile.32.o: tempfile.c transcode.h debug.h
-transcode.32.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h
-transcode.32.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-transcode.32.o: transcode.c i18n.h transcode.h debug.h
-usersys.32.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-usersys.32.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.32.o: usersys.c transcode.h debug.h
-util.32.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h
-util.32.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-util.32.o: util.c transcode.h debug.h
-testadmin.32.o: testadmin.c adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-testadmin.32.o: testadmin.c string.h ../config.h
-testarray.32.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h
-testfile.32.o: testfile.c string.h ../config.h file.h debug.h
-testhttp.32.o: testhttp.c http.h string.h ../config.h
-testi18n.32.o: testi18n.c i18n.h transcode.h language.h array.h string.h ../config.h
-testipp.32.o: testipp.c ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testlang.32.o: testlang.c i18n.h transcode.h language.h array.h
-testppd.32.o: testppd.c ../cups/string.h ../config.h string.h ppd.h array.h file.h
-# DO NOT DELETE
-
-adminutil.64.o: adminutil.c adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-adminutil.64.o: adminutil.c globals.h string.h ../config.h http-private.h md5.h
-adminutil.64.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h
-array.64.o: array.c array.h string.h ../config.h debug.h
-attr.64.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h
-auth.64.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h
-auth.64.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-auth.64.o: auth.c transcode.h debug.h
-backchannel.64.o: backchannel.c cups.h ipp.h http.h ppd.h array.h file.h language.h
-backend.64.o: backend.c backend.h string.h ../config.h
-custom.64.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h
-custom.64.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-custom.64.o: custom.c transcode.h debug.h
-dest.64.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h
-dest.64.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-dest.64.o: dest.c transcode.h
-dir.64.o: dir.c dir.h string.h ../config.h debug.h
-emit.64.o: emit.c ppd.h array.h file.h string.h ../config.h debug.h
-encode.64.o: encode.c cups.h ipp.h http.h ppd.h array.h file.h language.h ipp-private.h
-encode.64.o: encode.c string.h ../config.h debug.h
-file.64.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.64.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.64.o: file.c debug.h
-getifaddrs.64.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.64.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-getputfile.64.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h
-globals.64.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-globals.64.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.64.o: globals.c transcode.h debug.h
-http.64.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.64.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.64.o: http.c debug.h
-http-addr.64.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h
-http-addr.64.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-http-addr.64.o: http-addr.c i18n.h transcode.h debug.h
-http-addrlist.64.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-http-addrlist.64.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.64.o: http-addrlist.c i18n.h transcode.h debug.h
-http-support.64.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h
-http-support.64.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h
-http-support.64.o: http-support.c language.h i18n.h transcode.h
-ipp.64.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.64.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.64.o: ipp.c debug.h
-ipp-support.64.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h
-ipp-support.64.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-ipp-support.64.o: ipp-support.c i18n.h transcode.h debug.h
-langprintf.64.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h
-langprintf.64.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-langprintf.64.o: langprintf.c i18n.h transcode.h
-language.64.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h
-language.64.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-language.64.o: language.c transcode.h debug.h
-localize.64.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h
-localize.64.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-localize.64.o: localize.c transcode.h debug.h
-mark.64.o: mark.c cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-mark.64.o: mark.c ../config.h debug.h
-md5.64.o: md5.c md5.h string.h ../config.h
-md5passwd.64.o: md5passwd.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-md5passwd.64.o: md5passwd.c string.h
-notify.64.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h
-notify.64.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-notify.64.o: notify.c transcode.h
-options.64.o: options.c cups.h ipp.h http.h ppd.h array.h file.h language.h string.h
-options.64.o: options.c ../config.h debug.h
-page.64.o: page.c ppd.h array.h file.h string.h ../config.h
-ppd.64.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h
-ppd.64.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-ppd.64.o: ppd.c transcode.h debug.h
-request.64.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h
-request.64.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-request.64.o: request.c transcode.h debug.h
-sidechannel.64.o: sidechannel.c sidechannel.h string.h ../config.h
-snprintf.64.o: snprintf.c string.h ../config.h
-string.64.o: string.c array.h debug.h string.h ../config.h
-tempfile.64.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h
-tempfile.64.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-tempfile.64.o: tempfile.c transcode.h debug.h
-transcode.64.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h
-transcode.64.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-transcode.64.o: transcode.c i18n.h transcode.h debug.h
-usersys.64.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
-usersys.64.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.64.o: usersys.c transcode.h debug.h
-util.64.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h
-util.64.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h
-util.64.o: util.c transcode.h debug.h
-testadmin.64.o: testadmin.c adminutil.h cups.h ipp.h http.h ppd.h array.h file.h language.h
-testadmin.64.o: testadmin.c string.h ../config.h
-testarray.64.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h
-testfile.64.o: testfile.c string.h ../config.h file.h debug.h
-testhttp.64.o: testhttp.c http.h string.h ../config.h
-testi18n.64.o: testi18n.c i18n.h transcode.h language.h array.h string.h ../config.h
-testipp.64.o: testipp.c ../cups/string.h ../config.h string.h ipp-private.h ipp.h http.h
-testlang.64.o: testlang.c i18n.h transcode.h language.h array.h
-testppd.64.o: testppd.c ../cups/string.h ../config.h string.h ppd.h array.h file.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+adminutil.o: adminutil.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h globals.h string.h \
+ http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+array.o: array.c array.h string.h ../config.h string.h debug.h
+attr.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h string.h
+auth.o: auth.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+backchannel.o: backchannel.c cups.h ipp.h http.h string.h ../config.h \
+ ppd.h array.h file.h language.h
+backend.o: backend.c backend.h string.h ../config.h string.h
+custom.o: custom.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+dest.o: dest.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+dir.o: dir.c dir.h string.h ../config.h string.h debug.h
+emit.o: emit.c ppd.h array.h file.h string.h ../config.h string.h debug.h
+encode.o: encode.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h ipp-private.h string.h debug.h
+file.o: file.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+getifaddrs.o: getifaddrs.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h
+getputfile.o: getputfile.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ string.h debug.h
+globals.o: globals.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http.o: http.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http-addr.o: http-addr.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+http-addrlist.o: http-addrlist.c http-private.h ../config.h http.h \
+ string.h md5.h ipp-private.h ipp.h globals.h string.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h debug.h
+http-support.o: http-support.c debug.h globals.h string.h ../config.h \
+ string.h http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h
+ipp.o: ipp.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+ipp-support.o: ipp-support.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+langprintf.o: langprintf.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h
+language.o: language.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+localize.o: localize.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+mark.o: mark.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h string.h debug.h
+md5.o: md5.c md5.h string.h ../config.h string.h
+md5passwd.o: md5passwd.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h string.h
+notify.o: notify.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+options.o: options.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h string.h debug.h
+page.o: page.c ppd.h array.h file.h string.h ../config.h string.h
+ppd.o: ppd.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+request.o: request.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+sidechannel.o: sidechannel.c sidechannel.h string.h ../config.h string.h
+snprintf.o: snprintf.c string.h ../config.h string.h
+string.o: string.c array.h debug.h string.h ../config.h string.h
+tempfile.o: tempfile.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+transcode.o: transcode.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+usersys.o: usersys.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+util.o: util.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+testadmin.o: testadmin.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h string.h
+testarray.o: testarray.c ../cups/string.h ../config.h string.h array.h \
+ dir.h debug.h
+testcups.o: testcups.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h
+testfile.o: testfile.c string.h ../config.h string.h file.h debug.h
+testhttp.o: testhttp.c http.h string.h ../config.h string.h
+testi18n.o: testi18n.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testipp.o: testipp.c ../cups/string.h ../config.h string.h ipp-private.h \
+ ipp.h http.h
+testlang.o: testlang.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testppd.o: testppd.c ../cups/string.h ../config.h string.h ppd.h array.h \
+ file.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+adminutil.32.o: adminutil.c adminutil.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h globals.h string.h \
+ http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+array.32.o: array.c array.c array.h string.h ../config.h string.h debug.h
+attr.32.o: attr.c attr.c ppd.h array.h file.h debug.h string.h ../config.h string.h
+auth.32.o: auth.c auth.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+backchannel.32.o: backchannel.c backchannel.c cups.h ipp.h http.h string.h ../config.h \
+ ppd.h array.h file.h language.h
+backend.32.o: backend.c backend.c backend.h string.h ../config.h string.h
+custom.32.o: custom.c custom.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+dest.32.o: dest.c dest.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+dir.32.o: dir.c dir.c dir.h string.h ../config.h string.h debug.h
+emit.32.o: emit.c emit.c ppd.h array.h file.h string.h ../config.h string.h debug.h
+encode.32.o: encode.c encode.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h ipp-private.h string.h debug.h
+file.32.o: file.c file.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+getifaddrs.32.o: getifaddrs.c getifaddrs.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h
+getputfile.32.o: getputfile.c getputfile.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ string.h debug.h
+globals.32.o: globals.c globals.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http.32.o: http.c http.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http-addr.32.o: http-addr.c http-addr.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+http-addrlist.32.o: http-addrlist.c http-addrlist.c http-private.h ../config.h http.h \
+ string.h md5.h ipp-private.h ipp.h globals.h string.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h debug.h
+http-support.32.o: http-support.c http-support.c debug.h globals.h string.h ../config.h \
+ string.h http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h
+ipp.32.o: ipp.c ipp.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+ipp-support.32.o: ipp-support.c ipp-support.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+langprintf.32.o: langprintf.c langprintf.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h
+language.32.o: language.c language.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+localize.32.o: localize.c localize.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+mark.32.o: mark.c mark.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h string.h debug.h
+md5.32.o: md5.c md5.c md5.h string.h ../config.h string.h
+md5passwd.32.o: md5passwd.c md5passwd.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h string.h
+notify.32.o: notify.c notify.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+options.32.o: options.c options.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h string.h debug.h
+page.32.o: page.c page.c ppd.h array.h file.h string.h ../config.h string.h
+ppd.32.o: ppd.c ppd.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+request.32.o: request.c request.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+sidechannel.32.o: sidechannel.c sidechannel.c sidechannel.h string.h ../config.h string.h
+snprintf.32.o: snprintf.c snprintf.c string.h ../config.h string.h
+string.32.o: string.c string.c array.h debug.h string.h ../config.h string.h
+tempfile.32.o: tempfile.c tempfile.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+transcode.32.o: transcode.c transcode.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+usersys.32.o: usersys.c usersys.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+util.32.o: util.c util.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+testadmin.32.o: testadmin.c testadmin.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h string.h
+testarray.32.o: testarray.c testarray.c ../cups/string.h ../config.h string.h array.h \
+ dir.h debug.h
+testcups.32.o: testcups.c testcups.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h
+testfile.32.o: testfile.c testfile.c string.h ../config.h string.h file.h debug.h
+testhttp.32.o: testhttp.c testhttp.c http.h string.h ../config.h string.h
+testi18n.32.o: testi18n.c testi18n.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testipp.32.o: testipp.c testipp.c ../cups/string.h ../config.h string.h ipp-private.h \
+ ipp.h http.h
+testlang.32.o: testlang.c testlang.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testppd.32.o: testppd.c testppd.c ../cups/string.h ../config.h string.h ppd.h array.h \
+ file.h
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+adminutil.64.o: adminutil.c adminutil.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h globals.h string.h \
+ http-private.h md5.h ipp-private.h i18n.h transcode.h debug.h
+array.64.o: array.c array.c array.h string.h ../config.h string.h debug.h
+attr.64.o: attr.c attr.c ppd.h array.h file.h debug.h string.h ../config.h string.h
+auth.64.o: auth.c auth.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+backchannel.64.o: backchannel.c backchannel.c cups.h ipp.h http.h string.h ../config.h \
+ ppd.h array.h file.h language.h
+backend.64.o: backend.c backend.c backend.h string.h ../config.h string.h
+custom.64.o: custom.c custom.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+dest.64.o: dest.c dest.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+dir.64.o: dir.c dir.c dir.h string.h ../config.h string.h debug.h
+emit.64.o: emit.c emit.c ppd.h array.h file.h string.h ../config.h string.h debug.h
+encode.64.o: encode.c encode.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h ipp-private.h string.h debug.h
+file.64.o: file.c file.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+getifaddrs.64.o: getifaddrs.c getifaddrs.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h
+getputfile.64.o: getputfile.c getputfile.c http-private.h ../config.h http.h string.h \
+ md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ string.h debug.h
+globals.64.o: globals.c globals.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http.64.o: http.c http.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+http-addr.64.o: http-addr.c http-addr.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+http-addrlist.64.o: http-addrlist.c http-addrlist.c http-private.h ../config.h http.h \
+ string.h md5.h ipp-private.h ipp.h globals.h string.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h debug.h
+http-support.64.o: http-support.c http-support.c debug.h globals.h string.h ../config.h \
+ string.h http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h \
+ array.h file.h language.h i18n.h transcode.h
+ipp.64.o: ipp.c ipp.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+ipp-support.64.o: ipp-support.c ipp-support.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+langprintf.64.o: langprintf.c langprintf.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h
+language.64.o: language.c language.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+localize.64.o: localize.c localize.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+mark.64.o: mark.c mark.c cups.h ipp.h http.h string.h ../config.h ppd.h array.h \
+ file.h language.h string.h debug.h
+md5.64.o: md5.c md5.c md5.h string.h ../config.h string.h
+md5passwd.64.o: md5passwd.c md5passwd.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h string.h
+notify.64.o: notify.c notify.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h
+options.64.o: options.c options.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h string.h debug.h
+page.64.o: page.c page.c ppd.h array.h file.h string.h ../config.h string.h
+ppd.64.o: ppd.c ppd.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+request.64.o: request.c request.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+sidechannel.64.o: sidechannel.c sidechannel.c sidechannel.h string.h ../config.h string.h
+snprintf.64.o: snprintf.c snprintf.c string.h ../config.h string.h
+string.64.o: string.c string.c array.h debug.h string.h ../config.h string.h
+tempfile.64.o: tempfile.c tempfile.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+transcode.64.o: transcode.c transcode.c globals.h string.h ../config.h string.h \
+ http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h \
+ file.h language.h i18n.h transcode.h debug.h
+usersys.64.o: usersys.c usersys.c http-private.h ../config.h http.h string.h md5.h \
+ ipp-private.h ipp.h globals.h string.h cups.h ppd.h array.h file.h \
+ language.h i18n.h transcode.h debug.h
+util.64.o: util.c util.c globals.h string.h ../config.h string.h http-private.h \
+ http.h md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h \
+ i18n.h transcode.h debug.h
+testadmin.64.o: testadmin.c testadmin.c adminutil.h cups.h ipp.h http.h string.h \
+ ../config.h ppd.h array.h file.h language.h string.h
+testarray.64.o: testarray.c testarray.c ../cups/string.h ../config.h string.h array.h \
+ dir.h debug.h
+testcups.64.o: testcups.c testcups.c cups.h ipp.h http.h string.h ../config.h ppd.h \
+ array.h file.h language.h
+testfile.64.o: testfile.c testfile.c string.h ../config.h string.h file.h debug.h
+testhttp.64.o: testhttp.c testhttp.c http.h string.h ../config.h string.h
+testi18n.64.o: testi18n.c testi18n.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testipp.64.o: testipp.c testipp.c ../cups/string.h ../config.h string.h ipp-private.h \
+ ipp.h http.h
+testlang.64.o: testlang.c testlang.c i18n.h transcode.h language.h array.h string.h \
+ ../config.h string.h
+testppd.64.o: testppd.c testppd.c ../cups/string.h ../config.h string.h ppd.h array.h \
+ file.h
diff --git a/cups/Makefile b/cups/Makefile
index c78edbffb..1095c789c 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6603 2007-06-22 22:23:21Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# API library Makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2006 by Easy Software Products, all rights reserved.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
# This file is subject to the Apple OS-Developed Software exception.
#
@@ -471,5 +462,5 @@ include Dependencies
#
-# End of "$Id: Makefile 6603 2007-06-22 22:23:21Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/cups/adminutil.c b/cups/adminutil.c
index 57a656d94..20a97af30 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,26 +1,17 @@
/*
- * "$Id: adminutil.c 6549 2007-06-04 15:32:58Z mike $"
+ * "$Id: adminutil.c 6649 2007-07-11 21:46:42Z mike $"
*
* Administration utility API definitions for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2001-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -676,12 +667,15 @@ cupsAdminExportSamba(
"are installed!")),
sizeof(message));
- _cupsSetError(IPP_INTERNAL_ERROR, message);
+ _cupsSetError(IPP_NOT_FOUND, message);
_cupsLangPrintf(logfile, "%s\n", message);
}
if (have_drivers == 0)
+ {
+ _cupsSetError(IPP_NOT_FOUND, message);
return (0);
+ }
/*
* Finally, associate the drivers we just added with the queue...
@@ -2216,5 +2210,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */
/*
- * End of "$Id: adminutil.c 6549 2007-06-04 15:32:58Z mike $".
+ * End of "$Id: adminutil.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/adminutil.h b/cups/adminutil.h
index 4b2bd7a95..94484fcc8 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,5 +1,5 @@
/*
- * "$Id: adminutil.h 6378 2007-03-21 07:18:18Z mike $"
+ * "$Id: adminutil.h 6649 2007-07-11 21:46:42Z mike $"
*
* Administration utility API definitions for the Common UNIX Printing
* System (CUPS).
@@ -7,23 +7,14 @@
* MANY OF THE FUNCTIONS IN THIS HEADER ARE PRIVATE AND SUBJECT TO
* CHANGE AT ANY TIME. USE AT YOUR OWN RISK.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2001-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -86,5 +77,5 @@ extern int cupsAdminSetServerSettings(http_t *http,
#endif /* !_CUPS_ADMINUTIL_H_ */
/*
- * End of "$Id: adminutil.h 6378 2007-03-21 07:18:18Z mike $".
+ * End of "$Id: adminutil.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/api-array.shtml b/cups/api-array.shtml
index 433ce5d28..355aa4822 100644
--- a/cups/api-array.shtml
+++ b/cups/api-array.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml
index e53b36ef7..483feb30b 100644
--- a/cups/api-cups.shtml
+++ b/cups/api-cups.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml
index 3e6e94433..b356e655c 100644
--- a/cups/api-filedir.shtml
+++ b/cups/api-filedir.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml
index 66b65267e..0eda305c7 100644
--- a/cups/api-filter.shtml
+++ b/cups/api-filter.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml
index 9b860bfd3..93e34f934 100644
--- a/cups/api-httpipp.shtml
+++ b/cups/api-httpipp.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml
index 4dcd74909..497e7ae6b 100644
--- a/cups/api-ppd.shtml
+++ b/cups/api-ppd.shtml
@@ -1,25 +1,16 @@
Introduction
diff --git a/cups/array.c b/cups/array.c
index 50223a5ae..5728d51e4 100644
--- a/cups/array.c
+++ b/cups/array.c
@@ -1,25 +1,16 @@
/*
- * "$Id: array.c 6477 2007-04-25 19:55:45Z mike $"
+ * "$Id: array.c 6649 2007-07-11 21:46:42Z mike $"
*
* Sorted array routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1062,5 +1053,5 @@ cups_array_find(cups_array_t *a, /* I - Array */
/*
- * End of "$Id: array.c 6477 2007-04-25 19:55:45Z mike $".
+ * End of "$Id: array.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/array.h b/cups/array.h
index 47d28b930..2d1b89f47 100644
--- a/cups/array.h
+++ b/cups/array.h
@@ -1,25 +1,16 @@
/*
- * "$Id: array.h 6477 2007-04-25 19:55:45Z mike $"
+ * "$Id: array.h 6649 2007-07-11 21:46:42Z mike $"
*
* Sorted array definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -88,5 +79,5 @@ extern void *cupsArrayUserData(cups_array_t *a);
#endif /* !_CUPS_ARRAY_H_ */
/*
- * End of "$Id: array.h 6477 2007-04-25 19:55:45Z mike $".
+ * End of "$Id: array.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/attr.c b/cups/attr.c
index 84b1041c5..d65b3ef45 100644
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,26 +1,17 @@
/*
- * "$Id: attr.c 5825 2006-08-15 19:03:49Z mike $"
+ * "$Id: attr.c 6649 2007-07-11 21:46:42Z mike $"
*
* PPD model-specific attribute routines for the Common UNIX Printing System
* (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -163,5 +154,5 @@ ppdFindNextAttr(ppd_file_t *ppd, /* I - PPD file data */
/*
- * End of "$Id: attr.c 5825 2006-08-15 19:03:49Z mike $".
+ * End of "$Id: attr.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/auth.c b/cups/auth.c
index 7a3f324c9..0c7692cc0 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,28 +1,19 @@
/*
- * "$Id: auth.c 6499 2007-04-30 21:44:43Z mike $"
+ * "$Id: auth.c 6673 2007-07-14 00:16:39Z mike $"
*
* Authentication functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* This file contains Kerberos support code, copyright 2006 by
* Jelmer Vernooij.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -61,6 +52,10 @@ extern const char *cssmErrorString(int error);
# endif /* HAVE_SECBASEPRIV_H */
#endif /* HAVE_AUTHORIZATION_H */
+#if defined(SO_PEERCRED) && defined(AF_LOCAL)
+# include
+#endif /* SO_PEERCRED && AF_LOCAL */
+
/*
* Local functions...
@@ -181,6 +176,13 @@ cupsDoAuthentication(http_t *http, /* I - HTTP connection to server */
if (!strncmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate", 9))
{
+ if (http->status == HTTP_UNAUTHORIZED && http->digest_tries >= 3)
+ {
+ DEBUG_printf(("cupsDoAuthentication: too many Negotiate tries (%d)\n",
+ http->digest_tries));
+
+ return (-1);
+ }
#ifdef HAVE_GSSAPI
/*
* Kerberos authentication...
@@ -239,20 +241,19 @@ cupsDoAuthentication(http_t *http, /* I - HTTP connection to server */
* back into gss via input_token...
*/
}
- else
+
+ if (http->gssctx != GSS_C_NO_CONTEXT)
{
- if (http->gssctx != GSS_C_NO_CONTEXT)
- {
- major_status = gss_delete_sec_context(&minor_status, &http->gssctx,
- GSS_C_NO_BUFFER);
- http->gssctx = GSS_C_NO_CONTEXT;
- }
+ major_status = gss_delete_sec_context(&minor_status, &http->gssctx,
+ GSS_C_NO_BUFFER);
+ http->gssctx = GSS_C_NO_CONTEXT;
}
major_status = gss_init_sec_context(&minor_status, GSS_C_NO_CREDENTIAL,
&http->gssctx,
http->gssname, http->gssmech,
- GSS_C_MUTUAL_FLAG, GSS_C_INDEFINITE,
+ GSS_C_DELEG_FLAG | GSS_C_MUTUAL_FLAG,
+ GSS_C_INDEFINITE,
GSS_C_NO_CHANNEL_BINDINGS,
&input_token, &http->gssmech,
&output_token, NULL, NULL);
@@ -381,19 +382,27 @@ cups_get_gss_creds(
{
gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
/* Service token */
- OM_uint32 major_status, /* Major status code */
- minor_status; /* Minor status code */
- gss_name_t server_name; /* Server name */
- char buf[1024], /* Name buffer */
- fqdn[HTTP_MAX_URI]; /* Server name buffer */
+ OM_uint32 major_status, /* Major status code */
+ minor_status; /* Minor status code */
+ gss_name_t server_name; /* Server name */
+ char buf[1024], /* Name buffer */
+ fqdn[HTTP_MAX_URI]; /* Server name buffer */
+
+
+ /*
+ * Get the hostname...
+ */
+ httpGetHostname(http, fqdn, sizeof(fqdn));
+
+ if (!strcmp(fqdn, "localhost"))
+ httpGetHostname(NULL, fqdn, sizeof(fqdn));
/*
* Get a server name we can use for authentication purposes...
*/
- snprintf(buf, sizeof(buf), "%s@%s", service_name,
- httpGetHostname(http, fqdn, sizeof(fqdn)));
+ snprintf(buf, sizeof(buf), "%s@%s", service_name, fqdn);
token.value = buf;
token.length = strlen(buf);
@@ -422,7 +431,7 @@ cups_get_gss_creds(
*/
static int /* O - 0 if available */
- /* 1 if not available */
+ /* 1 if not available */
/* -1 error */
cups_local_auth(http_t *http) /* I - HTTP connection to server */
{
@@ -431,14 +440,14 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
* Currently WIN32 and OS-2 do not support the CUPS server...
*/
- return (-1);
+ return (1);
#else
int pid; /* Current process ID */
FILE *fp; /* Certificate file */
char filename[1024], /* Certificate filename */
certificate[33];/* Certificate string */
_cups_globals_t *cg = _cupsGlobals(); /* Global data */
-#if defined(HAVE_AUTHORIZATION_H)
+# if defined(HAVE_AUTHORIZATION_H)
OSStatus status; /* Status */
AuthorizationItem auth_right; /* Authorization right */
AuthorizationRights auth_rights; /* Authorization rights */
@@ -446,7 +455,7 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
AuthorizationExternalForm auth_extrn; /* Authorization ref external */
char auth_key[1024]; /* Buffer */
char buffer[1024]; /* Buffer */
-#endif /* HAVE_AUTHORIZATION_H */
+# endif /* HAVE_AUTHORIZATION_H */
DEBUG_printf(("cups_local_auth(http=%p) hostaddr=%s, hostname=\"%s\"\n",
@@ -460,10 +469,10 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
strcasecmp(http->hostname, "localhost") != 0)
{
DEBUG_puts("cups_local_auth: Not a local connection!");
- return (-1);
+ return (1);
}
-#if defined(HAVE_AUTHORIZATION_H)
+# if defined(HAVE_AUTHORIZATION_H)
/*
* Delete any previous authorization reference...
*/
@@ -534,7 +543,7 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
* Fall through to try certificates...
*/
}
-#endif /* HAVE_AUTHORIZATION_H */
+# endif /* HAVE_AUTHORIZATION_H */
/*
* Try opening a certificate file for this PID. If that fails,
@@ -548,6 +557,22 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
DEBUG_printf(("cups_local_auth: Unable to open file %s: %s\n",
filename, strerror(errno)));
+#ifdef HAVE_GSSAPI
+ /*
+ * If local certificate authentication isn't available for this PID,
+ * check if we need Kerberos authentication...
+ */
+
+ if (!strcmp(http->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Negotiate"))
+ {
+ /*
+ * Yes, don't try the root certificate...
+ */
+
+ return (1);
+ }
+#endif /* HAVE_GSSAPI */
+
snprintf(filename, sizeof(filename), "%s/certs/0", cg->cups_statedir);
fp = fopen(filename, "r");
}
@@ -565,7 +590,7 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
* Set the authorization string and return...
*/
- http->authstring = malloc(strlen(certificate) + 10);
+ http->authstring = malloc(strlen(certificate) + 7);
sprintf(http->authstring, "Local %s", certificate);
/* Copy back to _authstring for backwards compatibility */
@@ -577,11 +602,46 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */
return (0);
}
+# if defined(SO_PEERCRED) && defined(AF_LOCAL)
+ /*
+ * See if we can authenticate using the peer credentials provided over a
+ * domain socket; if so, specify "PeerCred username" as the authentication
+ * information...
+ */
+
+ if (http->hostaddr->addr.sa_family == AF_LOCAL &&
+ !getenv("GATEWAY_INTERFACE")) /* Not via CGI programs... */
+ {
+ /*
+ * Verify that the current cupsUser() matches the current UID...
+ */
+
+ struct passwd *pwd; /* Password information */
+ const char *username; /* Current username */
+
+ username = cupsUser();
+
+ if ((pwd = getpwnam(username)) != NULL && pwd->pw_uid == getuid())
+ {
+ http->authstring = malloc(strlen(username) + 10);
+ sprintf(http->authstring, "PeerCred %s", username);
+
+ /* Copy back to _authstring for backwards compatibility */
+ strlcpy(http->_authstring, http->authstring, sizeof(http->_authstring));
+
+ DEBUG_printf(("cups_local_auth: Returning authstring = \"%s\"\n",
+ http->authstring));
+
+ return (0);
+ }
+ }
+# endif /* SO_PEERCRED && AF_LOCAL */
+
return (1);
#endif /* WIN32 || __EMX__ */
}
/*
- * End of "$Id: auth.c 6499 2007-04-30 21:44:43Z mike $".
+ * End of "$Id: auth.c 6673 2007-07-14 00:16:39Z mike $".
*/
diff --git a/cups/backchannel.c b/cups/backchannel.c
index cfb22aa5c..9b702172f 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -1,25 +1,16 @@
/*
- * "$Id: backchannel.c 6190 2007-01-10 16:48:27Z mike $"
+ * "$Id: backchannel.c 6649 2007-07-11 21:46:42Z mike $"
*
* Backchannel functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -205,5 +196,5 @@ cups_setup(fd_set *set, /* I - Set for select() */
/*
- * End of "$Id: backchannel.c 6190 2007-01-10 16:48:27Z mike $".
+ * End of "$Id: backchannel.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/backend.c b/cups/backend.c
index 68d234d12..992bc5d03 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,25 +1,16 @@
/*
- * "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $"
+ * "$Id: backend.c 6649 2007-07-11 21:46:42Z mike $"
*
* Backend functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -63,5 +54,5 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */
/*
- * End of "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $".
+ * End of "$Id: backend.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/backend.h b/cups/backend.h
index ca107c93f..78081d4e5 100644
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -1,25 +1,16 @@
/*
- * "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id: backend.h 6649 2007-07-11 21:46:42Z mike $"
*
* Backend definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -53,5 +44,5 @@ extern const char *cupsBackendDeviceURI(char **argv);
#endif /* !_CUPS_BACKEND_H_ */
/*
- * End of "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id: backend.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/cups.h b/cups/cups.h
index 1e446cf05..befa0a395 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,25 +1,16 @@
/*
- * "$Id: cups.h 6590 2007-06-21 18:22:22Z mike $"
+ * "$Id: cups.h 6658 2007-07-13 01:13:26Z mike $"
*
* API definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -108,7 +99,7 @@ enum cups_ptype_e /* Not a typedef'd enum so we can OR */
CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication @since CUPS 1.2@ */
CUPS_PRINTER_COMMANDS = 0x800000, /* Printer supports maintenance commands @since CUPS 1.2@ */
CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered and added @since CUPS 1.3@ */
- CUPS_PRINTER_OPTIONS = 0xe6fffc /* ~(CLASS | REMOTE | IMPLICIT) */
+ CUPS_PRINTER_OPTIONS = 0x6fffc /* ~(CLASS | REMOTE | IMPLICIT | DEFAULT | FAX | REJECTING | DELETE | NOT_SHARED | AUTHENTICATED | COMMANDS | DISCOVERED) */
};
typedef const char *(*cups_password_cb_t)(const char *);
@@ -265,5 +256,5 @@ extern void cupsSetDefaultDest(const char *name,
#endif /* !_CUPS_CUPS_H_ */
/*
- * End of "$Id: cups.h 6590 2007-06-21 18:22:22Z mike $".
+ * End of "$Id: cups.h 6658 2007-07-13 01:13:26Z mike $".
*/
diff --git a/cups/custom.c b/cups/custom.c
index 23008e93c..92bdcdc90 100644
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -1,25 +1,16 @@
/*
- * "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $"
+ * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $"
*
* PPD custom option routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -123,5 +114,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */
/*
- * End of "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $".
+ * End of "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/debug.h b/cups/debug.h
index 65b1fa224..074384b65 100644
--- a/cups/debug.h
+++ b/cups/debug.h
@@ -1,25 +1,16 @@
/*
- * "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $"
+ * "$Id: debug.h 6649 2007-07-11 21:46:42Z mike $"
*
* Debugging macros for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -55,5 +46,5 @@
#endif /* !_CUPS_DEBUG_H_ */
/*
- * End of "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $".
+ * End of "$Id: debug.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/dest.c b/cups/dest.c
index 016ec8246..afc4ea0c4 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,26 +1,17 @@
/*
- * "$Id: dest.c 6386 2007-03-23 19:03:01Z mike $"
+ * "$Id: dest.c 6649 2007-07-11 21:46:42Z mike $"
*
* User-defined destination (and option) support for the Common UNIX
* Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1302,5 +1293,5 @@ cups_get_sdests(http_t *http, /* I - HTTP connection */
/*
- * End of "$Id: dest.c 6386 2007-03-23 19:03:01Z mike $".
+ * End of "$Id: dest.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/dir.c b/cups/dir.c
index c130bd865..b3a689b70 100644
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -5,23 +5,14 @@
*
* This set of APIs abstracts enumeration of directory entries.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
diff --git a/cups/dir.h b/cups/dir.h
index ac5c5fc08..9b5eb3cef 100644
--- a/cups/dir.h
+++ b/cups/dir.h
@@ -5,23 +5,14 @@
*
* This set of APIs abstracts enumeration of directory entries.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_DIR_H_
diff --git a/cups/emit.c b/cups/emit.c
index 8eea05dfd..b57183a93 100644
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,25 +1,16 @@
/*
- * "$Id: emit.c 6190 2007-01-10 16:48:27Z mike $"
+ * "$Id: emit.c 6649 2007-07-11 21:46:42Z mike $"
*
* PPD code emission routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -955,5 +946,5 @@ ppd_sort(ppd_choice_t **c1, /* I - First choice */
/*
- * End of "$Id: emit.c 6190 2007-01-10 16:48:27Z mike $".
+ * End of "$Id: emit.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/encode.c b/cups/encode.c
index 686fb648a..c18359801 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,25 +1,16 @@
/*
- * "$Id: encode.c 6386 2007-03-23 19:03:01Z mike $"
+ * "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $"
*
* Option encoding routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -573,5 +564,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */
/*
- * End of "$Id: encode.c 6386 2007-03-23 19:03:01Z mike $".
+ * End of "$Id: encode.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/file.c b/cups/file.c
index 2eac3a3cd..9ad5ee1b3 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -1,5 +1,5 @@
/*
- * "$Id: file.c 6311 2007-02-27 14:43:39Z mike $"
+ * "$Id: file.c 6649 2007-07-11 21:46:42Z mike $"
*
* File functions for the Common UNIX Printing System (CUPS).
*
@@ -8,23 +8,14 @@
* our own file functions allows us to provide transparent support of
* gzip'd print files, PPD files, etc.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -2135,5 +2126,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */
/*
- * End of "$Id: file.c 6311 2007-02-27 14:43:39Z mike $".
+ * End of "$Id: file.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/file.h b/cups/file.h
index a0ffd918e..89b6c4079 100644
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,5 +1,5 @@
/*
- * "$Id: file.h 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: file.h 6649 2007-07-11 21:46:42Z mike $"
*
* Public file definitions for the Common UNIX Printing System (CUPS).
*
@@ -8,23 +8,14 @@
* our own file functions allows us to provide transparent support of
* gzip'd print files, PPD files, etc.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_FILE_H_
@@ -109,5 +100,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes);
#endif /* !_CUPS_FILE_H_ */
/*
- * End of "$Id: file.h 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: file.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 7653cfde9..d5b602988 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,26 +1,17 @@
/*
- * "$Id: getifaddrs.c 5503 2006-05-10 18:55:39Z mike $"
+ * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $"
*
* Network interface functions for the Common UNIX Printing System
* (CUPS) scheduler.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* "LICENSE" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -272,5 +263,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
/*
- * End of "$Id: getifaddrs.c 5503 2006-05-10 18:55:39Z mike $".
+ * End of "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/getputfile.c b/cups/getputfile.c
index dc8fedcc9..8990751ee 100644
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,25 +1,16 @@
/*
- * "$Id: getputfile.c 5633 2006-06-06 14:47:42Z mike $"
+ * "$Id: getputfile.c 6649 2007-07-11 21:46:42Z mike $"
*
* Get/put file functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -488,5 +479,5 @@ cupsPutFile(http_t *http, /* I - HTTP connection to server */
/*
- * End of "$Id: getputfile.c 5633 2006-06-06 14:47:42Z mike $".
+ * End of "$Id: getputfile.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/globals.c b/cups/globals.c
index 4b09a427d..53dcb0985 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,25 +1,16 @@
/*
- * "$Id: globals.c 6499 2007-04-30 21:44:43Z mike $"
+ * "$Id: globals.c 6649 2007-07-11 21:46:42Z mike $"
*
* Global variable access routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -226,5 +217,5 @@ _cupsGlobals(void)
/*
- * End of "$Id: globals.c 6499 2007-04-30 21:44:43Z mike $".
+ * End of "$Id: globals.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/globals.h b/cups/globals.h
index 09fdbcad9..1be579cbc 100644
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,25 +1,16 @@
/*
- * "$Id: globals.h 6499 2007-04-30 21:44:43Z mike $"
+ * "$Id: globals.h 6649 2007-07-11 21:46:42Z mike $"
*
* Global variable definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -148,5 +139,5 @@ extern void _cupsSetError(ipp_status_t status, const char *message);
#endif /* !_CUPS_GLOBALS_H_ */
/*
- * End of "$Id: globals.h 6499 2007-04-30 21:44:43Z mike $".
+ * End of "$Id: globals.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http-addr.c b/cups/http-addr.c
index f0d5fb37e..14e6112de 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,25 +1,16 @@
/*
- * "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $"
+ * "$Id: http-addr.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTTP address routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -562,5 +553,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
/*
- * End of "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $".
+ * End of "$Id: http-addr.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 07b1b6739..8f8e5c06f 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -1,25 +1,16 @@
/*
- * "$Id: http-addrlist.c 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: http-addrlist.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTTP address list routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
@@ -605,5 +596,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p
/*
- * End of "$Id: http-addrlist.c 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: http-addrlist.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http-private.h b/cups/http-private.h
index fdf3d2da5..cd46bb31f 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,25 +1,16 @@
/*
- * "$Id: http-private.h 6499 2007-04-30 21:44:43Z mike $"
+ * "$Id: http-private.h 6649 2007-07-11 21:46:42Z mike $"
*
* Private HTTP definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -272,5 +263,5 @@ extern void _cups_freeifaddrs(struct ifaddrs *addrs);
#endif /* !_CUPS_HTTP_PRIVATE_H_ */
/*
- * End of "$Id: http-private.h 6499 2007-04-30 21:44:43Z mike $".
+ * End of "$Id: http-private.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http-support.c b/cups/http-support.c
index 7750b208e..3382d483d 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,25 +1,16 @@
/*
- * "$Id: http-support.c 6304 2007-02-22 22:06:23Z mike $"
+ * "$Id: http-support.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1327,5 +1318,5 @@ http_copy_encode(char *dst, /* O - Destination buffer */
/*
- * End of "$Id: http-support.c 6304 2007-02-22 22:06:23Z mike $".
+ * End of "$Id: http-support.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http.c b/cups/http.c
index 251321d51..b2de909e5 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,28 +1,19 @@
/*
- * "$Id: http.c 6499 2007-04-30 21:44:43Z mike $"
+ * "$Id: http.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTTP routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* This file contains Kerberos support code, copyright 2006 by
* Jelmer Vernooij.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -2582,7 +2573,7 @@ http_send(http_t *http, /* I - HTTP connection */
* The Kerberos and AuthRef authentication strings can only be used once...
*/
- if (http->authstring &&
+ if (http->field_authorization && http->authstring &&
(!strncmp(http->authstring, "Negotiate", 9) ||
!strncmp(http->authstring, "AuthRef", 7)))
{
@@ -2863,6 +2854,7 @@ http_upgrade(http_t *http) /* I - HTTP connection */
http->_data_remaining = myhttp._data_remaining;
http->expect = myhttp.expect;
http->field_authorization = myhttp.field_authorization;
+ http->digest_tries = myhttp.digest_tries;
/*
* See if we actually went secure...
@@ -3163,5 +3155,5 @@ http_write_ssl(http_t *http, /* I - HTTP connection */
/*
- * End of "$Id: http.c 6499 2007-04-30 21:44:43Z mike $".
+ * End of "$Id: http.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/http.h b/cups/http.h
index babe4240b..72c243ec6 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,26 +1,17 @@
/*
- * "$Id: http.h 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: http.h 6649 2007-07-11 21:46:42Z mike $"
*
* Hyper-Text Transport Protocol definitions for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -64,6 +55,9 @@ typedef off_t ssize_t; /* @private@ */
# ifdef AF_LOCAL
# include
# endif /* AF_LOCAL */
+# if defined(LOCAL_PEERCRED) && !defined(SO_PEERCRED)
+# define SO_PEERCRED LOCAL_PEERCRED
+# endif /* LOCAL_PEERCRED && !SO_PEERCRED */
# endif /* WIN32 */
/*
@@ -459,5 +453,5 @@ extern ssize_t httpWrite2(http_t *http, const char *buffer,
#endif /* !_CUPS_HTTP_H_ */
/*
- * End of "$Id: http.h 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: http.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/i18n.h b/cups/i18n.h
index ea7c0e231..2e18790f7 100644
--- a/cups/i18n.h
+++ b/cups/i18n.h
@@ -1,25 +1,16 @@
/*
- * "$Id: i18n.h 5925 2006-09-05 19:43:11Z mike $"
+ * "$Id: i18n.h 6649 2007-07-11 21:46:42Z mike $"
*
* (Private) localization support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -114,5 +105,5 @@ extern void _cupsSetLocale(char *argv[]);
#endif /* !_CUPS_I18N_H_ */
/*
- * End of "$Id: i18n.h 5925 2006-09-05 19:43:11Z mike $".
+ * End of "$Id: i18n.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index b315d8b37..e38ca26e1 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,25 +1,16 @@
/*
- * "$Id: ipp-private.h 5749 2006-07-18 18:36:09Z mike $"
+ * "$Id: ipp-private.h 6649 2007-07-11 21:46:42Z mike $"
*
* Private IPP definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -74,5 +65,5 @@ extern void _ippFreeAttr(ipp_attribute_t *);
#endif /* !_CUPS_IPP_H_ */
/*
- * End of "$Id: ipp-private.h 5749 2006-07-18 18:36:09Z mike $".
+ * End of "$Id: ipp-private.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 3ff58417f..e747602d8 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,26 +1,17 @@
/*
- * "$Id: ipp-support.c 6503 2007-05-01 23:06:44Z mike $"
+ * "$Id: ipp-support.c 6649 2007-07-11 21:46:42Z mike $"
*
* Internet Printing Protocol support functions for the Common UNIX
* Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -370,5 +361,5 @@ ippSetPort(int p) /* I - Port number to use */
/*
- * End of "$Id: ipp-support.c 6503 2007-05-01 23:06:44Z mike $".
+ * End of "$Id: ipp-support.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/ipp.c b/cups/ipp.c
index 8dea50d14..048fdc2fe 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,26 +1,17 @@
/*
- * "$Id: ipp.c 6230 2007-02-05 20:08:47Z mike $"
+ * "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $"
*
* Internet Printing Protocol support functions for the Common UNIX
* Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -2835,5 +2826,5 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */
/*
- * End of "$Id: ipp.c 6230 2007-02-05 20:08:47Z mike $".
+ * End of "$Id: ipp.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/ipp.h b/cups/ipp.h
index a37448776..1f6dd85ba 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,26 +1,17 @@
/*
- * "$Id: ipp.h 6503 2007-05-01 23:06:44Z mike $"
+ * "$Id: ipp.h 6649 2007-07-11 21:46:42Z mike $"
*
* Internet Printing Protocol definitions for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -501,5 +492,5 @@ extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
#endif /* !_CUPS_IPP_H_ */
/*
- * End of "$Id: ipp.h 6503 2007-05-01 23:06:44Z mike $".
+ * End of "$Id: ipp.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/langprintf.c b/cups/langprintf.c
index e675d270d..d9f6fa10f 100644
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -1,26 +1,17 @@
/*
- * "$Id: langprintf.c 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: langprintf.c 6649 2007-07-11 21:46:42Z mike $"
*
* Localized printf/puts functions for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2002-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -224,5 +215,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */
/*
- * End of "$Id: langprintf.c 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: langprintf.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/language.c b/cups/language.c
index 20e11cd09..ac62feb27 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,25 +1,16 @@
/*
- * "$Id: language.c 6532 2007-05-09 18:54:23Z mike $"
+ * "$Id: language.c 6649 2007-07-11 21:46:42Z mike $"
*
* I18N/language support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1363,5 +1354,5 @@ cups_unquote(char *d, /* O - Unquoted string */
/*
- * End of "$Id: language.c 6532 2007-05-09 18:54:23Z mike $".
+ * End of "$Id: language.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/language.h b/cups/language.h
index 94f7bf81a..195c6a04d 100644
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,25 +1,16 @@
/*
- * "$Id: language.h 5085 2006-02-06 13:27:53Z mike $"
+ * "$Id: language.h 6649 2007-07-11 21:46:42Z mike $"
*
* Multi-language support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -119,5 +110,5 @@ extern cups_lang_t *cupsLangGet(const char *language);
#endif /* !_CUPS_LANGUAGE_H_ */
/*
- * End of "$Id: language.h 5085 2006-02-06 13:27:53Z mike $".
+ * End of "$Id: language.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/libcups.exp b/cups/libcups.exp
index ed3332bca..14f9b916b 100644
--- a/cups/libcups.exp
+++ b/cups/libcups.exp
@@ -282,6 +282,7 @@ _ppdFirstOption
_ppdIsMarked
_ppdLastError
_ppdLocalize
+_ppdLocalizeIPPReason
_ppdMarkDefaults
_ppdMarkOption
_ppdNextCustomParam
diff --git a/cups/localize.c b/cups/localize.c
index 0482588ce..911d8ef35 100644
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -1,25 +1,16 @@
/*
- * "$Id: localize.c 6602 2007-06-22 22:13:13Z mike $"
+ * "$Id: localize.c 6686 2007-07-16 23:11:59Z mike $"
*
* PPD custom option routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -34,7 +25,11 @@
*
* Contents:
*
- * ppdLocalize() - Localize the PPD file to the current locale.
+ * ppdLocalize() - Localize the PPD file to the current locale.
+ * ppdLocalizeIPPReason() - Get the localized version of a cupsIPPReason
+ * attribute.
+ * ppd_ll_CC() - Get the current locale names.
+ * ppd_localized_attr() - Find a localized attribute.
*/
/*
@@ -49,14 +44,20 @@
* Local functions...
*/
-static const char *ppd_text(ppd_file_t *ppd, const char *keyword,
- const char *spec, const char *ll_CC,
- const char *ll);
+static void ppd_ll_CC(char *ll_CC, char *ll);
+static ppd_attr_t *ppd_localized_attr(ppd_file_t *ppd,
+ const char *keyword,
+ const char *spec, const char *ll_CC,
+ const char *ll);
/*
* 'ppdLocalize()' - Localize the PPD file to the current locale.
*
+ * All groups, options, and choices are localized, as are ICC profile
+ * descriptions, printer presets, and custom option parameters. Each
+ * localized string uses the UTF-8 character encoding.
+ *
* @since CUPS 1.2@
*/
@@ -69,12 +70,11 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
ppd_choice_t *choice; /* Current choice */
ppd_coption_t *coption; /* Current custom option */
ppd_cparam_t *cparam; /* Current custom parameter */
- ppd_attr_t *attr; /* Current attribute */
- cups_lang_t *lang; /* Current language */
+ ppd_attr_t *attr, /* Current attribute */
+ *locattr; /* Localized attribute */
char ckeyword[PPD_MAX_NAME], /* Custom keyword */
ll_CC[6], /* Language + country locale */
ll[3]; /* Language locale */
- const char *text; /* Localized text */
/*
@@ -90,40 +90,7 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
* Get the default language...
*/
- if ((lang = cupsLangDefault()) == NULL)
- return (-1);
-
- strlcpy(ll_CC, lang->language, sizeof(ll_CC));
- strlcpy(ll, lang->language, sizeof(ll));
-
- if (strlen(ll_CC) == 2)
- {
- /*
- * Map "ll" to primary/origin country locales to have the best
- * chance of finding a match...
- */
-
- if (!strcmp(ll_CC, "cs"))
- strcpy(ll_CC, "cs_CZ");
- else if (!strcmp(ll_CC, "en"))
- strcpy(ll_CC, "en_US");
- else if (!strcmp(ll_CC, "ja"))
- strcpy(ll_CC, "ja_JP");
- else if (!strcmp(ll_CC, "sv"))
- strcpy(ll_CC, "sv_SE");
- else if (!strcmp(ll_CC, "zh"))
- strcpy(ll_CC, "zh_CN"); /* Simplified Chinese */
- else
- {
- ll_CC[2] = '_';
- ll_CC[3] = toupper(ll_CC[0] & 255);
- ll_CC[4] = toupper(ll_CC[1] & 255);
- ll_CC[5] = '\0';
- }
- }
-
- DEBUG_printf((" lang->language=\"%s\", ll=\"%s\", ll_CC=\"%s\"...\n",
- lang->language, ll, ll_CC));
+ ppd_ll_CC(ll_CC, ll);
/*
* Now lookup all of the groups, options, choices, etc.
@@ -131,30 +98,32 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
{
- if ((text = ppd_text(ppd, "Translation", group->name, ll_CC, ll)) != NULL)
- strlcpy(group->text, text, sizeof(group->text));
+ if ((locattr = ppd_localized_attr(ppd, "Translation", group->name,
+ ll_CC, ll)) != NULL)
+ strlcpy(group->text, locattr->text, sizeof(group->text));
for (j = group->num_options, option = group->options; j > 0; j --, option ++)
{
- if ((text = ppd_text(ppd, "Translation", option->keyword, ll_CC,
- ll)) != NULL)
- strlcpy(option->text, text, sizeof(option->text));
+ if ((locattr = ppd_localized_attr(ppd, "Translation", option->keyword,
+ ll_CC, ll)) != NULL)
+ strlcpy(option->text, locattr->text, sizeof(option->text));
for (k = option->num_choices, choice = option->choices;
k > 0;
k --, choice ++)
{
if (strcmp(choice->choice, "Custom"))
- text = ppd_text(ppd, option->keyword, choice->choice, ll_CC, ll);
+ locattr = ppd_localized_attr(ppd, option->keyword, choice->choice,
+ ll_CC, ll);
else
{
snprintf(ckeyword, sizeof(ckeyword), "Custom%s", option->keyword);
- text = ppd_text(ppd, ckeyword, "True", ll_CC, ll);
+ locattr = ppd_localized_attr(ppd, ckeyword, "True", ll_CC, ll);
}
- if (text)
- strlcpy(choice->text, text, sizeof(choice->text));
+ if (locattr)
+ strlcpy(choice->text, locattr->text, sizeof(choice->text));
}
}
}
@@ -173,8 +142,9 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
{
snprintf(ckeyword, sizeof(ckeyword), "ParamCustom%s", coption->keyword);
- if ((text = ppd_text(ppd, ckeyword, cparam->name, ll_CC, ll)) != NULL)
- strlcpy(cparam->text, text, sizeof(cparam->text));
+ if ((locattr = ppd_localized_attr(ppd, ckeyword, cparam->name,
+ ll_CC, ll)) != NULL)
+ strlcpy(cparam->text, locattr->text, sizeof(cparam->text));
}
}
@@ -184,9 +154,9 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
if ((attr = ppdFindAttr(ppd, "APCustomColorMatchingName", NULL)) != NULL)
{
- if ((text = ppd_text(ppd, "APCustomColorMatchingName", attr->spec,
- ll_CC, ll)) != NULL)
- strlcpy(attr->text, text, sizeof(attr->text));
+ if ((locattr = ppd_localized_attr(ppd, "APCustomColorMatchingName",
+ attr->spec, ll_CC, ll)) != NULL)
+ strlcpy(attr->text, locattr->text, sizeof(attr->text));
}
for (attr = ppdFindAttr(ppd, "cupsICCProfile", NULL);
@@ -195,8 +165,9 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
{
cupsArraySave(ppd->sorted_attrs);
- if ((text = ppd_text(ppd, "cupsICCProfile", attr->spec, ll_CC, ll)) != NULL)
- strlcpy(attr->text, text, sizeof(attr->text));
+ if ((locattr = ppd_localized_attr(ppd, "cupsICCProfile", attr->spec,
+ ll_CC, ll)) != NULL)
+ strlcpy(attr->text, locattr->text, sizeof(attr->text));
cupsArrayRestore(ppd->sorted_attrs);
}
@@ -211,8 +182,9 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
{
cupsArraySave(ppd->sorted_attrs);
- if ((text = ppd_text(ppd, "APPrinterPreset", attr->spec, ll_CC, ll)) != NULL)
- strlcpy(attr->text, text, sizeof(attr->text));
+ if ((locattr = ppd_localized_attr(ppd, "APPrinterPreset", attr->spec,
+ ll_CC, ll)) != NULL)
+ strlcpy(attr->text, locattr->text, sizeof(attr->text));
cupsArrayRestore(ppd->sorted_attrs);
}
@@ -222,15 +194,268 @@ ppdLocalize(ppd_file_t *ppd) /* I - PPD file */
/*
- * 'ppd_text()' - Find the localized text as needed...
+ * 'ppdLocalizeIPPReason()' - Get the localized version of a cupsIPPReason
+ * attribute.
+ *
+ * This function uses the current locale to find the corresponding reason
+ * text or URI from the attribute value. If "scheme" is NULL or "text",
+ * the returned value contains human-readable (UTF-8) text from the translation
+ * string or attribute value. Otherwise the corresponding URI is returned.
+ *
+ * If no value of the requested scheme can be found, NULL is returned.
+ *
+ * @since CUPS 1.3@
+ */
+
+const char * /* O - Value or NULL if not found */
+ppdLocalizeIPPReason(
+ ppd_file_t *ppd, /* I - PPD file */
+ const char *reason, /* I - IPP reason keyword to look up */
+ const char *scheme, /* I - URI scheme or NULL for text */
+ char *buffer, /* I - Value buffer */
+ size_t bufsize) /* I - Size of value buffer */
+{
+ ppd_attr_t *locattr; /* Localized attribute */
+ char ll_CC[6], /* Language + country locale */
+ ll[3], /* Language locale */
+ *bufptr, /* Pointer into buffer */
+ *bufend, /* Pointer to end of buffer */
+ *valptr; /* Pointer into value */
+ int ch, /* Hex-encoded character */
+ schemelen; /* Length of scheme name */
+
+
+ /*
+ * Range check input...
+ */
+
+ if (buffer)
+ *buffer = '\0';
+
+ if (!ppd || !reason || (scheme && !*scheme) ||
+ !buffer || bufsize < PPD_MAX_TEXT)
+ return (NULL);
+
+ /*
+ * Get the default language...
+ */
+
+ ppd_ll_CC(ll_CC, ll);
+
+ /*
+ * Find the localized attribute...
+ */
+
+ if ((locattr = ppd_localized_attr(ppd, "cupsIPPReason", reason,
+ ll_CC, ll)) == NULL)
+ locattr = ppdFindAttr(ppd, "cupsIPPReason", reason);
+
+ if (!locattr)
+ return (NULL);
+
+ /*
+ * Now find the value we need...
+ */
+
+ bufend = buffer + bufsize - 1;
+
+ if (!scheme || !strcmp(scheme, "text"))
+ {
+ /*
+ * Copy a text value (either the translation text or text:... URIs from
+ * the value...
+ */
+
+ strlcpy(buffer, locattr->text, bufsize);
+
+ for (valptr = locattr->value, bufptr = buffer; *valptr && bufptr < bufend;)
+ {
+ if (!strncmp(valptr, "text:", 5))
+ {
+ /*
+ * Decode text: URI and add to the buffer...
+ */
+
+ if (bufptr > buffer)
+ *bufptr++ = ' '; /* Add leading whitespace */
+
+ valptr += 5;
+
+ while (*valptr && !isspace(*valptr & 255) && bufptr < bufend)
+ {
+ if (*valptr == '%' && isxdigit(valptr[1] & 255) &&
+ isxdigit(valptr[2] & 255))
+ {
+ /*
+ * Pull a hex-encoded character from the URI...
+ */
+
+ valptr ++;
+
+ if (isdigit(*valptr & 255))
+ ch = (*valptr - '0') << 4;
+ else
+ ch = (tolower(*valptr) - 'a' + 10) << 4;
+ valptr ++;
+
+ if (isdigit(*valptr & 255))
+ *bufptr++ = ch | (*valptr - '0');
+ else
+ *bufptr++ = ch | (tolower(*valptr) - 'a' + 10);
+ valptr ++;
+ }
+ else if (*valptr == '+')
+ {
+ *bufptr++ = ' ';
+ valptr ++;
+ }
+ else
+ *bufptr++ = *valptr++;
+ }
+ }
+ else
+ {
+ /*
+ * Skip this URI...
+ */
+
+ while (*valptr && !isspace(*valptr & 255))
+ valptr++;
+ }
+
+ /*
+ * Skip whitespace...
+ */
+
+ while (isspace(*valptr & 255))
+ valptr ++;
+ }
+
+ if (bufptr > buffer)
+ *bufptr = '\0';
+
+ return (buffer);
+ }
+ else
+ {
+ /*
+ * Copy a URI...
+ */
+
+ schemelen = strlen(scheme);
+ if (scheme[schemelen - 1] == ':') /* Force scheme to be just the name */
+ schemelen --;
+
+ for (valptr = locattr->value, bufptr = buffer; *valptr && bufptr < bufend;)
+ {
+ if ((!strncmp(valptr, scheme, schemelen) && valptr[schemelen] == ':') ||
+ (*valptr == '/' && !strcmp(scheme, "file")))
+ {
+ /*
+ * Copy URI...
+ */
+
+ while (*valptr && !isspace(*valptr & 255) && bufptr < bufend)
+ *bufptr++ = *valptr++;
+
+ *bufptr = '\0';
+
+ return (buffer);
+ }
+ else
+ {
+ /*
+ * Skip this URI...
+ */
+
+ while (*valptr && !isspace(*valptr & 255))
+ valptr++;
+ }
+
+ /*
+ * Skip whitespace...
+ */
+
+ while (isspace(*valptr & 255))
+ valptr ++;
+ }
+
+ return (NULL);
+ }
+}
+
+
+/*
+ * 'ppd_ll_CC()' - Get the current locale names.
+ */
+
+static void
+ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */
+ char *ll) /* O - Generic locale name */
+
+{
+ cups_lang_t *lang; /* Current language */
+
+
+ /*
+ * Get the current locale...
+ */
+
+ if ((lang = cupsLangDefault()) == NULL)
+ {
+ strcpy(ll_CC, "en_US");
+ strcpy(ll, "en");
+ return;
+ }
+
+ /*
+ * Copy the locale name...
+ */
+
+ strlcpy(ll_CC, lang->language, sizeof(ll_CC));
+ strlcpy(ll, lang->language, sizeof(ll));
+
+ if (strlen(ll_CC) == 2)
+ {
+ /*
+ * Map "ll" to primary/origin country locales to have the best
+ * chance of finding a match...
+ */
+
+ if (!strcmp(ll_CC, "cs"))
+ strcpy(ll_CC, "cs_CZ");
+ else if (!strcmp(ll_CC, "en"))
+ strcpy(ll_CC, "en_US");
+ else if (!strcmp(ll_CC, "ja"))
+ strcpy(ll_CC, "ja_JP");
+ else if (!strcmp(ll_CC, "sv"))
+ strcpy(ll_CC, "sv_SE");
+ else if (!strcmp(ll_CC, "zh"))
+ strcpy(ll_CC, "zh_CN"); /* Simplified Chinese */
+ else
+ {
+ ll_CC[2] = '_';
+ ll_CC[3] = toupper(ll_CC[0] & 255);
+ ll_CC[4] = toupper(ll_CC[1] & 255);
+ ll_CC[5] = '\0';
+ }
+ }
+
+ DEBUG_printf(("ppd_ll_CC: lang->language=\"%s\", ll=\"%s\", ll_CC=\"%s\"...\n",
+ lang->language, ll, ll_CC));
+}
+
+
+/*
+ * 'ppd_localized_attr()' - Find a localized attribute.
*/
-static const char * /* O - Localized text or NULL */
-ppd_text(ppd_file_t *ppd, /* I - PPD file */
- const char *keyword, /* I - Main keyword */
- const char *spec, /* I - Option keyword */
- const char *ll_CC, /* I - Language + country locale */
- const char *ll) /* I - Language locale */
+static ppd_attr_t * /* O - Localized attribute or NULL */
+ppd_localized_attr(ppd_file_t *ppd, /* I - PPD file */
+ const char *keyword, /* I - Main keyword */
+ const char *spec, /* I - Option keyword */
+ const char *ll_CC, /* I - Language + country locale */
+ const char *ll) /* I - Language locale */
{
char lkeyword[PPD_MAX_NAME]; /* Localization keyword */
ppd_attr_t *attr; /* Current attribute */
@@ -272,14 +497,10 @@ ppd_text(ppd_file_t *ppd, /* I - PPD file */
puts(" NOT FOUND");
#endif /* DEBUG */
- /*
- * Return text if we find it...
- */
-
- return (attr ? attr->text : NULL);
+ return (attr);
}
/*
- * End of "$Id: localize.c 6602 2007-06-22 22:13:13Z mike $".
+ * End of "$Id: localize.c 6686 2007-07-16 23:11:59Z mike $".
*/
diff --git a/cups/mark.c b/cups/mark.c
index 052136e68..92d2faee2 100644
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,25 +1,16 @@
/*
- * "$Id: mark.c 6558 2007-06-18 18:11:49Z mike $"
+ * "$Id: mark.c 6649 2007-07-11 21:46:42Z mike $"
*
* Option marking routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -730,5 +721,5 @@ ppd_defaults(ppd_file_t *ppd, /* I - PPD file */
/*
- * End of "$Id: mark.c 6558 2007-06-18 18:11:49Z mike $".
+ * End of "$Id: mark.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/md5-apple.h b/cups/md5-apple.h
index 4284ad4ab..38f4d5b04 100644
--- a/cups/md5-apple.h
+++ b/cups/md5-apple.h
@@ -1,28 +1,19 @@
/*
- * "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $"
+ * "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $"
*
* MD5 MacOS X compatibility header for the Common UNIX Printing
* System (CUPS).
*
* This file just defines aliases to the (private) CUPS MD5 functions.
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -35,5 +26,5 @@ void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16])
{ _cupsMD5Finish(pms, digest); }
/*
- * End of "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $".
+ * End of "$Id: md5-apple.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index d28b5ea68..2dd3c122c 100644
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,25 +1,16 @@
/*
- * "$Id: md5passwd.c 5966 2006-09-19 16:33:00Z mike $"
+ * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $"
*
* MD5 password support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -147,5 +138,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */
/*
- * End of "$Id: md5passwd.c 5966 2006-09-19 16:33:00Z mike $".
+ * End of "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/notify.c b/cups/notify.c
index 117796a3d..02bb74560 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,25 +1,16 @@
/*
- * "$Id: notify.c 5873 2006-08-24 14:37:24Z mike $"
+ * "$Id: notify.c 6649 2007-07-11 21:46:42Z mike $"
*
* Notification routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2005-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -207,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */
/*
- * End of "$Id: notify.c 5873 2006-08-24 14:37:24Z mike $".
+ * End of "$Id: notify.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/options.c b/cups/options.c
index e4b7bbb88..cd38c185b 100644
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,25 +1,16 @@
/*
- * "$Id: options.c 6601 2007-06-22 21:27:22Z mike $"
+ * "$Id: options.c 6649 2007-07-11 21:46:42Z mike $"
*
* Option routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -787,5 +778,5 @@ ppd_mark_choices(ppd_file_t *ppd, /* I - PPD file */
/*
- * End of "$Id: options.c 6601 2007-06-22 21:27:22Z mike $".
+ * End of "$Id: options.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/page.c b/cups/page.c
index b408b5242..b4e325697 100644
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,25 +1,16 @@
/*
- * "$Id: page.c 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: page.c 6649 2007-07-11 21:46:42Z mike $"
*
* Page size functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -209,5 +200,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */
/*
- * End of "$Id: page.c 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: page.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/ppd.c b/cups/ppd.c
index 884244878..53fac4ad0 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,25 +1,16 @@
/*
- * "$Id: ppd.c 6586 2007-06-21 17:44:22Z mike $"
+ * "$Id: ppd.c 6660 2007-07-13 05:09:30Z mike $"
*
* PPD file routines for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -1222,6 +1213,8 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */
* Add an option record to the current sub-group, group, or file...
*/
+ DEBUG_printf(("name=\"%s\" (%d)\n", name, strlen(name)));
+
if (name[0] == '*')
_cups_strcpy(name, name + 1); /* Eliminate leading asterisk */
@@ -1895,8 +1888,8 @@ ppdOpen2(cups_file_t *fp) /* I - File to read from */
cupsLangFree(language);
#ifdef DEBUG
- if (!feof(fp))
- printf("Premature EOF at %lu...\n", (unsigned long)ftell(fp));
+ if (!cupsFileEOF(fp))
+ printf("Premature EOF at %lu...\n", (unsigned long)cupsFileTell(fp));
#endif /* DEBUG */
if (cg->ppd_status != PPD_OK)
@@ -3193,5 +3186,5 @@ ppd_read(cups_file_t *fp, /* I - File to read from */
/*
- * End of "$Id: ppd.c 6586 2007-06-21 17:44:22Z mike $".
+ * End of "$Id: ppd.c 6660 2007-07-13 05:09:30Z mike $".
*/
diff --git a/cups/ppd.h b/cups/ppd.h
index b0ded47cc..cd67a51fc 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,26 +1,17 @@
/*
- * "$Id: ppd.h 6477 2007-04-25 19:55:45Z mike $"
+ * "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $"
*
* PostScript Printer Description definitions for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* PostScript is a trademark of Adobe Systems, Inc.
*
@@ -318,7 +309,7 @@ typedef struct ppd_file_s /**** PPD File ****/
char **filters; /* Filter strings... */
/**** New in CUPS 1.1 ****/
- int flip_duplex; /* 1 = Flip page for back sides @since CUPS 1.1@ */
+ int flip_duplex; /* 1 = Flip page for back sides @deprecated@ */
/**** New in CUPS 1.1.19 ****/
char *protocols; /* Protocols (BCP, TBCP) string @since CUPS 1.1.19@ */
@@ -397,6 +388,12 @@ extern ppd_option_t *ppdNextOption(ppd_file_t *ppd);
extern int ppdLocalize(ppd_file_t *ppd);
extern ppd_file_t *ppdOpen2(cups_file_t *fp);
+/**** New in CUPS 1.3 ****/
+extern const char *ppdLocalizeIPPReason(ppd_file_t *ppd,
+ const char *reason,
+ const char *scheme,
+ char *buffer, size_t bufsize);
+
/*
* C++ magic...
@@ -408,5 +405,5 @@ extern ppd_file_t *ppdOpen2(cups_file_t *fp);
#endif /* !_CUPS_PPD_H_ */
/*
- * End of "$Id: ppd.h 6477 2007-04-25 19:55:45Z mike $".
+ * End of "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/request.c b/cups/request.c
index 5e80fd645..560367901 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,25 +1,16 @@
/*
- * "$Id: request.c 6506 2007-05-03 18:12:35Z mike $"
+ * "$Id: request.c 6649 2007-07-11 21:46:42Z mike $"
*
* IPP utilities for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -551,5 +542,5 @@ _cupsSetError(ipp_status_t status, /* I - IPP status code */
/*
- * End of "$Id: request.c 6506 2007-05-03 18:12:35Z mike $".
+ * End of "$Id: request.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index b1403384c..9f1a64fa8 100644
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -1,25 +1,16 @@
/*
- * "$Id: sidechannel.c 6319 2007-03-06 18:51:40Z mike $"
+ * "$Id: sidechannel.c 6649 2007-07-11 21:46:42Z mike $"
*
* Side-channel API code for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -336,5 +327,5 @@ cupsSideChannelWrite(
/*
- * End of "$Id: sidechannel.c 6319 2007-03-06 18:51:40Z mike $".
+ * End of "$Id: sidechannel.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/sidechannel.h b/cups/sidechannel.h
index 9bdf49b7f..35b0de9dc 100644
--- a/cups/sidechannel.h
+++ b/cups/sidechannel.h
@@ -1,25 +1,16 @@
/*
- * "$Id: sidechannel.h 6170 2007-01-02 17:26:41Z mike $"
+ * "$Id: sidechannel.h 6649 2007-07-11 21:46:42Z mike $"
*
* Side-channel API definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -111,5 +102,5 @@ extern int cupsSideChannelWrite(cups_sc_command_t command,
#endif /* !_CUPS_SIDECHANNEL_H_ */
/*
- * End of "$Id: sidechannel.h 6170 2007-01-02 17:26:41Z mike $".
+ * End of "$Id: sidechannel.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/snprintf.c b/cups/snprintf.c
index 50cd64da4..018a3f7ae 100644
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,25 +1,16 @@
/*
- * "$Id: snprintf.c 6187 2007-01-10 16:20:42Z mike $"
+ * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $"
*
* snprintf functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -368,6 +359,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */
/*
- * End of "$Id: snprintf.c 6187 2007-01-10 16:20:42Z mike $".
+ * End of "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/string.c b/cups/string.c
index c44b7a061..40f3d7fd2 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,25 +1,16 @@
/*
- * "$Id: string.c 6345 2007-03-17 18:00:04Z mike $"
+ * "$Id: string.c 6649 2007-07-11 21:46:42Z mike $"
*
* String functions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -743,5 +734,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */
/*
- * End of "$Id: string.c 6345 2007-03-17 18:00:04Z mike $".
+ * End of "$Id: string.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/string.h b/cups/string.h
index 79ebd774b..e0cd0e49b 100644
--- a/cups/string.h
+++ b/cups/string.h
@@ -1,25 +1,16 @@
/*
- * "$Id: string.h 5466 2006-04-26 19:52:27Z mike $"
+ * "$Id: string.h 6649 2007-07-11 21:46:42Z mike $"
*
* String definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -158,5 +149,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr,
#endif /* !_CUPS_STRING_H_ */
/*
- * End of "$Id: string.h 5466 2006-04-26 19:52:27Z mike $".
+ * End of "$Id: string.h 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/tempfile.c b/cups/tempfile.c
index 9375edc46..5d5bd5206 100644
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,25 +1,16 @@
/*
- * "$Id: tempfile.c 6599 2007-06-22 18:11:12Z mike $"
+ * "$Id: tempfile.c 6649 2007-07-11 21:46:42Z mike $"
*
* Temp file utilities for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -240,5 +231,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */
/*
- * End of "$Id: tempfile.c 6599 2007-06-22 18:11:12Z mike $".
+ * End of "$Id: tempfile.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/test.ppd b/cups/test.ppd
index bdcdc9971..303b200a2 100644
--- a/cups/test.ppd
+++ b/cups/test.ppd
@@ -1,37 +1,27 @@
*PPD-Adobe: "4.3"
*%
-*% "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $"
+*% "$Id: test.ppd 6676 2007-07-16 17:09:09Z mike $"
*%
-*% Test PPD file for the Common UNIX Printing System (CUPS).
+*% Test PPD file for the Common UNIX Printing System (CUPS).
*%
-*% This file is used to test the CUPS PPD API functions and cannot be
-*% used with any known printers. Look at the PPD files in the "ppd"
-*% subdirectory as well as the CUPS web site for working PPD files.
+*% This file is used to test the CUPS PPD API functions and cannot be
+*% used with any known printers. Look at the PPD files in the "ppd"
+*% subdirectory as well as the CUPS web site for working PPD files.
*%
-*% If you are a PPD file developer, consider using the CUPS DDK to
-*% create your PPD files - not only will it save you time, it produces
-*% consistently high-quality files.
-*%
-*% Copyright 2002-2006 by Easy Software Products.
-*%
-*% These coded instructions, statements, and computer programs are the
-*% property of Easy Software Products and are protected by Federal
-*% copyright law. Distribution and use rights are outlined in the file
-*% "LICENSE.txt" which should have been included with this file. If this
-*% file is missing or damaged please contact Easy Software Products
-*% at:
-*%
-*% Attn: CUPS Licensing Information
-*% Easy Software Products
-*% 44141 Airport View Drive, Suite 204
-*% Hollywood, Maryland 20636-3111 USA
-*%
-*% Voice: (301) 373-9603
-*% EMail: cups-info@cups.org
-*% WWW: http://www.cups.org
+*% If you are a PPD file developer, consider using the CUPS DDK to
+*% create your PPD files - not only will it save you time, it produces
+*% consistently high-quality files.
*%
+*% Copyright 2007 by Apple Inc.
+*% Copyright 2002-2006 by Easy Software Products.
+*%
+*% These coded instructions, statements, and computer programs are the
+*% property of Apple Inc. and are protected by Federal copyright
+*% law. Distribution and use rights are outlined in the file "LICENSE.txt"
+*% which should have been included with this file. If this file is
+*% file is missing or damaged, see the license at "http://www.cups.org/".
*FormatVersion: "4.3"
-*FileVersion: "1.2"
+*FileVersion: "1.3"
*LanguageVersion: English
*LanguageEncoding: ISOLatin1
*PCFileName: "TEST.PPD"
@@ -43,7 +33,7 @@
*cupsModelNumber: 1
*ModelName: "Test"
*ShortNickName: "Test"
-*NickName: "Test for CUPS v1.2"
+*NickName: "Test for CUPS v1.3"
*PSVersion: "(3010.000) 81501"
*LanguageLevel: "3"
*ColorDevice: True
@@ -148,6 +138,18 @@
*CloseGroup: Extended
+*% IPP reasons (for ppdLocalizeIPPReason tests)
+*cupsIPPReason foo/Foo Reason: "http://foo/bar.html
+help:anchor='foo'%20bookID=Vendor%20Help
+/help/foo/bar.html"
+*End
+*fr.cupsIPPReason foo/La Foo Reason: "text:La%20Long
+text:Foo%20Reason
+http://foo/fr/bar.html
+help:anchor='foo'%20bookID=Vendor%20Help
+/help/fr/foo/bar.html"
+*End
+
*DefaultFont: Courier
*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
@@ -185,5 +187,5 @@
*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
*Font ZapfDingbats: Special "(001.004S)" Standard ROM
*%
-*% End of "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $".
+*% End of "$Id: test.ppd 6676 2007-07-16 17:09:09Z mike $".
*%
diff --git a/cups/testadmin.c b/cups/testadmin.c
index 31bbb0b41..5091f11b8 100644
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testadmin.c 6379 2007-03-21 14:57:22Z mike $"
+ * "$Id: testadmin.c 6649 2007-07-11 21:46:42Z mike $"
*
* Admin function test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -125,5 +116,5 @@ show_settings(
/*
- * End of "$Id: testadmin.c 6379 2007-03-21 14:57:22Z mike $".
+ * End of "$Id: testadmin.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testarray.c b/cups/testarray.c
index 912035d51..064ec892f 100644
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $"
+ * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $"
*
* Array test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -525,5 +516,5 @@ load_words(const char *filename, /* I - File to load */
/*
- * End of "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $".
+ * End of "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testcups.c b/cups/testcups.c
index d9f391f0e..a3187fd1c 100644
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -3,23 +3,14 @@
*
* CUPS API test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
diff --git a/cups/testfile.c b/cups/testfile.c
index 18b0ad4a7..2a50e677f 100644
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testfile.c 6192 2007-01-10 19:26:48Z mike $"
+ * "$Id: testfile.c 6649 2007-07-11 21:46:42Z mike $"
*
* File test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -468,5 +459,5 @@ read_write_tests(int compression) /* I - Use compression? */
/*
- * End of "$Id: testfile.c 6192 2007-01-10 19:26:48Z mike $".
+ * End of "$Id: testfile.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testhttp.c b/cups/testhttp.c
index 585ca6eef..37f850c9b 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testhttp.c 5996 2006-10-02 15:05:58Z mike $"
+ * "$Id: testhttp.c 6649 2007-07-11 21:46:42Z mike $"
*
* HTTP test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -533,5 +524,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: testhttp.c 5996 2006-10-02 15:05:58Z mike $".
+ * End of "$Id: testhttp.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testi18n.c b/cups/testi18n.c
index 80fc9f6a5..c6654d62e 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,25 +1,18 @@
/*
- * "$Id: testi18n.c 5837 2006-08-17 14:37:40Z mike $"
+ * "$Id: testi18n.c 6649 2007-07-11 21:46:42Z mike $"
*
* Internationalization test for Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are
- * the property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the
- * file "LICENSE.txt" which should have been included with this file.
- * If this file is missing or damaged please contact Easy Software
- * Products at:
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * This file is subject to the Apple OS-Developed Software exception.
*
* Contents:
*
@@ -555,5 +548,5 @@ print_utf8(const char *msg, /* I - Message String */
/*
- * End of "$Id: testi18n.c 5837 2006-08-17 14:37:40Z mike $"
+ * End of "$Id: testi18n.c 6649 2007-07-11 21:46:42Z mike $"
*/
diff --git a/cups/testipp.c b/cups/testipp.c
index 2231be273..aa119ace9 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testipp.c 5749 2006-07-18 18:36:09Z mike $"
+ * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $"
*
* IPP test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -658,5 +649,5 @@ write_cb(void *data, /* I - Data */
/*
- * End of "$Id: testipp.c 5749 2006-07-18 18:36:09Z mike $".
+ * End of "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testlang.c b/cups/testlang.c
index 2c3ebe805..374ad8952 100644
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testlang.c 6345 2007-03-17 18:00:04Z mike $"
+ * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $"
*
* Localization test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -121,5 +112,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: testlang.c 6345 2007-03-17 18:00:04Z mike $".
+ * End of "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/testppd.c b/cups/testppd.c
index e06b90e92..6fb4fb49c 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1,25 +1,16 @@
/*
- * "$Id: testppd.c 6580 2007-06-20 21:11:43Z mike $"
+ * "$Id: testppd.c 6676 2007-07-16 17:09:09Z mike $"
*
* PPD test program for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -107,6 +98,7 @@ main(int argc, /* I - Number of command-line arguments */
int status; /* Status of tests (0 = success, 1 = fail) */
int conflicts; /* Number of conflicts */
char *s; /* String */
+ char buffer[8192]; /* String buffer */
status = 0;
@@ -146,6 +138,7 @@ main(int argc, /* I - Number of command-line arguments */
puts("PASS");
else
{
+ status ++;
printf("FAIL (%d bytes instead of %d)\n", s ? (int)strlen(s) : 0,
(int)strlen(default_code));
@@ -164,6 +157,7 @@ main(int argc, /* I - Number of command-line arguments */
puts("PASS");
else
{
+ status ++;
printf("FAIL (%d bytes instead of %d)\n", s ? (int)strlen(s) : 0,
(int)strlen(custom_code));
@@ -174,6 +168,62 @@ main(int argc, /* I - Number of command-line arguments */
if (s)
free(s);
+ /*
+ * Test localization...
+ */
+
+ fputs("ppdLocalizeIPPReason(text): ", stdout);
+ if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+ !strcmp(buffer, "Foo Reason"))
+ puts("PASS");
+ else
+ {
+ status ++;
+ printf("FAIL (\"%s\" instead of \"Foo Reason\")\n", buffer);
+ }
+
+ fputs("ppdLocalizeIPPReason(http): ", stdout);
+ if (ppdLocalizeIPPReason(ppd, "foo", "http", buffer, sizeof(buffer)) &&
+ !strcmp(buffer, "http://foo/bar.html"))
+ puts("PASS");
+ else
+ {
+ status ++;
+ printf("FAIL (\"%s\" instead of \"http://foo/bar.html\")\n", buffer);
+ }
+
+ fputs("ppdLocalizeIPPReason(help): ", stdout);
+ if (ppdLocalizeIPPReason(ppd, "foo", "help", buffer, sizeof(buffer)) &&
+ !strcmp(buffer, "help:anchor='foo'%20bookID=Vendor%20Help"))
+ puts("PASS");
+ else
+ {
+ status ++;
+ printf("FAIL (\"%s\" instead of \"help:anchor='foo'%%20bookID=Vendor%%20Help\")\n", buffer);
+ }
+
+ fputs("ppdLocalizeIPPReason(file): ", stdout);
+ if (ppdLocalizeIPPReason(ppd, "foo", "file", buffer, sizeof(buffer)) &&
+ !strcmp(buffer, "/help/foo/bar.html"))
+ puts("PASS");
+ else
+ {
+ status ++;
+ printf("FAIL (\"%s\" instead of \"/help/foo/bar.html\")\n", buffer);
+ }
+
+ putenv("LANG=fr");
+
+ fputs("ppdLocalizeIPPReason(fr text): ", stdout);
+ if (ppdLocalizeIPPReason(ppd, "foo", NULL, buffer, sizeof(buffer)) &&
+ !strcmp(buffer, "La Long Foo Reason"))
+ puts("PASS");
+ else
+ {
+ status ++;
+ printf("FAIL (\"%s\" instead of \"La Long Foo Reason\")\n", buffer);
+ }
+
ppdClose(ppd);
}
else
@@ -310,5 +360,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: testppd.c 6580 2007-06-20 21:11:43Z mike $".
+ * End of "$Id: testppd.c 6676 2007-07-16 17:09:09Z mike $".
*/
diff --git a/cups/transcode.c b/cups/transcode.c
index 92a7bfb97..aab841642 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,25 +1,18 @@
/*
- * "$Id: transcode.c 6592 2007-06-21 21:04:40Z mike $"
+ * "$Id: transcode.c 6649 2007-07-11 21:46:42Z mike $"
*
* Transcoding support for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are
- * the property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the
- * file "LICENSE.txt" which should have been included with this file.
- * If this file is missing or damaged please contact Easy Software
- * Products at:
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * This file is subject to the Apple OS-Developed Software exception.
*
* Contents:
*
@@ -1655,5 +1648,5 @@ get_vbcs_charmap(
/*
- * End of "$Id: transcode.c 6592 2007-06-21 21:04:40Z mike $"
+ * End of "$Id: transcode.c 6649 2007-07-11 21:46:42Z mike $"
*/
diff --git a/cups/transcode.h b/cups/transcode.h
index c867b37e2..927826855 100644
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -1,25 +1,18 @@
/*
- * "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
+ * "$Id: transcode.h 6649 2007-07-11 21:46:42Z mike $"
*
* Transcoding definitions for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are
- * the property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the
- * file "LICENSE.txt" which should have been included with this file.
- * If this file is missing or damaged please contact Easy Software
- * Products at:
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * This file is subject to the Apple OS-Developed Software exception.
*/
#ifndef _CUPS_TRANSCODE_H_
@@ -84,5 +77,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest,
/*
- * End of "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
+ * End of "$Id: transcode.h 6649 2007-07-11 21:46:42Z mike $"
*/
diff --git a/cups/usersys.c b/cups/usersys.c
index 8eeb28554..64d71d22a 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,26 +1,17 @@
/*
- * "$Id: usersys.c 5901 2006-08-29 15:49:34Z mike $"
+ * "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $"
*
* User, system, and password routines for the Common UNIX Printing
* System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -500,5 +491,5 @@ cups_open_client_conf(void)
/*
- * End of "$Id: usersys.c 5901 2006-08-29 15:49:34Z mike $".
+ * End of "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/cups/util.c b/cups/util.c
index 9da9f1533..c6021d15f 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,25 +1,16 @@
/*
- * "$Id: util.c 6506 2007-05-03 18:12:35Z mike $"
+ * "$Id: util.c 6649 2007-07-11 21:46:42Z mike $"
*
* Printing utilities for the Common UNIX Printing System (CUPS).
*
+ * Copyright 2007 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
@@ -1737,5 +1728,5 @@ cups_get_printer_uri(
/*
- * End of "$Id: util.c 6506 2007-05-03 18:12:35Z mike $".
+ * End of "$Id: util.c 6649 2007-07-11 21:46:42Z mike $".
*/
diff --git a/data/HPGLprolog b/data/HPGLprolog
index eed0a0487..2ebf98574 100644
--- a/data/HPGLprolog
+++ b/data/HPGLprolog
@@ -1,6 +1,6 @@
%%BeginResource: procset hpgltops 1.1 0
%
-% "$Id: HPGLprolog 4494 2005-02-18 02:18:11Z mike $"
+% "$Id: HPGLprolog 6649 2007-07-11 21:46:42Z mike $"
%
% HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
%
@@ -9,23 +9,13 @@
% should be called 'NP' (newpath), but GhostScript uses the 'NP' name
% for 'noaccess put' in some of its font files...
%
-% Copyright 1993-2005 Easy Software Products
+% Copyright 2007 by Apple Inc.
+% Copyright 1993-2005 by Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/MO { moveto } bind def
/LI { lineto } bind def
diff --git a/data/Makefile b/data/Makefile
index 29a7aa0e7..9b37aed52 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Datafile makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1993-2006 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
@@ -180,5 +171,5 @@ uninstall:
#
-# End of "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $".
+# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
#
diff --git a/data/classified b/data/classified
index 3f8a1ab82..8776b7b1a 100644
--- a/data/classified
+++ b/data/classified
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -186,7 +83,7 @@ gsave
pageWidth 36 mul % Center of page
pageHeight 72 mul % Top of page
- pageWidth -7 mul add % - 2 lines
+ pageWidth 9 mul sub % - 3 lines
moveto % Position text
bigFont setfont % Font
(Classified) CENTER % Show text centered
@@ -219,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: classified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: classified 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/confidential b/data/confidential
index 27d29fbcc..9e4d9eadb 100644
--- a/data/confidential
+++ b/data/confidential
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -186,7 +83,7 @@ gsave
pageWidth 36 mul % Center of page
pageHeight 72 mul % Top of page
- pageWidth -7 mul add % - 2 lines
+ pageWidth 9 mul sub % - 3 lines
moveto % Position text
bigFont setfont % Font
(Confidential) CENTER % Show text centered
@@ -219,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: confidential 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: confidential 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/secret b/data/secret
index 998f59a92..cb2619e76 100644
--- a/data/secret
+++ b/data/secret
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -186,7 +83,7 @@ gsave
pageWidth 36 mul % Center of page
pageHeight 72 mul % Top of page
- pageWidth -7 mul add % - 2 lines
+ pageWidth 9 mul sub % - 3 lines
moveto % Position text
bigFont setfont % Font
(Secret) CENTER % Show text centered
@@ -219,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: secret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: secret 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/standard b/data/standard
index 8fac59e5f..6f03745d0 100644
--- a/data/standard
+++ b/data/standard
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -181,6 +78,22 @@ gsave
pageBottom 72 mul
translate
+ % Draw the label at the top and bottom...
+ 0 setgray % Color
+
+ pageWidth 36 mul % Center of page
+ pageHeight 72 mul % Top of page
+ pageWidth 9 mul sub % - 3 lines
+ moveto % Position text
+ bigFont setfont % Font
+ (Cover Page) CENTER % Show text centered
+
+ pageWidth 36 mul % Center of page
+ pageHeight 6 mul % Bottom of page
+ moveto % Position text
+ bigFont setfont % Font
+ (Cover Page) CENTER % Show text centered
+
% Job information box...
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
boxWidth 0.5 mul sub % x-= 1/2 box width
@@ -203,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: standard 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: standard 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/testprint.ps b/data/testprint.ps
index eca6cee91..ead73978a 100644
--- a/data/testprint.ps
+++ b/data/testprint.ps
@@ -5,8 +5,8 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset testprint/1.3
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: D:20070220113000+0500
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070606214000+0500
%%Title: Test Page
%%EndComments
%%BeginProlog
@@ -14,23 +14,13 @@
%
% PostScript test page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2007 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/SEXTANT { % Draw a color wheel sextant...
% (name) white radius r g b SEXTANT -
@@ -137,24 +127,6 @@
dup 1.2 mul moveto
(System) show
} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- gsave
- 48 div dup scale
-
- /Helvetica-Bold findfont 38.2 scalefont setfont
- 0 setgray
- -3 19.5 moveto (ESP) show
-
- /Helvetica-Narrow-Oblique findfont 8.2 scalefont setfont
- 0 2 moveto (Easy Software Products) show
-
- 1 -0.01 0 { dup neg 1.0 add setgray 0 11 3 -1 roll 68 mul 4.5 rectfill } for
-
- 1 0 0 setrgbcolor
- 67.5 11 4.5 4.5 rectfill
- grestore
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -592,46 +564,35 @@ gsave
(Printer Test Page) CENTER % Show text centered
% Draw the copyright notice at the bottom...
- pageWidth 36 mul % Center of page
- pageHeight 12 mul % Bottom of page
+ pageWidth 17 mul % Center of page
+ pageHeight 10 mul % Bottom of page
moveto % Position text
- (Printed Using CUPS v1.3.x) CENTER % Show text centered
+ (Printed Using CUPS v1.3.x) show
- pageWidth 34 mul % Left-center of page
+ pageWidth 17 mul % Left side of page
pageHeight 8 mul % Move down...
2 copy moveto % Position text
smallFont setfont % Font
- (Copyright 1993-2006 Easy Software Products, All Rights Reserved.) CENTER
- pageHeight sub % Move down...
- 2 copy moveto % Position text
- (CUPS, and the CUPS logo are the trademark property of Easy Software Products,) CENTER
- pageHeight sub % Move down...
+ (Copyright 2007 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are the trademark) show
+ pageHeight 2 add sub % Move down...
2 copy moveto % Position text
- (44141 Airport View Drive, Suite 204, Hollywood, Maryland, 20636, USA.) CENTER
- pageHeight sub % Move down...
- pageHeight sub % Move down...
+ (property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show
+ pageHeight 2 mul 4 add sub % Move down...
moveto % Position text
- (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) CENTER
+ (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show
% Then the CUPS logo....
gsave
pageWidth 4 mul
pageHeight 4 mul
translate
- pageWidth 9 mul CUPSLOGO
+ pageWidth 15 mul CUPSLOGO
grestore
- % And the ESP logo....
- gsave
- pageWidth 58 mul
- pageHeight 4 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: testprint.ps 6295 2007-02-20 16:31:58Z mike $".
+% End of "$Id: testprint.ps 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/topsecret b/data/topsecret
index 389cbf105..7ac9b5b63 100644
--- a/data/topsecret
+++ b/data/topsecret
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -186,7 +83,7 @@ gsave
pageWidth 36 mul % Center of page
pageHeight 72 mul % Top of page
- pageWidth -7 mul add % - 2 lines
+ pageWidth 9 mul sub % - 3 lines
moveto % Position text
bigFont setfont % Font
(Top Secret) CENTER % Show text centered
@@ -219,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: topsecret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: topsecret 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/data/unclassified b/data/unclassified
index 804773e6e..385f903a9 100644
--- a/data/unclassified
+++ b/data/unclassified
@@ -5,32 +5,22 @@
%%DocumentData: Clean7Bit
%%DocumentSuppliedResources: procset bannerprint/1.0
%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
-%%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: May 10, 2000
+%%Creator: Michael Sweet, Apple Inc.
+%%CreationDate: D:20070620123000+0700
%%Title: Test Page
%%EndComments
%%BeginProlog
-%%BeginResource procset bannerprint 1.1 0
+%%BeginResource procset bannerprint 1.3 0
%
% PostScript banner page for the Common UNIX Printing System ("CUPS").
%
+% Copyright 2007 Apple Inc.
% Copyright 1993-2005 Easy Software Products
%
% These coded instructions, statements, and computer programs are the
-% property of Easy Software Products and are protected by Federal
-% copyright law. Distribution and use rights are outlined in the file
-% "LICENSE.txt" which should have been included with this file. If this
-% file is missing or damaged please contact Easy Software Products
-% at:
-%
-% Attn: CUPS Licensing Information
-% Easy Software Products
-% 44141 Airport View Drive, Suite 204
-% Hollywood, Maryland 20636 USA
-%
-% Voice: (301) 373-9600
-% EMail: cups-info@cups.org
-% WWW: http://www.cups.org
+% property of Apple Inc. and are protected by Federal copyright law.
+% Distribution and use rights are outlined in the file "LICENSE.txt"
+% which is included with the CUPS source distribution.
%
/CENTER { % Draw centered text
% (name) CENTER -
@@ -53,99 +43,6 @@
} ifelse
100 string cvs show % Convert to a string and show it...
} bind def
-/CUPSLOGO { % Draw the CUPS logo
- % height CUPSLOGO
- % Start with a big C...
- /Helvetica findfont 1 index scalefont setfont
- 0 setgray
- 0 0 moveto
- (C) show
-
- % Then "UNIX Printing System" much smaller...
- /Helvetica-Bold findfont 1 index 9 div scalefont setfont
- 0.25 mul
- dup dup 2.0 mul moveto
- (UNIX) show
- dup dup 1.6 mul moveto
- (Printing) show
- dup 1.2 mul moveto
- (System) show
-} bind def
-/ESPLOGO { % Draw the ESP logo
- % height ESPLOGO
- % Compute the size of the logo...
- 0 0
- 2 index 1.5 mul 3 index
-
- % Do the "metallic" fill from 10% black to 40% black...
- 1 -0.001 0 {
- dup % loopval
- -0.15 mul % loopval * -0.15
- 0.9 add % 0.9 - loopval * 0.15
- setgray % set gray shade
-
- 0 % x
- 1 index neg % loopval
- 1 add % 1 - loopval
- 3 index % height
- mul % height * (1 - loopval)
- moveto % starting point
-
- dup % loopval
- 3 index % width
- mul % loopval * width
- 2 index % height
- lineto % Next point
-
- 0 % x
- 2 index % height
- lineto % Next point
-
- closepath
- fill
-
- dup % loopval
- 0.15 mul % loopval * 0.15
- 0.6 add % 0.6 + loopval * 0.15
- setgray
-
- dup % loopval
- neg 1 add % 1 - loopval
- 3 index % width
- mul % (1 - loopval) * width
- 0 % y
- moveto % Starting point
-
- 2 index % width
- exch % loopval
- 2 index % height
- mul % loopval * height
- lineto % Next point
-
- 1 index % width
- 0 % y
- lineto % Next point
-
- closepath
- fill
- } for
-
- 0 setgray rectstroke
-
- /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont
- dup 40 div
-
- dup 4 mul 1 index 25 mul moveto (E) show
- dup 10 mul 1 index 15 mul moveto (S) show
- dup 16 mul 1 index 5 mul moveto (P) show
-
- /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont
- dup 14 mul 1 index 29 mul moveto (asy) show
- dup 20 mul 1 index 19 mul moveto (oftware) show
- dup 26 mul 1 index 9 mul moveto (roducts) show
-
- pop
-} bind def
%%EndResource
%%EndProlog
%%Page: 1 1
@@ -186,7 +83,7 @@ gsave
pageWidth 36 mul % Center of page
pageHeight 72 mul % Top of page
- pageWidth -7 mul add % - 2 lines
+ pageWidth 9 mul sub % - 3 lines
moveto % Position text
bigFont setfont % Font
(Unclassified) CENTER % Show text centered
@@ -219,59 +116,44 @@ gsave
pageWidth 36 mul % x = pageWidth * 1/2 * 72
pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 5 mul add % y += 2 lines
+ pageHeight 5 mul add % y += 3.333 lines
2 copy % Copy X & Y
moveto
(Job ID: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({printer-name}-{job-id}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight 2 mul add % y += 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Title: ) RIGHT
+ 2 copy % Copy X & Y
moveto
({job-name}) show
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -1 mul add % y -= 1 line
+ pageHeight 3 mul sub % y -= 2 lines
2 copy % Copy X & Y
moveto
(Requesting User: ) RIGHT
- moveto
- ({job-originating-user-name}) show
-
- pageWidth 36 mul % x = pageWidth * 1/2 * 72
- pageHeight 36 mul % y = pageHeight * 1/2 * 72
- pageHeight -4 mul add % y -= 2 lines
2 copy % Copy X & Y
moveto
- (Billing Info: ) RIGHT
- moveto
- ({job-billing}) show
+ ({job-originating-user-name}) show
- % Then the CUPS logo....
- gsave
- pageWidth 4 mul
- pageWidth 6 mul
- translate
- pageWidth 9 mul CUPSLOGO
- grestore
+ ({?job-billing}) () ne {
+ pageHeight 3 mul sub % y -= 2 lines
+ 2 copy % Copy X & Y
+ moveto
+ (Billing Info: ) RIGHT
+ 2 copy % Copy X & Y
+ moveto
+ ({job-billing}) show
+ } if
- % And the ESP logo....
- gsave
- pageWidth 59 mul
- pageWidth 6 mul
- translate
- pageWidth 6 mul ESPLOGO
- grestore
% Show the page...
grestore
showpage
%
-% End of "$Id: unclassified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id: unclassified 6649 2007-07-11 21:46:42Z mike $".
%
%%EOF
diff --git a/desktop/cups.desktop b/desktop/cups.desktop
index 3657d87f9..ced9b0cb4 100644
--- a/desktop/cups.desktop
+++ b/desktop/cups.desktop
@@ -31,3 +31,6 @@ Name[he]=× ×× ××פס×ת
Comment[he]=××שק ×פ××¤× ×©× CUPS
Name[zh_TW]=å°è¡¨ç®¡ç
Comment[zh_TW]=CUPS 網é ä»é¢
+Name[de]=Druckerverwaltung
+Comment[de]=CUPS Webinterface
+
diff --git a/doc/Makefile b/doc/Makefile
index 540791a93..69d17e249 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,25 +1,16 @@
#
-# "$Id: Makefile 6594 2007-06-21 21:51:15Z mike $"
+# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
#
# Documentation makefile for the Common UNIX Printing System (CUPS).
#
+# Copyright 2007 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
-# property of Easy Software Products and are protected by Federal
-# copyright law. Distribution and use rights are outlined in the file
-# "LICENSE.txt" which should have been included with this file. If this
-# file is missing or damaged please contact Easy Software Products
-# at:
-#
-# Attn: CUPS Licensing Information
-# Easy Software Products
-# 44141 Airport View Drive, Suite 204
-# Hollywood, Maryland 20636 USA
-#
-# Voice: (301) 373-9600
-# EMail: cups-info@cups.org
-# WWW: http://www.cups.org
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
diff --git a/doc/de/index.html.in b/doc/de/index.html.in
index 1fbedf113..252b20567 100644
--- a/doc/de/index.html.in
+++ b/doc/de/index.html.in
@@ -84,15 +84,9 @@ den Benutzernamen und das Passwort des "root" Benutzers ein.
-
-
CUPS stellt eine portierbare Druckerschicht für
UNIX®-basierte Betriebssysteme bereit. Es wird entwickelt
-und gepflegt von Easy Software
-Products um eine Standard Druckerlösung zu fördern. CUPS ist das
+und gepflegt von Apple Inc. um eine Standard Druckerlösung zu fördern. CUPS ist das
Standard Drucksystem welches von MacOS® X und den meisten
Linux® Distributionen verwendet wird.
@@ -112,14 +106,6 @@ Unterstützung zu erhalten:
www.cups.org
-Kommerzieller Support und eine erweiterte Version von CUPS genannt ESP Print Pro ist
-verfügbar unter:
-
-
- www.easysw.com
-
-
|
@@ -129,8 +115,7 @@ WIDTH="15" HEIGHT="15" ALT="">
Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-Warenzeichen der Easy Software
-Products. CUPS ist urheberrechtlich geschützt 1997-2007 von Easy Software Products,
+Warenzeichen der Apple Inc./A> CUPS ist urheberrechtlich geschützt 2007 von Apple Inc,
Alle Rechte vorbehalten.
|
diff --git a/doc/es/index.html.in b/doc/es/index.html.in
index 735c99378..bca5a1cef 100644
--- a/doc/es/index.html.in
+++ b/doc/es/index.html.in
@@ -85,16 +85,10 @@ contraseña de "root".
-
-
CUPS proporciona una capa de impresión portable
para sistemas operativos basados en
UNIX®. Está desarrollado y mantenido
-por Easy Software
-Products para favorecer una solución de impresión
+por Apple Inc. para favorecer una solución de impresión
estandar. CUPS es el sistema de impresión estandar usado en
MacOS® X y la mayoría de distribuciones
Linux®.
@@ -115,14 +109,6 @@ y asistencia:
www.cups.org
-Soporte comercial y una versión mejorada de CUPS llamada ESP Print Pro están
-disponibles en:
-
-
- www.easysw.com
-
-
|
@@ -132,8 +118,8 @@ WIDTH="15" HEIGHT="15" ALT="">
Common UNIX Printing System, CUPS, y el logo de CUPS son
-marcas registradas de Easy Software
-Products. Los derechos de copia de CUPS 1997-2007 son de Easy Software Products.
+marcas registradas de Apple Inc.
+Los derechos de copia de CUPS 2007 son de Apple Inc.
Todos los derechos reservados.
|
diff --git a/doc/et/index.html.in b/doc/et/index.html.in
index 3e20bbdad..bcf1aae05 100644
--- a/doc/et/index.html.in
+++ b/doc/et/index.html.in
@@ -83,15 +83,10 @@ või administraatori (root) kasutajanimi ja parool.
-
-
CUPS pakub porditavat trükkimiskihti
UNIX® põhistele operatsioonisüsteemidele. CUPS-i töötas
-välja ja hooldab Easy Software
-Products, selle siht on edendada standardseid trükkimislahendusi. CUPS on
+välja ja hooldab Apple Inc,
+selle siht on edendada standardseid trükkimislahendusi. CUPS on
standardne trükkimissüsteem, mida kasutavad MacOS® X ja
suurem osa Linux® distributsioone.
@@ -110,14 +105,6 @@ ametlikku veebilehekülge:
www.cups.org
-Kommertstoetus ja CUPS-i täiustatud versioon nimetusega ESP Print Pro on
-saadaval aadressil:
-
-
- www.easysw.com
-
-
|
@@ -127,8 +114,7 @@ WIDTH="15" HEIGHT="15" ALT="">
Common UNIX Printing System, CUPS ja CUPS-i logo on
-firma Easy Software
-Products kaubamärgid. CUPS-i autoriõigus 1997-2007: Easy Software Products,
+firma Apple Inc. kaubamärgid. CUPS-i autoriõigus 2007: Apple Inc,
kõik õigused kaitstud.
|
diff --git a/doc/fr/index.html.in b/doc/fr/index.html.in
index e9d338268..a10365f35 100644
--- a/doc/fr/index.html.in
+++ b/doc/fr/index.html.in
@@ -83,14 +83,8 @@ votre mot de passe UNIX ou bien identifiez-vous en tant que "root".
-
-
CUPS propose une interface portable pour l'impression sur les systèmes
-UNIX®. Ce logiciel est développé et maintenu par Easy Software
-Products afin de promouvoir une solution standard pour l'impression. CUPS
+UNIX®. Ce logiciel est développé et maintenu par Apple Inc. afin de promouvoir une solution standard pour l'impression. CUPS
est le système d'impression standard de MacOS® X et de la
plupart des distributions Linux®.
@@ -109,13 +103,6 @@ autre assistance:
www.cups.org
-Vous pouvez obtenir un suivi commercial et une version améliorée de CUPS, ESP Print Pro, à l'adresse suivante:
-
-
- www.easysw.com
-
-
|
@@ -125,8 +112,8 @@ WIDTH="15" HEIGHT="15" ALT="">
Le logiciel CUPS ( Common UNIX Printing System ) et son logo sont
-propriété commerciale de Easy Software
-Products. CUPS est sous copyright 1997-2006 par Easy Software Products, Tous
+propriété commerciale de Apple Inc. CUPS
+est sous copyright 2007 par Apple Inc, Tous
Droits Réservés.
|
diff --git a/doc/he/index.html.in b/doc/he/index.html.in
index 1b23db285..afb900d45 100644
--- a/doc/he/index.html.in
+++ b/doc/he/index.html.in
@@ -82,14 +82,8 @@ BORDER="0" ALT="">
-
-
CUPS ×ספקת ××שק ×××¤×¡× × ××× ××ער××ת ×פע×× ×××סס×ת ®UNIX.
-×ת××× × ×פ×ת×ת ××ת×××קת ×¢"× Easy Software
-Products ××× ×ק×× ×¤×ª×¨×× ×××¤×¡× ×ª×§× ×. CUPS ××× ×ער×ת ××××¤×¡× ××ª×§× ×ת ××××ª×§× ×ª
+×ת××× × ×פ×ת×ת ××ת×××קת ×¢"× Apple Inc. ××× ×ק×× ×¤×ª×¨×× ×××¤×¡× ×ª×§× ×. CUPS ××× ×ער×ת ××××¤×¡× ××ª×§× ×ת ××××ª×§× ×ª
×¢× MacOS® X ×ר×× ×ער××ת ×- ®Linux.
CUPS ×שת×שת × Internet Printing Protocol ("IPP") ××ס×ס ×× ××××
www.cups.org
-
ת×××× ×ס×ר×ת ×××¨×¡× ×תק××ת ×©× CUPS ×× ×§×¨×ת ESP Print Pro ×××× × ×:
-
-
- www.easysw.com
-
-
|
@@ -122,9 +109,8 @@ WIDTH="15" HEIGHT="15" ALT="">
The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of Easy Software
-Products. CUPS is copyright 1997-2006 by Easy Software Products,
-All Rights Reserved.
+trademark property of Apple Inc.
+CUPS is copyright 2007 by Apple Inc, All Rights Reserved.
|
diff --git a/doc/help/api-array.html b/doc/help/api-array.html
index 160b3ff47..20ba85e95 100644
--- a/doc/help/api-array.html
+++ b/doc/help/api-array.html
@@ -16,27 +16,18 @@
Introduction
@@ -91,6 +82,7 @@ library:
cupsArrayInsert()
cupsArrayLast()
cupsArrayNew()
+ cupsArrayNew2() CUPS 1.3
cupsArrayNext()
cupsArrayPrev()
cupsArrayRemove()
@@ -102,19 +94,18 @@ library:
Description
Add an element to the array.
-
-When adding an element to a sorted array, non-unique elements are
+
When adding an element to a sorted array, non-unique elements are
appended at the end of the run. For unsorted arrays, the element
-is inserted at the end of the array.
+is inserted at the end of the array.
Syntax
-
-int
+
+int
cupsArrayAdd(
cups_array_t * a,
void * e);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -125,15 +116,15 @@ cupsArrayAdd(
Description
-Clear the array.
+Clear the array.
Syntax
-
-void
+
+void
cupsArrayClear(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -143,15 +134,15 @@ cupsArrayClear(
Description
-Get the number of elements in the array.
+Get the number of elements in the array.
Syntax
-
-int
+
+int
cupsArrayCount(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -161,15 +152,15 @@ cupsArrayCount(
Description
-Return the current element in the array.
+Return the current element in the array.
Syntax
-
-void *
+
+void *
cupsArrayCurrent(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -179,15 +170,15 @@ cupsArrayCurrent(
Description
-Free all memory used by the array.
+Free all memory used by the array.
Syntax
-
-void
+
+void
cupsArrayDelete(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -197,15 +188,15 @@ cupsArrayDelete(
Description
-Duplicate the array.
+Duplicate the array.
Syntax
-
-cups_array_t *
+
+cups_array_t *
cupsArrayDup(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -215,16 +206,16 @@ cupsArrayDup(
Description
-Find an element in the array.
+Find an element in the array.
Syntax
-
-void *
+
+void *
cupsArrayFind(
cups_array_t * a,
void * e);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -235,15 +226,15 @@ cupsArrayFind(
Description
-Get the first element in the array.
+Get the first element in the array.
Syntax
-
-void *
+
+void *
cupsArrayFirst(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -255,15 +246,15 @@ cupsArrayFirst(
Description
Get the index of the current element.
-
+
Syntax
-
-int
+
+int
cupsArrayGetIndex(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -275,15 +266,15 @@ cupsArrayGetIndex(
Description
Get the index of the last inserted element.
-
+
Syntax
-
-int
+
+int
cupsArrayGetInsert(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -293,16 +284,16 @@ cupsArrayGetInsert(
Description
-Get the N-th element in the array.
+Get the N-th element in the array.
Syntax
-
-void *
+
+void *
cupsArrayIndex(
cups_array_t * a,
int n);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -314,19 +305,18 @@ cupsArrayIndex(
Description
Insert an element in the array.
-
-When inserting an element in a sorted array, non-unique elements are
+
When inserting an element in a sorted array, non-unique elements are
inserted at the beginning of the run. For unsorted arrays, the element
-is inserted at the beginning of the array.
+is inserted at the beginning of the array.
Syntax
-
-int
+
+int
cupsArrayInsert(
cups_array_t * a,
void * e);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -337,15 +327,15 @@ cupsArrayInsert(
Description
-Get the last element in the array.
+Get the last element in the array.
Syntax
-
-void *
+
+void *
cupsArrayLast(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -355,35 +345,61 @@ cupsArrayLast(
Description
-Create a new array.
+Create a new array.
Syntax
-
-cups_array_t *
+
+cups_array_t *
cupsArrayNew(
cups_array_func_t f,
void * d);
-
+
+Arguments
+
+Name | Description |
+
+f | Comparison function |
+d | User data |
+
+Returns
+Array
+
+
+Description
+Create a new array with hash.
+
+
+
Syntax
+
+cups_array_t *
+cupsArrayNew2(
+ cups_array_func_t f,
+ void * d,
+ cups_ahash_func_t h,
+ int hsize);
+
Arguments
-
+
Name | Description |
f | Comparison function |
d | User data |
+h | Hash function |
+hsize | Hash size |
Returns
Array
Description
-Get the next element in the array.
+Get the next element in the array.
Syntax
-
-void *
+
+void *
cupsArrayNext(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -393,15 +409,15 @@ cupsArrayNext(
Description
-Get the previous element in the array.
+Get the previous element in the array.
Syntax
-
-void *
+
+void *
cupsArrayPrev(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -411,16 +427,16 @@ cupsArrayPrev(
Description
-Remove an element from the array.
+Remove an element from the array.
Syntax
-
-int
+
+int
cupsArrayRemove(
cups_array_t * a,
void * e);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -431,15 +447,15 @@ cupsArrayRemove(
Description
-Reset the current element to the last cupsArraySave.
+Reset the current element to the last cupsArraySave.
Syntax
-
-void *
+
+void *
cupsArrayRestore(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -450,16 +466,15 @@ cupsArrayRestore(
Description
Mark the current element for a later cupsArrayRestore.
-
-The save/restore stack is guaranteed to be at least 32 elements deep.
+The save/restore stack is guaranteed to be at least 32 elements deep.
Syntax
-
-int
+
+int
cupsArraySave(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -469,15 +484,15 @@ cupsArraySave(
Description
-Return the user data for an array.
+Return the user data for an array.
Syntax
-
-void *
+
+void *
cupsArrayUserData(
cups_array_t * a);
-
+
Arguments
-
+
Name | Description |
a | Array |
@@ -487,24 +502,33 @@ cupsArrayUserData(
+
+Description
+Array hash function
+
Definition
+
+typedef int (*cups_ahash_func_t)(void *element, void *data);
+
+
Description
-Array comparison function
+Array comparison function
Definition
-
+
typedef int (*cups_array_func_t)(void *first, void *second, void *data);
-
+
Description
-CUPS array type
+CUPS array type
Definition
-
+
typedef struct _cups_array_s cups_array_t;
-
+