abc/CUPS-for-Android
1
0
Fork 0
mirror of https://github.com/MopriaAlliance/CUPS-for-Android.git synced 2025-12-15 21:46:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moving to 2.2.4

Browse Source
This commit is contained in:
Noha Elarief 2018-01-18 10:12:02 -08:00
parent aa1e1a0275
commit 2e35f8e412
125 changed files with 3160 additions and 1821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@ -62,22 +62,23 @@ LOCAL_SRC_FILES:= \
cups/string.c \ cups/string.c \
cups/tempfile.c \ cups/tempfile.c \
cups/thread.c \ cups/thread.c \
cups/tls-gnutls.c \ cups/tls.c \
cups/transcode.c \ cups/transcode.c \
cups/usersys.c \ cups/usersys.c \
cups/util.c \ cups/util.c \
filter/error.c \ filter/error.c \
filter/raster.c \ filter/raster.c \
mopria.c \
disabled_src_files:= \ disabled_src_files:= \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/cups \ $(LOCAL_PATH)/cups \
$(LOCAL_PATH)/../gnutls/include $(LOCAL_PATH)/../gnutls/include
LOCAL_CFLAGS := -D_PPD_DEPRECATED= LOCAL_CFLAGS := -D_PPD_DEPRECATED= -Wno-implicit-function-declaration -Wno-empty-body
LOCAL_MODULE := lib$(PRIV_LIB_NAME)cups LOCAL_MODULE := lib$(PRIV_LIB_NAME)cups
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_LDLIBS += -lz -llog LOCAL_LDLIBS += -lz -llog -Wl,--no-warn-shared-textrel
LOCAL_STATIC_LIBRARIES := libgnutls LOCAL_STATIC_LIBRARIES := libgnutls
LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

374
CHANGES.txt
View File

@ -1,225 +1,183 @@
CHANGES.txt - 1.6.3 - 2013-07-11 CHANGES - 2.2.4 - 2017-06-30
-------------------------------- ============================
CHANGES IN CUPS V1.6.3 CHANGES IN CUPS V2.2.4
----------------------
- The configure script now prefers Clang over GCC. - The scheduler did not remove old job files (Issue #4987)
- Fixed a compile problem on AIX (STR #4307) - cupsEnumDests did not return early when all printers had been discovered
- The default IPP version did not always get set before creating a new (Issue #4989)
IPP request message (<rdar://problem/14401718>) - The CUPS build system now supports cross-compilation (Issue #4897)
- The lp, lpq, lpr, and lpstat now display an error message advising the - Added a new CUPS Programming Manual to replace the aging API documentation.
use of the /version=1.1 ServerName option (<rdar://problem/14290628>) - Added the `cupsAddIntegerOption` and `cupsGetIntegerOption` functions
- Added documentation about the /version=1.1 option to ServerName in (Issue #4992)
client.conf (<rdar://problem/14216262>) - The `cupsGetDests` and `cupsCreateJob` functions now support Bonjour printers
- httpStatus(HTTP_ERROR) did not return a useful error message (Issue #4993)
(<rdar://problem/14217326>) - Added a USB quirk rule for Lexmark E260dn printers (Issue #4994)
- The lp, lpq, lpr, and lpstat commands incorrectly ignored the default - Fixed a potential buffer overflow in the `cupstestppd` utility (Issue #4996)
printer set in the lpoptions file (<rdar://problem/14216472>) - IPP Everywhere improvements (Issue #4998)
- Fixed a URI encoding issue for hostnames containing the ` (backquote) - Fixed the "cancel all jobs" function in the web interface for several
character (<rdar://problem/14243133>) languages (Issue #4999)
- Added support for RFC 6874's IPv6 link local address format in URIs - Fixed issues with local queues (Issue #5003, Issue #5008, Issue #5009)
(<rdar://problem/13979453>) - The `lpstat` command now supports a `-e` option to enumerate local printers
- The USB backend could crash on libusb-based systems if USB was (either previously added or on the network) that can be accessed
disabled in the BIOS (<rdar://problem/13875729>) (Issue #5005)
- Fixed a rounding error in the PWG media size mapping code - The `lp` and `lpr` commands now support printing to network printers that
(<rdar://problem/13493241>) haven't yet been added (Issue #5006)
- Fixed several ipptool test files that used old STATUS names. - Fixed a typo in the mime.types file.
- Kerberos credentials could get truncated when printing to a shared - Fixed a bug in the Spanish web interface template (Issue #5016)
printer. - The `cupsEnumDests*` and `cupsGetDest*` functions now report the value of the
- Printing using "ipps" URIs was not encrypted. "printer-is-temporary" Printer Status attribute (Issue #5028)
- Insecure ICC profiles prevented installation of user profiles for a - Added Chinese localization (Issue #5029)
printer on OS X. - The `cupsCheckDestSupported` function did not support `NULL` values
- Added more USB quirks for the libusb-based backend (STR #4311, (Issue #5031)
<rdar://problem/13736470>) - Fixed some issues in the RPM spec file (Issue #5032)
- The Russian web interface templates were broken (STR #4310) - The `cupsConnectDest` function now supports the `CUPS_DEST_FLAGS_DEVICE` flag
- The scheduler no longer tries to do Kerberos authentication over the for explicitly connecting to the device (printer) associated with the
loopback interface. destination.
- The IPP backend could fail to pause a job for authentication - The `SSLOptions` directive in "client.conf" and "cupsd.conf" now supports
(STR #4298) `DenyCBC` and `DenyTLS1.0` options (Issue #5037)
- Fixed a regression on the handling of auth keys on OS X if the
cups-files.conf was not present or did not contain a SystemAuthKey
value.
- The scheduler incorrectly did a reverse lookup of the server address
when HostNameLookups was turned off (STR #4302)
- The scheduler incorrectly computed the final content type value when
null filters were present.
CHANGES IN CUPS V1.6.2 CHANGES IN CUPS V2.2.3
----------------------
- Documentation fixes (STR #4229, STR #4239, STR #4234, STR #4248, - The IPP backend could get into an infinite loop for certain errors, causing a
STR #4259) hung queue (<rdar://problem/28008717>)
- Security: All file, directory, user, and group settings are now stored - The scheduler could pause responding to client requests in order to save state
in a separate cups-files.conf configuration file that cannot be set changes to disk (<rdar://problem/28690656>)
through the CUPS web interface or APIs (STR #4223) - Added support for PPD finishing keywords (Issue #4960, Issue #4961,
- Added a Czech localization (STR #4201) Issue #4962)
- Added a French localization (STR #4247) - The IPP backend did not send a media-col attribute for just the source or type
- Added a Russian localization (STR #4228, STR #4285) (Issue #4963)
- Updated the Catalan localization (STR #4202) - IPP Everywhere print queues did not always support all print qualities
- Local certificate authentication did not guard against an empty supported by the printer (Issue #4953)
certification file (STR #4293) - IPP Everywhere print queues did not always support all media types supported
- The scheduler did not reject device URIs with spaces. by the printer (Issue #4953)
- Added USB quirk rule for Epson Stylus Photo 750 (STR #4286) - The IPP Everywhere PPD generator did not return useful error messages
- The IPP backend could crash if the printer disconnects early (Issue #4954)
(STR #4284) - The IPP Everywhere finishings support did not work correctly with common UI or
- cupsGetPPD did not work with statically-configured CUPS shared command-line options (Issue #4976)
queues (STR #4178) - Fixed an error handling issue for the network backends (Issue #4979)
- The scheduler did not support long MIME media types (STR #4270) - The default cupsd.conf file did not work on systems compiled without Kerberos
- The cupsfilter command did not set the CHARSET environment variable support (Issue #4947)
for the text filters (STR #4273) - The "reprint job" option was not available for some canceled jobs
- The lp command did not show errors for unknown "--foo" (STR #4261) (Issue #4915)
- Bad IPP responses could crash ipptool (STR #4262) - Updated the job listing in the web interface (Issue #4978)
- Updated USB quirk rules for Canon and Xerox printers (STR #4217, - Fixed some localization issues on macOS (<rdar://problem/27245567>)
STR #4263)
- Added USB blacklisting for printers that require a custom backend
(STR #4218)
- The PPD compiler did not correctly JCL options (STR #4115, STR #4203)
- The ipptool program now supports DEFINE-MATCH and DEFINE-NO-MATCH
predicates for STATUS directives.
- Fixed a problem with local Kerberos authentication (STR #4140)
- Coverity scan: fixed some minor issues (STR #4242)
- The scheduler did not remove color profiles after deleting a printer
(STR #4232, STR #4276)
- The CUPS library did not always detect a timed out connection to the
server which could cause temporary loss of printing from applications
(STR #4187)
- The ipptool program now supports variable substitution in OPERATION
and DELAY directives (STR #4175)
- The IPP backend now stops queues when the server configuration
prevents successful job submission (STR #4125)
- The XML output of ipptool contained empty dictionaries (STR #4136)
- The scheduler did not delete job control backup files (STR #4244)
- cupsGetPPD3 could return a local PPD instead of the correct remote
PPD.
- The scheduler incorrectly advertised auth-info-required for local
queues needing local authentication (STR #4205)
- CUPS 1.6 clients using the ServerName directive in client.conf did not
work with CUPS 1.3.x or older servers (STR #4231, STR #4291)
- The SNMP backend now tries to work around broken printers that use a
newline to separate key/value pairs.
- The IPP backend did not send a cancel request to printers when a job
was canceled and the printer did not support Create-Job.
- Fixed EPM packaging files (STR #4199)
- OpenBSD build fix (STR #4195, STR #4196, STR #4197)
- The scheduler could crash when using Avahi (STR #4183, STR #4192,
STR #4200, STR #4213)
- The IPP backend could get stuck in an endless loop on certain network
errors (STR #4194)
- 32-bit builds failed on Debian (STR #4133)
- The scheduler no longer accepts or sends job description attributes.
- The IPP backend now works around some conformance issues for broken
printers (STR #4190)
- cupsBackendReport() now filters out all control characters from the
reported 1284 device IDs (STR #4124)
- The scheduler no longer allows job-name values that are not valid
network Unicode strings (STR #4072)
- The web interface did not preserve the order of classes, jobs, or
printers (STR #4170)
- The network backends now support disabling of SNMP supply level
queries via the "snmp" URI option (STR #4106)
- The IPP backend did not specify the compression used (STR #4181)
- ipptool did not support octetString values.
- The scheduler did not recognize dnssd: or ipps: URIs as Bonjour shared
queues (STR #4158)
- Applications could not get the PPD file for statically-configured
Bonjour-shared print queues (STR #4159)
- The cupsd.conf file included obsolete browsing directives (STR #4157)
- Fixed a USB backend compatibility issue on systems using libusb
(STR #4155, STR #4191)
- Some Bonjour features were not available on systems with Avahi
(STR #4156)
- CUPS now includes the port number in the Host: header for HTTP
requests.
- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
out.
CHANGES IN CUPS V1.6.1 CHANGES IN CUPS V2.2.2
----------------------
- Documentation fix (STR #4149) - Fixed some issues with the Zebra ZPL printer driver (Issue #4898)
- RPM packaging fixes (STR #4129, #4145) - Fixed some issues with IPP Everywhere printer support (Issue #4893,
- The Japanese and English web interface headers were swapped Issue #4909, Issue #4916, Issue #4921, Issue #4923, Issue #4932, Issue #4933,
(STR #4148) Issue #4938)
- The rastertopwg filter could crash with certain input (Issue #4942)
- Optimized connection usage in the IPP backend (<rdar://problem/29547323>)
- The scheduler did not detect when an encrypted connection was closed by the
client on Linux (Issue #4901)
- The cups-lpd program did not catch all legacy usage of ISO-8859-1
(Issue #4899)
- Fixed builds on systems without a working poll() implementation (Issue #4905)
- Added a USB quirk rule for the Kyocera Ecosys P6026cdn (Issue #4900)
- The scheduler no longer creates log files on startup
(<rdar://problem/28332470>)
- The ippContainsString function now uses case-insensitive comparisons for
mimeMediaType, name, and text values in conformance with RFC 2911.
- The network backends now log the addresses that were found for a printer
(<rdar://problem/29268474>)
- Let's Encrypt certificates did not work when the hostname contained uppercase
letters (Issue #4919)
- Fixed reporting of printed pages in the web interface (Issue #4924)
- Updated systemd config files (Issue #4935)
- Updated documentation (PR #4896)
- Updated localizations (PR #4894, PR #4895, PR #4904, PR #4908, Issue #4946)
- Updated packaging files (Issue #4940)
CHANGES IN CUPS V1.6.0 CHANGES IN CUPS V2.2.1
----------------------
- Document changes (STR #4131) - Added "CreateSelfSignedCerts" directive for cups-files.conf to control whether
- Added new Catalan (STR #4107) and Spanish (STR #4137) localizations. the scheduler automatically creates its own self-signed X.509 certificates for
TLS connections (Issue #4876)
- http*Connect did not handle partial failures (Issue #4870)
- Addressed some build warnings on Linux (Issue #4881)
- cupsHashData did not use the correct hashing algorithm
(<rdar://problem/28209220>)
- Updated man pages (PR #4885)
- Updated localizations (PR #4877, PR #4886)
CHANGES IN CUPS V1.6rc1 CHANGES IN CUPS V2.2.0
----------------------
- Added a new Japanese localization (STR #4122) - Normalized the TLS certificate validation code and added additional error
- The SNMP backend no longer exits if it is unable to obtain an IPv6 messages to aid troubleshooting.
socket (STR #4109) - The httpConnect functions did not work on Linux when cupsd was not running
- The LPD backend incorrectly used "localhost" in the control file (Issue #4870)
instead of the current hostname. - The --no-remote-any option of cupsctl had no effect (Issue #4866)
- http*Connect did not return early when all addresses failed (Issue #4870)
CHANGES IN CUPS V1.6b1 CHANGES IN CUPS V2.2rc1
-----------------------
- Documentation updates (STR #3927, STR #3980, STR #4010, STR #4068) - Updated the list of supported IPP Everywhere media types.
- The scheduler now consolidates all PPD updates from filters at the - The IPP backend did not validate TLS credentials properly.
end of the job (STR #4075) - The printer-state-message attribute was not cleared after a print job with no
- CUPS now supports color management using colord (STR #3808) errors (Issue #4851)
- CUPS now supports Bonjour using Avahi (STR #3066) - The CUPS-Add-Modify-Class and CUPS-Add-Modify-Printer operations did not
- The PreserveJobFiles and PreserveJobHistory directives now support always return an error for failed adds (Issue #4854)
specification of a time interval (STR #3143) - PPD files with names longer than 127 bytes did not work (Issue #4860)
- PPD files can now be archived in (gzip'd) tar files to further reduce - Updated localizations (Issue #4846, PR #4858)
the disk space used by PPD files (STR #3772)
- The network backends now deal with printers that report their levels
in percent but do not specify a maximum capacity of 100 (STR #3551) CHANGES IN CUPS V2.2b2
- The network backends now report full/almost-full waste bins in ----------------------
printers along with end-of-life for cleaning pads (STR #4017)
- Added a configure option to set the permissions of the installed - Added Upstart support (PR #4825)
cupsd (STR #3459) - CUPS now supports Let's Encrypt certificates on Linux.
- Added a new WITH-ALL-VALUES directive to ipptool EXPECT predicates
(STR #3949)
- CUPS now supports a User directive in client.conf and the CUPS_USER CHANGES IN CUPS V2.2b1
environment variable for overriding the default username (STR #3114) ----------------------
- Now set the PJL USERNAME variable as needed (STR #3100)
- Added support for usernames and passwords longer than 32 characters - All CUPS commands now support POSIX options (Issue #4813)
(STR #2856) - The scheduler now restarts faster (Issue #4760)
- Added a new MaxHoldTime directive to automatically cancel jobs that - Improved performance of web interface with large numbers of jobs (Issue #3819)
have been held indefinitely after a specific number of seconds - Encrypted printing can now be limited to only trusted printers and servers
(STR #2291) (<rdar://problem/25711658>)
- The LPD backend now uses the originating host name when it is not the - The scheduler now advertises PWG Raster attributes for IPP Everywhere clients
local system (STR #2053) (Issue #4428)
- CUPS now prefers the suffix "dpcm" when reporting resolution in dots- - The scheduler now logs informational messages for jobs at LogLevel "info"
per-centimeter (STR #4006) (Issue #4815)
- The configure script and build system no longer support building of - The scheduler now uses the getgrouplist function when available (Issue #4611)
separate 32-bit and 64-bit libraries. - The IPP backend no longer enables compression by default except for certain
- The "brightness", "columns", "fitplot", "gamma", "hue", raster formats that generally benefit from it (<rdar://problem/25166952>)
"natural-scaling", "penwidth", "position", "ppi", "saturation", and - The scheduler did not handle out-of-disk situations gracefully (Issue #4742)
"scaling" options are not longer supported (STR #4010) - The LPD mini-daemon now detects invalid UTF-8 sequences in job, document, and
- The "page-bottom", "page-left", "page-right", "page-top", user names (Issue #4748)
"prettyprint", and "wrap" options have been deprecated (STR #4010) - The IPP backend now continues on to the next job when the remote server/
- The scheduler now reports the standard "number-of-documents" attribute printer puts the job on hold (<rdar://problem/24858548>)
instead of the CUPS-specific "document-count" attribute in - The scheduler did not cancel multi-document jobs immediately
job objects. (<rdar://problem/24854834>)
- Added new destination connection and enumeration functions (STR #3924) - The scheduler did not return non-shared printers to local clients unless they
- Added new option, localization, and job submission functions that do connected to the domain socket (<rdar://problem/24566996>)
not depend on PPD files (STR #3925) - The scheduler now reads the spool directory if one or more job cache entries
- Added a new MaxJobTime directive for cupsd that specifies the maximum point to deleted jobs (<rdar://problem/24048846>)
amount of time allowed for a job to complete before it is canceled. - Added support for disc media sizes (<rdar://problem/20219536>)
- The default password callback now supports passwords up to 127 - The httpAddrConnect and httpConnect* APIs now try connecting to multiple
characters. addresses in parallel (<rdar://problem/20643153>)
- The scheduler now supports a DefaultAuthType of "auto" to - The cupsd domain socket is no longer world-accessible on macOS
automatically choose between Basic (username/password) and Negotiate (<rdar://problem/7542560>)
(Kerberos) authentication. - Interface scripts are no longer supported for security reasons
- cupsSideChannelSNMPGet/Walk now support OIDs and values up to 64k in (<rdar://problem/23135640>)
length. - Added a new cupsHashData API and support for hashed job passwords
- CUPS no longer supports automatic remote printers or implicit classes (<rdar://problem/20221502>)
via the CUPS, LDAP, or SLP protocols (STR #3922, STR #3923) - Localization fixes (<rdar://problem/25292403>, <rdar://problem/25461517>,
- The PPD APIs are now deprecated and will be removed in a future Issue #4041, Issue #4796)
version of CUPS (STR #3927) - Documentation changes (Issue #4624, Issue #4781)
- The default IPP version for requests is now 2.0 (STR #3929) - Packaging fixes (PR #4832)
- The IPP APIs no longer expose the ipp_t or ipp_attribute_t structures
and instead provide accessor functions (STR #3928)
- The scheduler will no longer run programs with group write permission.
- The PHP module has been removed (STR #3932)
- The bannertops, commandtoescpx, commandtopclx, imagetops,
imagetoraster, pdftops, rastertoescpx, rastertopclx, and texttops
filters have been removed (STR #3930)
- The serial and parallel backends have been removed (STR 3935)

8
CREDITS.txt
View File

@ -1,8 +1,8 @@
CREDITS.txt - 2016-06-21 CREDITS - 2017-05-01
------------------------ ====================
Few projects are completed by one person, and CUPS is no exception. We'd Few projects are completed by one person, and CUPS is no exception. We'd like
like to thank the following individuals for their contributions: to thank the following individuals for their contributions:
Niklas 'Nille' Åkerström - Swedish localization. Niklas 'Nille' Åkerström - Swedish localization.
Nathaniel Barbour - Lots of testing and feedback. Nathaniel Barbour - Lots of testing and feedback.

271
INSTALL.txt
View File

@ -1,212 +1,215 @@
INSTALL - CUPS v2.2.1 - 2016-10-03 INSTALL - CUPS v2.2.4 - 2017-06-30
---------------------------------- ==================================
This file describes how to compile and install CUPS from source code. For more This file describes how to compile and install CUPS from source code. For more
information on CUPS see the file called "README.txt". A complete change log can information on CUPS see the file called "README.txt". A complete change log can
be found in "CHANGES.txt". be found in "CHANGES.txt".
******************************************************************************* > USING CUPS REQUIRES ADDITIONAL THIRD-PARTY SUPPORT SOFTWARE AND PRINTER
******************************************************************************* > DRIVERS. THESE ARE TYPICALLY INCLUDED WITH YOUR OPERATING SYSTEM
**** **** > DISTRIBUTION. APPLE DOES NOT ENDORSE OR SUPPORT THIRD-PARTY SUPPORT SOFTWARE
**** USING CUPS REQUIRES ADDITIONAL THIRD-PARTY SUPPORT SOFTWARE AND **** > FOR CUPS.
**** PRINTER DRIVERS. THESE ARE TYPICALLY INCLUDED WITH YOUR OPERATING ****
**** SYSTEM DISTRIBUTION. APPLE DOES NOT ENDORSE OR SUPPORT THIRD-PARTY ****
**** SUPPORT SOFTWARE FOR CUPS. ****
**** ****
*******************************************************************************
*******************************************************************************
BEFORE YOU BEGIN BEFORE YOU BEGIN
----------------
You'll need ANSI-compliant C and C++ compilers, plus a make program and You'll need ANSI-compliant C and C++ compilers, plus a make program and POSIX-
POSIX-compliant shell (/bin/sh). The GNU compiler tools and Bash work well compliant shell (/bin/sh). The GNU compiler tools and Bash work well and we
and we have tested the current CUPS code against several versions of GCC have tested the current CUPS code against several versions of GCC with excellent
with excellent results. results.
The makefiles used by the project should work with most versions of make. The makefiles used by the project should work with most versions of make. We've
We've tested them with GNU make as well as the make programs shipped by tested them with GNU make as well as the make programs shipped by Compaq, HP,
Compaq, HP, SGI, and Sun. BSD users should use GNU make (gmake) since BSD SGI, and Sun. BSD users should use GNU make (gmake) since BSD make does not
make does not support "include". support "include".
Besides these tools you'll want ZLIB library for compression support, the Besides these tools you'll want ZLIB library for compression support, the GNU
GNU TLS library for encryption support on platforms other than iOS, macOS, TLS library for encryption support on platforms other than iOS, macOS, or
or Windows, and either MIT (1.6.3 or higher) or Heimdal Kerberos for Windows, and either MIT (1.6.3 or higher) or Heimdal Kerberos for Kerberos
Kerberos support. CUPS will compile and run without these, however you'll support. CUPS will compile and run without these, however you'll miss out on
miss out on many of the features provided by CUPS. many of the features provided by CUPS.
Also, please note that CUPS does not include print filters to support PDF On a stock Ubuntu install, the following command will install the required
or raster printing. You *must* download GPL Ghostscript and/or the Open prerequisites:
Printing CUPS filters package separately to print on operating systems
other than macOS. sudo apt-get install autoconf build-essential libavahi-client-dev \
libgnutls28-dev libkrb5-dev libnss-mdns libpam-dev \
libsystemd-dev libusb-1.0-0-dev zlib1g-dev
Also, please note that CUPS does not include print filters to support PDF or
raster printing. You *must* download GPL Ghostscript and/or the Open Printing
CUPS filters package separately to print on operating systems other than macOS.
CONFIGURATION CONFIGURATION
-------------
CUPS uses GNU autoconf, so you should find the usual "configure" script in CUPS uses GNU autoconf, so you should find the usual "configure" script in the
the main CUPS source directory. To configure CUPS for your system, type: main CUPS source directory. To configure CUPS for your system, type:
./configure ./configure
The default installation will put the CUPS software in the "/etc", "/usr", The default installation will put the CUPS software in the "/etc", "/usr", and
and "/var" directories on your system, which will overwrite any existing "/var" directories on your system, which will overwrite any existing printing
printing commands on your system. Use the "--prefix" option to install the commands on your system. Use the "--prefix" option to install the CUPS software
CUPS software in another location: in another location:
./configure --prefix=/some/directory ./configure --prefix=/some/directory
To see a complete list of configuration options, use the --help option: To see a complete list of configuration options, use the --help option:
./configure --help ./configure --help
If any of the dependent libraries are not installed in a system default If any of the dependent libraries are not installed in a system default location
location (typically "/usr/include" and "/usr/lib") you'll need to set the (typically "/usr/include" and "/usr/lib") you'll need to set the CFLAGS,
CFLAGS, CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables CPPFLAGS, CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables prior to running
prior to running configure: configure:
setenv CFLAGS "-I/some/directory" setenv CFLAGS "-I/some/directory"
setenv CPPFLAGS "-I/some/directory" setenv CPPFLAGS "-I/some/directory"
setenv CXXFLAGS "-I/some/directory" setenv CXXFLAGS "-I/some/directory"
setenv DSOFLAGS "-L/some/directory" setenv DSOFLAGS "-L/some/directory"
setenv LDFLAGS "-L/some/directory" setenv LDFLAGS "-L/some/directory"
./configure ... ./configure ...
or: or:
CFLAGS="-I/some/directory" \ CFLAGS="-I/some/directory" \
CPPFLAGS="-I/some/directory" \ CPPFLAGS="-I/some/directory" \
CXXFLAGS="-I/some/directory" \ CXXFLAGS="-I/some/directory" \
DSOFLAGS="-L/some/directory" \ DSOFLAGS="-L/some/directory" \
LDFLAGS="-L/some/directory" \ LDFLAGS="-L/some/directory" \
./configure ... ./configure ...
The "--enable-debug" option compiles CUPS with debugging information The "--enable-debug" option compiles CUPS with debugging information enabled.
enabled. Additional debug logging support can be enabled using the Additional debug logging support can be enabled using the
"--enable-debug-printfs" option - these debug messages are enabled using the "--enable-debug-printfs" option - these debug messages are enabled using the
CUPS_DEBUG_LOG environment variable at run-time. CUPS_DEBUG_LOG environment variable at run-time.
CUPS also includes an extensive set of unit tests that can be used to find CUPS also includes an extensive set of unit tests that can be used to find and
and diagnose a variety of common problems - use the "--enable-unit-tests" diagnose a variety of common problems - use the "--enable-unit-tests" configure
configure option to run them at build time. option to run them at build time.
On macOS, use the "--with-archflags" option to build with the correct set of On macOS, use the "--with-archflags" option to build with the correct set of
architectures: architectures:
./configure --with-archflags="-arch i386 -arch x86_64" ... ./configure --with-archflags="-arch i386 -arch x86_64" ...
Note: Current versions of macOS DO NOT allow installation to > Note: Current versions of macOS DO NOT allow installation to /usr with the
/usr with the default system integrity settings. In addition, > default system integrity settings. In addition, we do not recommend replacing
we do not recommend replacing the CUPS supplied with macOS > the CUPS supplied with macOS because not all versions of CUPS are compatible
because not all versions of CUPS are compatible with every > with every macOS release, and because software updates will replace parts
macOS release, and because software updates will replace parts > of your local installation potentially rendering your system unusable.
of your local installation potentially rendering your system
unusable.
Once you have configured things, just type: Once you have configured things, just type:
make ENTER make ENTER
or if you have FreeBSD, NetBSD, or OpenBSD type: or if you have FreeBSD, NetBSD, or OpenBSD type:
gmake ENTER gmake ENTER
to build the software. to build the software.
TESTING THE SOFTWARE TESTING THE SOFTWARE
--------------------
Aside from the built-in unit tests, CUPS includes an automated test Aside from the built-in unit tests, CUPS includes an automated test framework
framework for testing the entire printing system. To run the tests, just for testing the entire printing system. To run the tests, just type:
type:
make check ENTER make check ENTER
or if you have FreeBSD, NetBSD, or OpenBSD type: or if you have FreeBSD, NetBSD, or OpenBSD type:
gmake check ENTER gmake check ENTER
The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631 The test framework runs a copy of the CUPS scheduler (cupsd) on port 8631 in
in /tmp/cups-$USER and produces a nice HTML report of the results. /tmp/cups-$USER and produces a nice HTML report of the results.
INSTALLING THE SOFTWARE INSTALLING THE SOFTWARE
-----------------------
Once you have built the software you need to install it. The "install" Once you have built the software you need to install it. The "install" target
target provides a quick way to install the software on your local system: provides a quick way to install the software on your local system:
make install ENTER make install ENTER
or for FreeBSD, NetBSD, or OpenBSD: or for FreeBSD, NetBSD, or OpenBSD:
gmake install ENTER gmake install ENTER
Use the BUILDROOT variable to install to an alternate root directory: Use the BUILDROOT variable to install to an alternate root directory:
make BUILDROOT=/some/other/root/directory install ENTER make BUILDROOT=/some/other/root/directory install ENTER
You can also build binary packages that can be installed on other machines You can also build binary packages that can be installed on other machines using
using the RPM spec file ("packaging/cups.spec") or EPM list file the RPM spec file ("packaging/cups.spec") or EPM list file
("packaging/cups.list"). The latter also supports building of binary RPMs, ("packaging/cups.list"). The latter also supports building of binary RPMs, so
so it may be more convenient to use. it may be more convenient to use.
You can find the RPM software at: You can find the RPM software at:
http://www.rpm.org/ http://www.rpm.org/
The EPM software is available at: The EPM software is available at:
http://www.msweet.org/ https://michaelrsweet.github.io/epm
CREATING BINARY DISTRIBUTIONS WITH EPM CREATING BINARY DISTRIBUTIONS WITH EPM
--------------------------------------
The top level makefile supports generation of many types of binary The top level makefile supports generation of many types of binary distributions
distributions using EPM. To build a binary distribution type: using EPM. To build a binary distribution type:
make <format> ENTER make <format> ENTER
or or
gmake <format> ENTER gmake <format> ENTER
for FreeBSD, NetBSD, and OpenBSD. The <format> target is one of the for FreeBSD, NetBSD, and OpenBSD. The <format> target is one of the following:
following:
epm - Builds a script + tarfile package - "epm": Builds a script + tarfile package
bsd - Builds a *BSD package - "bsd": Builds a *BSD package
deb - Builds a Debian package - "deb": Builds a Debian package
pkg - Builds a Solaris package - "pkg": Builds a Solaris package
rpm - Builds a RPM package - "rpm": Builds a RPM package
slackware - Build a Slackware package - "slackware": Build a Slackware package
GETTING DEBUG LOGGING FROM CUPS GETTING DEBUG LOGGING FROM CUPS
-------------------------------
When configured with the "--enable-debug-printfs" option, CUPS compiles in When configured with the "--enable-debug-printfs" option, CUPS compiles in
additional debug logging support in the scheduler, CUPS API, and CUPS additional debug logging support in the scheduler, CUPS API, and CUPS Imaging
Imaging API. The following environment variables are used to enable and API. The following environment variables are used to enable and control debug
control debug logging: logging:
CUPS_DEBUG_FILTER Specifies a POSIX regular expression to control - `CUPS_DEBUG_FILTER`: Specifies a POSIX regular expression to control which
which messages are logged. messages are logged.
CUPS_DEBUG_LEVEL Specifies a number from 0 to 9 to control the - `CUPS_DEBUG_LEVEL`: Specifies a number from 0 to 9 to control the verbosity of
verbosity of the logging. The default level is 1. the logging. The default level is 1.
CUPS_DEBUG_LOG Specifies a log file to use. Specify the name "-" - `CUPS_DEBUG_LOG`: Specifies a log file to use. Specify the name "-" to send
to send the messages to stderr. Prefix a filename the messages to stderr. Prefix a filename with "+" to append to an existing
with "+" to append to an existing file. file.
REPORTING PROBLEMS REPORTING PROBLEMS
------------------
If you have problems, READ THE DOCUMENTATION FIRST! If the documentation If you have problems, READ THE DOCUMENTATION FIRST! If the documentation does
does not solve your problems, please post a message on the users forum at: not solve your problems, please post a message on the users forum at:
http://www.cups.org/ https://www.cups.org/
Include your operating system and version, compiler and version, and any Include your operating system and version, compiler and version, and any errors
errors or problems you've run into. The "config.log" file and the output or problems you've run into. The "config.log" file and the output from the
from the configure script and make should also be sent, as it often helps to configure script and make should also be sent, as it often helps to determine
determine the cause of your problem. the cause of your problem.
If you are running a version of Linux, be sure to provide the Linux If you are running a version of Linux, be sure to provide the Linux distribution
distribution you have, too. you have, too.

20
Makedefs.in
View File

@ -1,14 +1,14 @@
# #
# Common makefile definitions for CUPS. # Common makefile definitions for CUPS.
# #
# Copyright 2007-2014 by Apple Inc. # Copyright 2007-2017 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products, all rights reserved. # Copyright 1997-2007 by Easy Software Products, all rights reserved.
# #
# These coded instructions, statements, and computer programs are the # These coded instructions, statements, and computer programs are the
# property of Apple Inc. and are protected by Federal copyright # property of Apple Inc. and are protected by Federal copyright
# law. Distribution and use rights are outlined in the file "LICENSE.txt" # law. Distribution and use rights are outlined in the file "LICENSE.txt"
# which should have been included with this file. If this file is # 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/". # missing or damaged, see the license at "http://www.cups.org/".
# #
# #
@ -38,14 +38,14 @@ SHELL = /bin/sh
# Installation programs... # Installation programs...
# #
INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
INSTALL_DATA = $(INSTALL) -c -m 444 INSTALL_DATA = $(INSTALL) -c -m 444
INSTALL_DIR = $(INSTALL) -d INSTALL_DIR = $(INSTALL) -d
INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
INSTALL_MAN = $(INSTALL) -c -m 444 INSTALL_MAN = $(INSTALL) -c -m 444
INSTALL_SCRIPT = $(INSTALL) -c -m 555 INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
# #
# Default user, group, and system groups for the scheduler... # Default user, group, and system groups for the scheduler...
@ -72,6 +72,14 @@ LANGUAGES = @LANGUAGES@
INSTALL_LANGUAGES = @INSTALL_LANGUAGES@ INSTALL_LANGUAGES = @INSTALL_LANGUAGES@
UNINSTALL_LANGUAGES = @UNINSTALL_LANGUAGES@ UNINSTALL_LANGUAGES = @UNINSTALL_LANGUAGES@
#
# Cross-compilation support: "local" target is used for any tools that are
# built and run locally.
#
LOCALTARGET = @LOCALTARGET@
# #
# Libraries... # Libraries...
# #
@ -141,7 +149,7 @@ IPPFIND_MAN = @IPPFIND_MAN@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \ -L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
LINKCUPSIMAGE = @LINKCUPSIMAGE@ LINKCUPSIMAGE = @LINKCUPSIMAGE@
LIBS = $(LINKCUPS) $(COMMONLIBS) LIBS = $(LINKCUPS) $(COMMONLIBS)
ONDEMANDFLAGS = @ONDEMANDFLAGS@ ONDEMANDFLAGS = @ONDEMANDFLAGS@

4
Makefile
View File

@ -8,7 +8,7 @@
# property of Apple Inc. and are protected by Federal copyright # property of Apple Inc. and are protected by Federal copyright
# law. Distribution and use rights are outlined in the file "LICENSE.txt" # law. Distribution and use rights are outlined in the file "LICENSE.txt"
# which should have been included with this file. If this file is # 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/". # missing or damaged, see the license at "http://www.cups.org/".
# #
include Makedefs include Makedefs
@ -317,7 +317,7 @@ EPMFLAGS = -v --output-dir dist $(EPMARCH)
bsd deb epm pkg rpm slackware: bsd deb epm pkg rpm slackware:
epm $(EPMFLAGS) -f $@ cups packaging/cups.list epm $(EPMFLAGS) -f $@ cups packaging/cups.list
.PHONEY: dist .PHONY: dist
dist: all dist: all
$(RM) -r dist $(RM) -r dist
$(MAKE) $(MFLAGS) epm $(MAKE) $(MFLAGS) epm

194
README.txt
View File

@ -1,152 +1,160 @@
README - CUPS v2.2.1 - 2016-10-03 README - CUPS v2.2.4 - 2017-06-30
--------------------------------- =================================
Looking for compile instructions? Read the file "INSTALL.txt" instead... Looking for compile instructions? Read the file "INSTALL.md" instead...
INTRODUCTION INTRODUCTION
------------
CUPS is a standards-based, open source printing system developed by Apple
Inc. for macOS® and other UNIX®-like operating systems. CUPS uses the
Internet Printing Protocol ("IPP") and provides System V and Berkeley
command-line interfaces, a web interface, and a C API to manage printers and
print jobs. It supports printing to both local (parallel, serial, USB) and
networked printers, and printers can be shared from one computer to another,
even over the Internet!
Internally, CUPS uses PostScript Printer Description ("PPD") files to CUPS is a standards-based, open source printing system developed by Apple Inc.
describe printer capabilities and features and a wide variety of generic for macOS® and other UNIX®-like operating systems. CUPS uses the Internet
and device-specific programs to convert and print many types of files. Printing Protocol ("IPP") and provides System V and Berkeley command-line
Sample drivers are included with CUPS to support many Dymo, EPSON, HP, interfaces, a web interface, and a C API to manage printers and print jobs. It
Intellitech, OKIDATA, and Zebra printers. Many more drivers are available supports printing to both local (parallel, serial, USB) and networked printers,
online and (in some cases) on the driver CD-ROM that came with your printer. and printers can be shared from one computer to another, even over the Internet!
CUPS is licensed under the GNU General Public License and GNU Library Internally, CUPS uses PostScript Printer Description ("PPD") files to describe
General Public License versions 2. See the file "LICENSE.txt" for more printer capabilities and features and a wide variety of generic and device-
information. specific programs to convert and print many types of files. Sample drivers are
included with CUPS to support many Dymo, EPSON, HP, Intellitech, OKIDATA, and
Zebra printers. Many more drivers are available online and (in some cases) on
the driver CD-ROM that came with your printer.
CUPS is licensed under the GNU General Public License and GNU Library General
Public License versions 2. See the file "LICENSE.txt" for more information.
READING THE DOCUMENTATION READING THE DOCUMENTATION
-------------------------
Once you have installed the software you can access the documentation (and Once you have installed the software you can access the documentation (and a
a bunch of other stuff) online at: bunch of other stuff) online at:
http://localhost:631/ http://localhost:631/
If you're having trouble getting that far, the documentation is located If you're having trouble getting that far, the documentation is located under
under the "doc/help" directory. the "doc/help" directory.
Please read the documentation before asking questions. Please read the documentation before asking questions.
GETTING SUPPORT AND OTHER RESOURCES GETTING SUPPORT AND OTHER RESOURCES
-----------------------------------
If you have problems, READ THE DOCUMENTATION FIRST! We also provide two If you have problems, READ THE DOCUMENTATION FIRST! We also provide two mailing
mailing lists which are available at: lists which are available at:
http://www.cups.org/lists.php https://lists.cups.org/mailman/listinfo
See the CUPS web site at "http://www.cups.org/" for other resources. See the CUPS web site at <https://www.cups.org/> for other resources.
SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
------------------------------------------------
CUPS includes a web-based administration tool that allows you to manage CUPS includes a web-based administration tool that allows you to manage
printers, classes, and jobs on your server. Open the following URL in your printers, classes, and jobs on your server. Open the following URL in your
browser to access the printer administration tools: browser to access the printer administration tools:
http://localhost:631/admin/ http://localhost:631/admin/
DO NOT use the hostname for your machine - it will not work with the default *Do not* use the hostname for your machine - it will not work with the default
CUPS configuration. To enable administration access on other addresses, CUPS configuration. To enable administration access on other addresses, check
check the "Allow Remote Administration" box and click on the "Change the "Allow Remote Administration" box and click on the "Change Settings" button.
Settings" button.
You will be asked for the administration password (root or any other user in You will be asked for the administration password (root or any other user in the
the sys/system/root/admin/lpadmin group on your system) when performing any sys/system/root/admin/lpadmin group on your system) when performing any
administrative function. administrative function.
SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
-----------------------------------------------
CUPS works best with PPD (PostScript Printer Description) files. In a pinch CUPS works best with PPD (PostScript Printer Description) files. In a pinch you
you can also use System V style printer interface scripts. can also use System V style printer interface scripts.
CUPS includes several sample PPD files you can use: CUPS includes several sample PPD files you can use:
Driver PPD Name Driver PPD Name
----------------------------- ------------------------------ ----------------------------- ------------------------------
Dymo Label Printers drv:///sample.drv/dymo.ppd Dymo Label Printers drv:///sample.drv/dymo.ppd
Intellitech Intellibar drv:///sample.drv/intelbar.ppd Intellitech Intellibar drv:///sample.drv/intelbar.ppd
EPSON 9-pin Series drv:///sample.drv/epson9.ppd EPSON 9-pin Series drv:///sample.drv/epson9.ppd
EPSON 24-pin Series drv:///sample.drv/epson24.ppd EPSON 24-pin Series drv:///sample.drv/epson24.ppd
Generic PCL Laser Printer drv:///sample.drv/generpcl.ppd Generic PCL Laser Printer drv:///sample.drv/generpcl.ppd
Generic PostScript Printer drv:///sample.drv/generic.ppd Generic PostScript Printer drv:///sample.drv/generic.ppd
HP DeskJet Series drv:///sample.drv/deskjet.ppd HP DeskJet Series drv:///sample.drv/deskjet.ppd
HP LaserJet Series drv:///sample.drv/laserjet.ppd HP LaserJet Series drv:///sample.drv/laserjet.ppd
OKIDATA 9-Pin Series drv:///sample.drv/okidata9.ppd OKIDATA 9-Pin Series drv:///sample.drv/okidata9.ppd
OKIDATA 24-Pin Series drv:///sample.drv/okidat24.ppd OKIDATA 24-Pin Series drv:///sample.drv/okidat24.ppd
Zebra CPCL Label Printer drv:///sample.drv/zebracpl.ppd Zebra CPCL Label Printer drv:///sample.drv/zebracpl.ppd
Zebra EPL1 Label Printer drv:///sample.drv/zebraep1.ppd Zebra EPL1 Label Printer drv:///sample.drv/zebraep1.ppd
Zebra EPL2 Label Printer drv:///sample.drv/zebraep2.ppd Zebra EPL2 Label Printer drv:///sample.drv/zebraep2.ppd
Zebra ZPL Label Printer drv:///sample.drv/zebra.ppd Zebra ZPL Label Printer drv:///sample.drv/zebra.ppd
Run the "lpinfo -m" command to list the available drivers: Run the "lpinfo -m" command to list the available drivers:
lpinfo -m lpinfo -m
Run the "lpinfo -v" command to list the available printers: Run the "lpinfo -v" command to list the available printers:
lpinfo -v lpinfo -v
Then use the correct URI to add the printer using the "lpadmin" command: Then use the correct URI to add the printer using the "lpadmin" command:
lpadmin -p printername -E -v device-uri -m ppd-name lpadmin -p printername -E -v device-uri -m ppd-name
Network printers typically use "socket" or "lpd" URIs: Network printers typically use "socket" or "lpd" URIs:
lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name lpadmin -p printername -E -v socket://11.22.33.44 -m ppd-name
lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name lpadmin -p printername -E -v lpd://11.22.33.44/ -m ppd-name
The sample drivers provide basic printing capabilities, but generally do not The sample drivers provide basic printing capabilities, but generally do not
exercise the full potential of the printers or CUPS. exercise the full potential of the printers or CUPS.
CUPS also supports IPP Everywhere printers using the "everywhere" model, for
example:
lpadmin -p printername -E -v ipp://11.22.33.44/ipp/print -m everywhere
PRINTING FILES PRINTING FILES
--------------
CUPS provides both the System V "lp" and Berkeley "lpr" commands for CUPS provides both the System V "lp" and Berkeley "lpr" commands for printing:
printing:
lp filename lp filename
lpr filename lpr filename
Both the "lp" and "lpr" commands support printing options for the driver: Both the "lp" and "lpr" commands support printing options for the driver:
lp -o media=A4 -o resolution=600dpi filename lp -o media=A4 -o resolution=600dpi filename
lpr -o media=A4 -o resolution=600dpi filename lpr -o media=A4 -o resolution=600dpi filename
CUPS recognizes many types of images files as well as PDF, PostScript, CUPS recognizes many types of images files as well as PDF, PostScript, and text
and text files, so you can print those files directly rather than through files, so you can print those files directly rather than through an application.
an application.
If you have an application that generates output specifically for your If you have an application that generates output specifically for your printer
printer then you need to use the "-oraw" or "-l" options: then you need to use the "-oraw" or "-l" options:
lp -o raw filename lp -o raw filename
lpr -l filename lpr -l filename
This will prevent the filters from misinterpreting your print file. This will prevent the filters from misinterpreting your print file.
LEGAL STUFF LEGAL STUFF
-----------
CUPS is Copyright 2007-2016 by Apple Inc. CUPS and the CUPS logo are CUPS is copyright © 2007-2017 by Apple Inc. CUPS and the CUPS logo are
trademarks of Apple Inc. trademarks of Apple Inc.
The MD5 Digest code is Copyright 1999 Aladdin Enterprises. The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
CUPS is provided under the terms of version 2 of the GNU General Public CUPS is provided under the terms of version 2 of the GNU General Public License
License and GNU Library General Public License. This program is distributed and GNU Library General Public License. This program is distributed in the hope
in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
See the "doc/help/license.html" or "LICENSE.txt" files for more information. "doc/help/license.html" or "LICENSE.txt" files for more information.

19
config.h
View File

@ -4,21 +4,21 @@
* *
* Configuration file for CUPS. * Configuration file for CUPS.
* *
* Copyright 2007-2012 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
*/ */
/* 07/22/2016 Mopria-notice: some config changes were applied directly to this generated file /* 07/22/2016 Mopria-notice: some config changes were applied directly to this generated file
* rather than by running the configure script again. * rather than by running the configure script again.
*/ */
#include <fcntl.h> #include <sys/file.h>
#ifndef _CUPS_CONFIG_H_ #ifndef _CUPS_CONFIG_H_
#define _CUPS_CONFIG_H_ #define _CUPS_CONFIG_H_
@ -27,8 +27,8 @@
* Version of software... * Version of software...
*/ */
#define CUPS_SVERSION "CUPS v1.6.3" #define CUPS_SVERSION "CUPS v2.2.3"
#define CUPS_MINIMAL "CUPS/1.6.3" #define CUPS_MINIMAL "CUPS/2.2.3"
/* /*
@ -745,15 +745,14 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
# endif /* __GNUC__ || __STDC_VERSION__ */ # endif /* __GNUC__ || __STDC_VERSION__ */
#endif /* !HAVE_ABS && !abs */ #endif /* !HAVE_ABS && !abs */
// 11/23/2016 Mopria-notice: as lockf method is not defined in the Android, we defined our own. // 11/23/2016 Mopria-notice: lockf not present in Android.
#define F_LOCK LOCK_EX
#define F_ULOCK LOCK_UN
#define F_TLOCK ( LOCK_EX | LOCK_NB )
#define F_TULOCK ( LOCK_UN | LOCK_NB )
static inline int lockf(int fd, int cmd, off_t ignored_len) { static inline int lockf(int fd, int cmd, off_t ignored_len) {
return flock(fd, cmd); return flock(fd, cmd);
} }
// 08/28/2016 Mopria-notice: pthread_cancel not defined in Android
void pthread_cancel(int thread);
#endif /* !_CUPS_CONFIG_H_ */ #endif /* !_CUPS_CONFIG_H_ */
/* /*

11
config.h.in
View File

@ -1,14 +1,14 @@
/* /*
* Configuration file for CUPS. * Configuration file for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
*/ */
#ifndef _CUPS_CONFIG_H_ #ifndef _CUPS_CONFIG_H_
@ -240,13 +240,6 @@
#undef HAVE_VSYSLOG #undef HAVE_VSYSLOG
/*
* Do we have the ASL functions?
*/
#undef HAVE_ASL_H
/* /*
* Do we have the systemd journal functions? * Do we have the systemd journal functions?
*/ */

54
cups/Makefile
View File

@ -8,7 +8,7 @@
# property of Apple Inc. and are protected by Federal copyright # property of Apple Inc. and are protected by Federal copyright
# law. Distribution and use rights are outlined in the file "LICENSE.txt" # law. Distribution and use rights are outlined in the file "LICENSE.txt"
# which should have been included with this file. If this file is # 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/". # missing or damaged, see the license at "http://www.cups.org/".
# #
# This file is subject to the Apple OS-Developed Software exception. # This file is subject to the Apple OS-Developed Software exception.
# #
@ -571,56 +571,27 @@ tlscheck: tlscheck.o $(LIBCUPSSTATIC)
apihelp: apihelp:
echo Generating CUPS API help files... echo Generating CUPS API help files...
mxmldoc --section "Programming" \ $(RM) cupspm.xml
--title "Introduction to CUPS Programming" \ mxmldoc --section "Programming" --body cupspm.md \
--css ../doc/cups-printable.css \ cupspm.xml \
--header api-overview.header --intro api-overview.shtml \ auth.c cups.h dest*.c encode.c http.h http*.c ipp.h ipp*.c \
>../doc/help/api-overview.html options.c tls-darwin.c usersys.c util.c \
--coverimage cupspm.png \
--epub ../doc/help/cupspm.epub
mxmldoc --section "Programming" --body cupspm.md \
cupspm.xml > ../doc/help/cupspm.html
$(RM) cupspm.xml
mxmldoc --section "Programming" --title "Administration APIs" \ mxmldoc --section "Programming" --title "Administration APIs" \
--css ../doc/cups-printable.css \ --css ../doc/cups-printable.css \
--header api-admin.header --intro api-admin.shtml \ --header api-admin.header --intro api-admin.shtml \
api-admin.xml \ api-admin.xml \
adminutil.c adminutil.h getdevices.c >../doc/help/api-admin.html adminutil.c adminutil.h getdevices.c >../doc/help/api-admin.html
mxmldoc --tokens help/api-admin.html api-admin.xml >../doc/help/api-admin.tokens
$(RM) api-admin.xml $(RM) api-admin.xml
mxmldoc --section "Programming" --title "Array API" \
--css ../doc/cups-printable.css \
--header api-array.header --intro api-array.shtml \
api-array.xml \
array.h array.c >../doc/help/api-array.html
mxmldoc --tokens help/api-array.html api-array.xml >../doc/help/api-array.tokens
$(RM) api-array.xml
mxmldoc --section "Programming" --title "CUPS API" \
--css ../doc/cups-printable.css \
--header api-cups.header --intro api-cups.shtml \
api-cups.xml \
cups.h pwg.h adminutil.c dest*.c language.c notify.c \
options.c pwg-media.c tempfile.c usersys.c \
util.c >../doc/help/api-cups.html
mxmldoc --tokens help/api-cups.html api-cups.xml >../doc/help/api-cups.tokens
$(RM) api-cups.xml
mxmldoc --section "Programming" --title "File and Directory APIs" \
--css ../doc/cups-printable.css \
--header api-filedir.header --intro api-filedir.shtml \
api-filedir.xml \
file.h file.c dir.h dir.c >../doc/help/api-filedir.html
mxmldoc --tokens api-filedir.xml >../doc/help/api-filedir.tokens
$(RM) api-filedir.xml
mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \ mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
--css ../doc/cups-printable.css \ --css ../doc/cups-printable.css \
--header api-ppd.header --intro api-ppd.shtml \ --header api-ppd.header --intro api-ppd.shtml \
api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
mxmldoc --tokens help/api-ppd.html api-ppd.xml >../doc/help/api-ppd.tokens
$(RM) api-ppd.xml $(RM) api-ppd.xml
mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
--css ../doc/cups-printable.css \
--header api-httpipp.header --intro api-httpipp.shtml \
api-httpipp.xml \
http.h ipp.h auth.c getdevices.c getputfile.c encode.c \
http.c http-addr.c http-support.c ipp.c ipp-support.c \
md5passwd.c request.c >../doc/help/api-httpipp.html
mxmldoc --tokens help/api-httpipp.html api-httpipp.xml >../doc/help/api-httpipp.tokens
$(RM) api-httpipp.xml
mxmldoc --section "Programming" \ mxmldoc --section "Programming" \
--title "Filter and Backend Programming" \ --title "Filter and Backend Programming" \
--css ../doc/cups-printable.css \ --css ../doc/cups-printable.css \
@ -628,7 +599,6 @@ apihelp:
api-filter.xml \ api-filter.xml \
backchannel.c backend.h backend.c sidechannel.c sidechannel.h \ backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
>../doc/help/api-filter.html >../doc/help/api-filter.html
mxmldoc --tokens help/api-filter.html api-filter.xml >../doc/help/api-filter.tokens
$(RM) api-filter.xml $(RM) api-filter.xml
@ -637,8 +607,6 @@ apihelp:
# #
sloc: sloc:
echo "libcupslite: \c"
sloccount $(LITEOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
echo "libcups: \c" echo "libcups: \c"
sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}' sloccount $(LIBOBJS:.o=.c) 2>/dev/null | grep "Total Physical" | awk '{print $$9}'

2
cups/adminutil.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/adminutil.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/api-filter.shtml
View File

@ -94,7 +94,7 @@ being printed.</p>
<p>Filters and backends may also receive <code>SIGPIPE</code> when an upstream or downstream filter/backend exits with a non-zero status. Developers should generally ignore <code>SIGPIPE</code> at the beginning of <code>main()</code> with the following function call:</p> <p>Filters and backends may also receive <code>SIGPIPE</code> when an upstream or downstream filter/backend exits with a non-zero status. Developers should generally ignore <code>SIGPIPE</code> at the beginning of <code>main()</code> with the following function call:</p>
<pre class="example"> <pre class="example">
#include &lt;signal.h&gt;> #include &lt;signal.h&gt;
... ...

2
cups/array-private.h
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/array.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/array.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

11
cups/auth.c
View File

@ -1,7 +1,7 @@
/* /*
* Authentication functions for CUPS. * Authentication functions for CUPS.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2016 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* This file contains Kerberos support code, copyright 2006 by * This file contains Kerberos support code, copyright 2006 by
@ -11,7 +11,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -54,7 +54,7 @@ extern const char *cssmErrorString(int error);
# else # else
# define GSS_AUTH_IDENTITY_TYPE_1 1 # define GSS_AUTH_IDENTITY_TYPE_1 1
# define gss_acquire_cred_ex_f __ApplePrivate_gss_acquire_cred_ex_f # define gss_acquire_cred_ex_f __ApplePrivate_gss_acquire_cred_ex_f
typedef struct gss_auth_identity typedef struct gss_auth_identity /* @private@ */
{ {
uint32_t type; uint32_t type;
uint32_t flags; uint32_t flags;
@ -386,10 +386,7 @@ _cupsSetNegotiateAuthString(
if (data.sem) if (data.sem)
{ {
major_status = gss_acquire_cred_ex_f(NULL, GSS_C_NO_NAME, 0, major_status = gss_acquire_cred_ex_f(NULL, GSS_C_NO_NAME, 0, GSS_C_INDEFINITE, GSS_KRB5_MECHANISM, GSS_C_INITIATE, (gss_auth_identity_t)&identity, &data, cups_gss_acquire);
GSS_C_INDEFINITE, GSS_KRB5_MECHANISM,
GSS_C_INITIATE, &identity, &data,
cups_gss_acquire);
if (major_status == GSS_S_COMPLETE) if (major_status == GSS_S_COMPLETE)
{ {

2
cups/backchannel.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/backend.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/backend.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

9
cups/cups-private.h
View File

@ -1,14 +1,14 @@
/* /*
* Private definitions for CUPS. * Private definitions for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -105,7 +105,7 @@ typedef struct _cups_globals_s /**** CUPS global state data ****/
int need_res_init; /* Need to reinitialize resolver? */ int need_res_init; /* Need to reinitialize resolver? */
/* ipp.c */ /* ipp.c */
ipp_uchar_t ipp_date[11]; /* RFC-1903 date/time data */ ipp_uchar_t ipp_date[11]; /* RFC-2579 date/time data */
_cups_buffer_t *cups_buffers; /* Buffer list */ _cups_buffer_t *cups_buffers; /* Buffer list */
/* ipp-support.c */ /* ipp-support.c */
@ -124,7 +124,8 @@ typedef struct _cups_globals_s /**** CUPS global state data ****/
*ppd_size_lut, /* Lookup table for PPD names */ *ppd_size_lut, /* Lookup table for PPD names */
*pwg_size_lut; /* Lookup table for PWG names */ *pwg_size_lut; /* Lookup table for PWG names */
pwg_media_t pwg_media; /* PWG media data for custom size */ pwg_media_t pwg_media; /* PWG media data for custom size */
char pwg_name[65]; /* PWG media name for custom size */ char pwg_name[65], /* PWG media name for custom size */
ppd_name[41]; /* PPD media name for custom size */
/* request.c */ /* request.c */
http_t *http; /* Current server connection */ http_t *http; /* Current server connection */

53
cups/cups.h
View File

@ -1,14 +1,14 @@
/* /*
* API definitions for CUPS. * API definitions for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -47,10 +47,10 @@ extern "C" {
* Constants... * Constants...
*/ */
# define CUPS_VERSION 2.0201 # define CUPS_VERSION 2.0204
# define CUPS_VERSION_MAJOR 2 # define CUPS_VERSION_MAJOR 2
# define CUPS_VERSION_MINOR 2 # define CUPS_VERSION_MINOR 2
# define CUPS_VERSION_PATCH 1 # define CUPS_VERSION_PATCH 4
# define CUPS_BC_FD 3 # define CUPS_BC_FD 3
/* Back-channel file descriptor for /* Back-channel file descriptor for
@ -78,7 +78,7 @@ extern "C" {
# define CUPS_DEST_FLAGS_NONE 0x00 # define CUPS_DEST_FLAGS_NONE 0x00
/* No flags are set */ /* No flags are set */
# define CUPS_DEST_FLAGS_UNCONNECTED 0x01 # define CUPS_DEST_FLAGS_UNCONNECTED 0x01
/* There is not connection */ /* There is no connection */
# define CUPS_DEST_FLAGS_MORE 0x02 # define CUPS_DEST_FLAGS_MORE 0x02
/* There are more destinations */ /* There are more destinations */
# define CUPS_DEST_FLAGS_REMOVED 0x04 # define CUPS_DEST_FLAGS_REMOVED 0x04
@ -92,6 +92,8 @@ extern "C" {
/* A connection is being established */ /* A connection is being established */
# define CUPS_DEST_FLAGS_CANCELED 0x40 # define CUPS_DEST_FLAGS_CANCELED 0x40
/* Operation was canceled */ /* Operation was canceled */
# define CUPS_DEST_FLAGS_DEVICE 0x80
/* For @link cupsConnectDest@: Connect to device */
/* Flags for cupsGetDestMediaByName/Size */ /* Flags for cupsGetDestMediaByName/Size */
# define CUPS_MEDIA_FLAGS_DEFAULT 0x00 # define CUPS_MEDIA_FLAGS_DEFAULT 0x00
@ -207,39 +209,37 @@ enum cups_ptype_e /* Printer type/capability bit
CUPS_PRINTER_REMOTE = 0x0002, /* Remote printer or class */ CUPS_PRINTER_REMOTE = 0x0002, /* Remote printer or class */
CUPS_PRINTER_BW = 0x0004, /* Can do B&W printing */ CUPS_PRINTER_BW = 0x0004, /* Can do B&W printing */
CUPS_PRINTER_COLOR = 0x0008, /* Can do color printing */ CUPS_PRINTER_COLOR = 0x0008, /* Can do color printing */
CUPS_PRINTER_DUPLEX = 0x0010, /* Can do duplexing */ CUPS_PRINTER_DUPLEX = 0x0010, /* Can do two-sided printing */
CUPS_PRINTER_STAPLE = 0x0020, /* Can staple output */ CUPS_PRINTER_STAPLE = 0x0020, /* Can staple output */
CUPS_PRINTER_COPIES = 0x0040, /* Can do copies */ CUPS_PRINTER_COPIES = 0x0040, /* Can do copies in hardware */
CUPS_PRINTER_COLLATE = 0x0080, /* Can collage copies */ CUPS_PRINTER_COLLATE = 0x0080, /* Can quickly collate copies */
CUPS_PRINTER_PUNCH = 0x0100, /* Can punch output */ CUPS_PRINTER_PUNCH = 0x0100, /* Can punch output */
CUPS_PRINTER_COVER = 0x0200, /* Can cover output */ CUPS_PRINTER_COVER = 0x0200, /* Can cover output */
CUPS_PRINTER_BIND = 0x0400, /* Can bind output */ CUPS_PRINTER_BIND = 0x0400, /* Can bind output */
CUPS_PRINTER_SORT = 0x0800, /* Can sort output */ CUPS_PRINTER_SORT = 0x0800, /* Can sort output */
CUPS_PRINTER_SMALL = 0x1000, /* Can do Letter/Legal/A4 */ CUPS_PRINTER_SMALL = 0x1000, /* Can print on Letter/Legal/A4-size media */
CUPS_PRINTER_MEDIUM = 0x2000, /* Can do Tabloid/B/C/A3/A2 */ CUPS_PRINTER_MEDIUM = 0x2000, /* Can print on Tabloid/B/C/A3/A2-size media */
CUPS_PRINTER_LARGE = 0x4000, /* Can do D/E/A1/A0 */ CUPS_PRINTER_LARGE = 0x4000, /* Can print on D/E/A1/A0-size media */
CUPS_PRINTER_VARIABLE = 0x8000, /* Can do variable sizes */ CUPS_PRINTER_VARIABLE = 0x8000, /* Can print on rolls and custom-size media */
CUPS_PRINTER_IMPLICIT = 0x10000, /* Implicit class @private@ CUPS_PRINTER_IMPLICIT = 0x10000, /* Implicit class @private@
* @since Deprecated@ */ * @since Deprecated@ */
CUPS_PRINTER_DEFAULT = 0x20000, /* Default printer on network */ CUPS_PRINTER_DEFAULT = 0x20000, /* Default printer on network */
CUPS_PRINTER_FAX = 0x40000, /* Fax queue */ CUPS_PRINTER_FAX = 0x40000, /* Fax queue */
CUPS_PRINTER_REJECTING = 0x80000, /* Printer is rejecting jobs */ CUPS_PRINTER_REJECTING = 0x80000, /* Printer is rejecting jobs */
CUPS_PRINTER_DELETE = 0x100000, /* Delete printer CUPS_PRINTER_DELETE = 0x100000, /* Delete printer
* @since CUPS 1.2/macOS 10.5@ */ * @deprecated@ @exclude all@ */
CUPS_PRINTER_NOT_SHARED = 0x200000, /* Printer is not shared CUPS_PRINTER_NOT_SHARED = 0x200000, /* Printer is not shared
* @since CUPS 1.2/macOS 10.5@ */ * @since CUPS 1.2/macOS 10.5@ */
CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication
* @since CUPS 1.2/macOS 10.5@ */ * @since CUPS 1.2/macOS 10.5@ */
CUPS_PRINTER_COMMANDS = 0x800000, /* Printer supports maintenance commands CUPS_PRINTER_COMMANDS = 0x800000, /* Printer supports maintenance commands
* @since CUPS 1.2/macOS 10.5@ */ * @since CUPS 1.2/macOS 10.5@ */
CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was automatically discovered CUPS_PRINTER_DISCOVERED = 0x1000000, /* Printer was discovered @since CUPS 1.2/macOS 10.5@ */
* and added @private@
* @since Deprecated@ */
CUPS_PRINTER_SCANNER = 0x2000000, /* Scanner-only device CUPS_PRINTER_SCANNER = 0x2000000, /* Scanner-only device
* @since CUPS 1.4/macOS 10.6@ */ * @since CUPS 1.4/macOS 10.6@ @private@ */
CUPS_PRINTER_MFP = 0x4000000, /* Printer with scanning capabilities CUPS_PRINTER_MFP = 0x4000000, /* Printer with scanning capabilities
* @since CUPS 1.4/macOS 10.6@ */ * @since CUPS 1.4/macOS 10.6@ @private@ */
CUPS_PRINTER_3D = 0x8000000, /* Printer with 3D capabilities @since CUPS 2.1@ */ CUPS_PRINTER_3D = 0x8000000, /* Printer with 3D capabilities @exclude all@ @private@ */
CUPS_PRINTER_OPTIONS = 0x6fffc /* ~(CLASS | REMOTE | IMPLICIT | CUPS_PRINTER_OPTIONS = 0x6fffc /* ~(CLASS | REMOTE | IMPLICIT |
* DEFAULT | FAX | REJECTING | DELETE | * DEFAULT | FAX | REJECTING | DELETE |
* NOT_SHARED | AUTHENTICATED | * NOT_SHARED | AUTHENTICATED |
@ -270,7 +270,7 @@ typedef struct cups_job_s /**** Job ****/
int id; /* The job ID */ int id; /* The job ID */
char *dest; /* Printer or class name */ char *dest; /* Printer or class name */
char *title; /* Title/job name */ char *title; /* Title/job name */
char *user; /* User the submitted the job */ char *user; /* User that submitted the job */
char *format; /* Document format */ char *format; /* Document format */
ipp_jstate_t state; /* Job state */ ipp_jstate_t state; /* Job state */
int size; /* Size in kilobytes */ int size; /* Size in kilobytes */
@ -310,11 +310,12 @@ typedef int (*cups_dest_cb_t)(void *user_data, unsigned flags,
# ifdef __BLOCKS__ # ifdef __BLOCKS__
typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest); typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest);
/* Destination enumeration block /* Destination enumeration block
* @since CUPS 1.6/macOS 10.8@ */ * @since CUPS 1.6/macOS 10.8@
* @exclude all@ */
# endif /* __BLOCKS__ */ # endif /* __BLOCKS__ */
typedef const char *(*cups_password_cb_t)(const char *prompt); typedef const char *(*cups_password_cb_t)(const char *prompt);
/* Password callback */ /* Password callback @exclude all@ */
typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http, typedef const char *(*cups_password_cb2_t)(const char *prompt, http_t *http,
const char *method, const char *method,
@ -341,11 +342,11 @@ extern ipp_t *cupsDoRequest(http_t *http, ipp_t *request,
const char *resource); const char *resource);
extern http_encryption_t cupsEncryption(void); extern http_encryption_t cupsEncryption(void);
extern void cupsFreeJobs(int num_jobs, cups_job_t *jobs); extern void cupsFreeJobs(int num_jobs, cups_job_t *jobs);
extern int cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead."); extern int cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsEnumDests instead.");
extern const char *cupsGetDefault(void); extern const char *cupsGetDefault(void);
extern int cupsGetJobs(cups_job_t **jobs, const char *name, extern int cupsGetJobs(cups_job_t **jobs, const char *name,
int myjobs, int whichjobs); int myjobs, int whichjobs);
extern int cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsGetDests instead."); extern int cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsEnumDests instead.");
extern ipp_status_t cupsLastError(void); extern ipp_status_t cupsLastError(void);
extern int cupsPrintFile(const char *name, const char *filename, extern int cupsPrintFile(const char *name, const char *filename,
const char *title, int num_options, const char *title, int num_options,
@ -601,6 +602,10 @@ extern int cupsSetServerCredentials(const char *path, const char *common_name,
/* New in CUPS 2.2/macOS 10.12 */ /* New in CUPS 2.2/macOS 10.12 */
extern ssize_t cupsHashData(const char *algorithm, const void *data, size_t datalen, unsigned char *hash, size_t hashsize) _CUPS_API_2_2; extern ssize_t cupsHashData(const char *algorithm, const void *data, size_t datalen, unsigned char *hash, size_t hashsize) _CUPS_API_2_2;
/* New in CUPS 2.2.4 */
extern int cupsAddIntegerOption(const char *name, int value, int num_options, cups_option_t **options) _CUPS_API_2_2_4;
extern int cupsGetIntegerOption(const char *name, int num_options, cups_option_t *options) _CUPS_API_2_2_4;
# ifdef __cplusplus # ifdef __cplusplus
} }
# endif /* __cplusplus */ # endif /* __cplusplus */

2
cups/debug-private.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/debug.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

36
cups/dest-job.c
View File

@ -1,13 +1,13 @@
/* /*
* Destination job support for CUPS. * Destination job support for CUPS.
* *
* Copyright 2012-2016 by Apple Inc. * Copyright 2012-2017 by Apple Inc.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -25,13 +25,13 @@
* The "job_id" is the number returned by cupsCreateDestJob. * The "job_id" is the number returned by cupsCreateDestJob.
* *
* Returns @code IPP_STATUS_OK@ on success and * Returns @code IPP_STATUS_OK@ on success and
* @code IPP_STATUS_ERRPR_NOT_AUTHORIZED@ or * @code IPP_STATUS_ERROR_NOT_AUTHORIZED@ or
* @code IPP_STATUS_ERROR_FORBIDDEN@ on failure. * @code IPP_STATUS_ERROR_FORBIDDEN@ on failure.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
ipp_status_t ipp_status_t /* O - Status of cancel operation */
cupsCancelDestJob(http_t *http, /* I - Connection to destination */ cupsCancelDestJob(http_t *http, /* I - Connection to destination */
cups_dest_t *dest, /* I - Destination */ cups_dest_t *dest, /* I - Destination */
int job_id) /* I - Job ID */ int job_id) /* I - Job ID */
@ -83,6 +83,13 @@ cupsCloseDestJob(
DEBUG_printf(("cupsCloseDestJob(http=%p, dest=%p(%s/%s), info=%p, job_id=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id)); DEBUG_printf(("cupsCloseDestJob(http=%p, dest=%p(%s/%s), info=%p, job_id=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id));
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -171,6 +178,13 @@ cupsCreateDestJob(
DEBUG_printf(("cupsCreateDestJob(http=%p, dest=%p(%s/%s), info=%p, " DEBUG_printf(("cupsCreateDestJob(http=%p, dest=%p(%s/%s), info=%p, "
"job_id=%p, title=\"%s\", num_options=%d, options=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, (void *)job_id, title, num_options, (void *)options)); "job_id=%p, title=\"%s\", num_options=%d, options=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, (void *)job_id, title, num_options, (void *)options));
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -251,6 +265,13 @@ cupsFinishDestDocument(
{ {
DEBUG_printf(("cupsFinishDestDocument(http=%p, dest=%p(%s/%s), info=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info)); DEBUG_printf(("cupsFinishDestDocument(http=%p, dest=%p(%s/%s), info=%p)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info));
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -306,6 +327,13 @@ cupsStartDestDocument(
DEBUG_printf(("cupsStartDestDocument(http=%p, dest=%p(%s/%s), info=%p, job_id=%d, docname=\"%s\", format=\"%s\", num_options=%d, options=%p, last_document=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id, docname, format, num_options, (void *)options, last_document)); DEBUG_printf(("cupsStartDestDocument(http=%p, dest=%p(%s/%s), info=%p, job_id=%d, docname=\"%s\", format=\"%s\", num_options=%d, options=%p, last_document=%d)", (void *)http, (void *)dest, dest ? dest->name : NULL, dest ? dest->instance : NULL, (void *)info, job_id, docname, format, num_options, (void *)options, last_document));
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */

2
cups/dest-localization.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

92
cups/dest-options.c
View File

@ -1,13 +1,13 @@
/* /*
* Destination option/media support for CUPS. * Destination option/media support for CUPS.
* *
* Copyright 2012-2016 by Apple Inc. * Copyright 2012-2017 by Apple Inc.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -73,7 +73,7 @@ cupsCheckDestSupported(
cups_dest_t *dest, /* I - Destination */ cups_dest_t *dest, /* I - Destination */
cups_dinfo_t *dinfo, /* I - Destination information */ cups_dinfo_t *dinfo, /* I - Destination information */
const char *option, /* I - Option */ const char *option, /* I - Option */
const char *value) /* I - Value */ const char *value) /* I - Value or @code NULL@ */
{ {
int i; /* Looping var */ int i; /* Looping var */
char temp[1024]; /* Temporary string */ char temp[1024]; /* Temporary string */
@ -85,11 +85,18 @@ cupsCheckDestSupported(
_ipp_value_t *attrval; /* Current attribute value */ _ipp_value_t *attrval; /* Current attribute value */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
if (!http || !dest || !dinfo || !option || !value) if (!http || !dest || !dinfo || !option)
return (0); return (0);
/* /*
@ -107,7 +114,10 @@ cupsCheckDestSupported(
if (!attr) if (!attr)
return (0); return (0);
/* if (!value)
return (1);
/*
* Compare values... * Compare values...
*/ */
@ -315,6 +325,13 @@ cupsCopyDestConflicts(
if (resolved) if (resolved)
*resolved = NULL; *resolved = NULL;
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -574,6 +591,13 @@ cupsCopyDestInfo(
DEBUG_printf(("cupsCopyDestSupported(http=%p, dest=%p(%s))", (void *)http, (void *)dest, dest ? dest->name : "")); DEBUG_printf(("cupsCopyDestSupported(http=%p, dest=%p(%s))", (void *)http, (void *)dest, dest ? dest->name : ""));
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -685,6 +709,13 @@ cupsFindDestDefault(
char name[IPP_MAX_NAME]; /* Attribute name */ char name[IPP_MAX_NAME]; /* Attribute name */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -726,6 +757,13 @@ cupsFindDestReady(
char name[IPP_MAX_NAME]; /* Attribute name */ char name[IPP_MAX_NAME]; /* Attribute name */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -769,6 +807,13 @@ cupsFindDestSupported(
char name[IPP_MAX_NAME]; /* Attribute name */ char name[IPP_MAX_NAME]; /* Attribute name */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -791,6 +836,8 @@ cupsFindDestSupported(
/* /*
* 'cupsFreeDestInfo()' - Free destination information obtained using * 'cupsFreeDestInfo()' - Free destination information obtained using
* @link cupsCopyDestInfo@. * @link cupsCopyDestInfo@.
*
* @since CUPS 1.6/macOS 10.8@
*/ */
void void
@ -851,6 +898,13 @@ cupsGetDestMediaByIndex(
pwg_media_t *pwg; /* PWG media name for size */ pwg_media_t *pwg; /* PWG media name for size */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -939,6 +993,13 @@ cupsGetDestMediaByName(
pwg_media_t *pwg; /* PWG media info */ pwg_media_t *pwg; /* PWG media info */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -1007,6 +1068,13 @@ cupsGetDestMediaBySize(
pwg_media_t *pwg; /* PWG media info */ pwg_media_t *pwg; /* PWG media info */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -1058,6 +1126,13 @@ cupsGetDestMediaCount(
cups_dinfo_t *dinfo, /* I - Destination information */ cups_dinfo_t *dinfo, /* I - Destination information */
unsigned flags) /* I - Media flags */ unsigned flags) /* I - Media flags */
{ {
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */
@ -1103,6 +1178,13 @@ cupsGetDestMediaDefault(
const char *media; /* Default media size */ const char *media; /* Default media size */
/*
* Get the default connection as needed...
*/
if (!http)
http = _cupsConnect();
/* /*
* Range check input... * Range check input...
*/ */

845
cups/dest.c
View File

File diff suppressed because it is too large Load Diff

33
cups/dir.c
View File

@ -3,14 +3,14 @@
* *
* This set of APIs abstracts enumeration of directory entries. * This set of APIs abstracts enumeration of directory entries.
* *
* Copyright 2007-2012 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2005 by Easy Software Products, all rights reserved. * Copyright 1997-2005 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
*/ */
/* /*
@ -338,10 +338,6 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */
{ {
struct dirent *entry; /* Pointer to entry */ struct dirent *entry; /* Pointer to entry */
char filename[1024]; /* Full filename */ char filename[1024]; /* Full filename */
# ifdef HAVE_PTHREAD_H
char buffer[sizeof(struct dirent) + 1024];
/* Directory entry buffer */
# endif /* HAVE_PTHREAD_H */
DEBUG_printf(("2cupsDirRead(dp=%p)", (void *)dp)); DEBUG_printf(("2cupsDirRead(dp=%p)", (void *)dp));
@ -359,29 +355,8 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */
for (;;) for (;;)
{ {
# ifdef HAVE_PTHREAD_H
/* /*
* Read the next entry using the reentrant version of readdir... * Read the next entry...
*/
if (readdir_r(dp->dir, (struct dirent *)buffer, &entry))
{
DEBUG_printf(("3cupsDirRead: readdir_r() failed - %s\n", strerror(errno)));
return (NULL);
}
if (!entry)
{
DEBUG_puts("3cupsDirRead: readdir_r() returned a NULL pointer!");
return (NULL);
}
DEBUG_printf(("4cupsDirRead: readdir_r() returned \"%s\"...",
entry->d_name));
# else
/*
* Read the next entry using the original version of readdir...
*/ */
if ((entry = readdir(dp->dir)) == NULL) if ((entry = readdir(dp->dir)) == NULL)
@ -392,8 +367,6 @@ cupsDirRead(cups_dir_t *dp) /* I - Directory pointer */
DEBUG_printf(("4cupsDirRead: readdir() returned \"%s\"...", entry->d_name)); DEBUG_printf(("4cupsDirRead: readdir() returned \"%s\"...", entry->d_name));
# endif /* HAVE_PTHREAD_H */
/* /*
* Skip "." and ".."... * Skip "." and ".."...
*/ */

2
cups/dir.h
View File

@ -10,7 +10,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
*/ */
#ifndef _CUPS_DIR_H_ #ifndef _CUPS_DIR_H_

8
cups/encode.c
View File

@ -1,14 +1,14 @@
/* /*
* Option encoding routines for CUPS. * Option encoding routines for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -329,7 +329,7 @@ static int compare_ipp_options(_ipp_option_t *a, _ipp_option_t *b);
* 'cupsEncodeOptions()' - Encode printer options into IPP attributes. * 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
* *
* This function adds operation, job, and then subscription attributes, * This function adds operation, job, and then subscription attributes,
* in that order. Use the cupsEncodeOptions2() function to add attributes * in that order. Use the @link cupsEncodeOptions2@ function to add attributes
* for a single group. * for a single group.
*/ */
@ -354,7 +354,7 @@ cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */
* 'cupsEncodeOptions2()' - Encode printer options into IPP attributes for a group. * 'cupsEncodeOptions2()' - Encode printer options into IPP attributes for a group.
* *
* This function only adds attributes for a single group. Call this * This function only adds attributes for a single group. Call this
* function multiple times for each group, or use cupsEncodeOptions() * function multiple times for each group, or use @link cupsEncodeOptions@
* to add the standard groups. * to add the standard groups.
* *
* @since CUPS 1.2/macOS 10.5@ * @since CUPS 1.2/macOS 10.5@

6
cups/file-private.h
View File

@ -4,16 +4,16 @@
* Since stdio files max out at 256 files on many systems, we have to * Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using * write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of * our own file functions allows us to provide transparent support of
* gzip'd print files, PPD files, etc. * different line endings, gzip'd print files, PPD files, etc.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

39
cups/file.c
View File

@ -4,16 +4,16 @@
* Since stdio files max out at 256 files on many systems, we have to * Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using * write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of * our own file functions allows us to provide transparent support of
* gzip'd print files, PPD files, etc. * different line endings, gzip'd print files, PPD files, etc.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -321,7 +321,6 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
int fd; /* File descriptor */ int fd; /* File descriptor */
char mode; /* Open mode */ char mode; /* Open mode */
int status; /* Return status */ int status; /* Return status */
int is_stdio; /* Is a stdio file? */
DEBUG_printf(("cupsFileClose(fp=%p)", (void *)fp)); DEBUG_printf(("cupsFileClose(fp=%p)", (void *)fp));
@ -410,12 +409,19 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
#endif /* HAVE_LIBZ */ #endif /* HAVE_LIBZ */
/* /*
* If this is one of the cupsFileStdin/out/err files, return now and don't
* actually free memory or close (these last the life of the process...)
*/
if (fp->is_stdio)
return (status);
/*
* Save the file descriptor we used and free memory... * Save the file descriptor we used and free memory...
*/ */
fd = fp->fd; fd = fp->fd;
mode = fp->mode; mode = fp->mode;
is_stdio = fp->is_stdio;
if (fp->printf_buffer) if (fp->printf_buffer)
free(fp->printf_buffer); free(fp->printf_buffer);
@ -431,11 +437,8 @@ cupsFileClose(cups_file_t *fp) /* I - CUPS file */
if (httpAddrClose(NULL, fd) < 0) if (httpAddrClose(NULL, fd) < 0)
status = -1; status = -1;
} }
else if (!is_stdio) else if (close(fd) < 0)
{ status = -1;
if (close(fd) < 0)
status = -1;
}
return (status); return (status);
} }
@ -1384,7 +1387,11 @@ cupsFilePrintf(cups_file_t *fp, /* I - CUPS file */
{ {
memcpy(fp->ptr, fp->printf_buffer, (size_t)bytes); memcpy(fp->ptr, fp->printf_buffer, (size_t)bytes);
fp->ptr += bytes; fp->ptr += bytes;
return ((int)bytes);
if (fp->is_stdio && cupsFileFlush(fp))
return (-1);
else
return ((int)bytes);
} }
} }
@ -1563,7 +1570,11 @@ cupsFilePuts(cups_file_t *fp, /* I - CUPS file */
{ {
memcpy(fp->ptr, s, (size_t)bytes); memcpy(fp->ptr, s, (size_t)bytes);
fp->ptr += bytes; fp->ptr += bytes;
return ((int)bytes);
if (fp->is_stdio && cupsFileFlush(fp))
return (-1);
else
return ((int)bytes);
} }
} }

6
cups/file.h
View File

@ -4,16 +4,16 @@
* Since stdio files max out at 256 files on many systems, we have to * Since stdio files max out at 256 files on many systems, we have to
* write similar functions without this limit. At the same time, using * write similar functions without this limit. At the same time, using
* our own file functions allows us to provide transparent support of * our own file functions allows us to provide transparent support of
* gzip'd print files, PPD files, etc. * different line endings, gzip'd print files, PPD files, etc.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/getdevices.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/getputfile.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/globals.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/hash.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

26
cups/http-addr.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -58,9 +58,9 @@ httpAddrAny(const http_addr_t *addr) /* I - Address to check */
* 'httpAddrClose()' - Close a socket created by @link httpAddrConnect@ or * 'httpAddrClose()' - Close a socket created by @link httpAddrConnect@ or
* @link httpAddrListen@. * @link httpAddrListen@.
* *
* Pass @code NULL@ for sockets created with @link httpAddrConnect@ and the * Pass @code NULL@ for sockets created with @link httpAddrConnect2@ and the
* listen address for sockets created with @link httpAddrListen@. This will * listen address for sockets created with @link httpAddrListen@. This function
* ensure that domain sockets are removed when closed. * ensures that domain sockets are removed when closed.
* *
* @since CUPS 2.0/OS 10.10@ * @since CUPS 2.0/OS 10.10@
*/ */
@ -648,6 +648,10 @@ httpAddrString(const http_addr_t *addr, /* I - Address to convert */
/* /*
* 'httpGetAddress()' - Get the address of the connected peer of a connection. * 'httpGetAddress()' - Get the address of the connected peer of a connection.
* *
* For connections created with @link httpConnect2@, the address is for the
* server. For connections created with @link httpAccept@, the address is for
* the client.
*
* Returns @code NULL@ if the socket is currently unconnected. * Returns @code NULL@ if the socket is currently unconnected.
* *
* @since CUPS 2.0/OS 10.10@ * @since CUPS 2.0/OS 10.10@
@ -667,7 +671,7 @@ httpGetAddress(http_t *http) /* I - HTTP connection */
* 'httpGetHostByName()' - Lookup a hostname or IPv4 address, and return * 'httpGetHostByName()' - Lookup a hostname or IPv4 address, and return
* address records for the specified name. * address records for the specified name.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
struct hostent * /* O - Host entry */ struct hostent * /* O - Host entry */
@ -871,6 +875,18 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */
strlcat(s, ".", (size_t)slen); strlcat(s, ".", (size_t)slen);
} }
/*
* Convert the hostname to lowercase as needed...
*/
if (s[0] != '/')
{
char *ptr; /* Pointer into string */
for (ptr = s; *ptr; ptr ++)
*ptr = (char)_cups_tolower((int)*ptr);
}
/* /*
* Return the hostname with as much domain info as we have... * Return the hostname with as much domain info as we have...
*/ */

10
cups/http-addrlist.c
View File

@ -1,14 +1,14 @@
/* /*
* HTTP address list routines for CUPS. * HTTP address list routines for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -32,7 +32,7 @@
/* /*
* 'httpAddrConnect()' - Connect to any of the addresses in the list. * 'httpAddrConnect()' - Connect to any of the addresses in the list.
* *
* @since CUPS 1.2/macOS 10.5@ * @since CUPS 1.2/macOS 10.5@ @exclude all@
*/ */
http_addrlist_t * /* O - Connected address or NULL on failure */ http_addrlist_t * /* O - Connected address or NULL on failure */
@ -312,7 +312,7 @@ httpAddrConnect2(
DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents)); DEBUG_printf(("pfds[%d].revents=%x\n", i, pfds[i].revents));
if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP))) if (pfds[i].revents && !(pfds[i].revents & (POLLERR | POLLHUP)))
# else # else
if (FD_ISSET(fds[i], &input) && !FD_ISSET(fds[i], &error)) if (FD_ISSET(fds[i], &input_set) && !FD_ISSET(fds[i], &error_set))
# endif /* HAVE_POLL */ # endif /* HAVE_POLL */
{ {
*sock = fds[i]; *sock = fds[i];
@ -327,7 +327,7 @@ httpAddrConnect2(
# ifdef HAVE_POLL # ifdef HAVE_POLL
else if (pfds[i].revents & (POLLERR | POLLHUP)) else if (pfds[i].revents & (POLLERR | POLLHUP))
# else # else
else if (FD_ISSET(fds[i], &error)) else if (FD_ISSET(fds[i], &error_set))
# endif /* HAVE_POLL */ # endif /* HAVE_POLL */
{ {
/* /*

5
cups/http-private.h
View File

@ -1,14 +1,14 @@
/* /*
* Private HTTP definitions for CUPS. * Private HTTP definitions for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -184,6 +184,7 @@ extern "C" {
#define _HTTP_TLS_ALLOW_SSL3 2 /* Allow SSL 3.0 */ #define _HTTP_TLS_ALLOW_SSL3 2 /* Allow SSL 3.0 */
#define _HTTP_TLS_ALLOW_DH 4 /* Allow DH/DHE key negotiation */ #define _HTTP_TLS_ALLOW_DH 4 /* Allow DH/DHE key negotiation */
#define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */ #define _HTTP_TLS_DENY_TLS10 16 /* Deny TLS 1.0 */
#define _HTTP_TLS_DENY_CBC 32 /* Deny CBC cipher suites */
/* /*

30
cups/http-support.c
View File

@ -1,14 +1,14 @@
/* /*
* HTTP support routines for CUPS. * HTTP support routines for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -543,7 +543,7 @@ httpAssembleUUID(const char *server, /* I - Server name */
* This function is deprecated. Use the httpDecode64_2() function instead * This function is deprecated. Use the httpDecode64_2() function instead
* which provides buffer length arguments. * which provides buffer length arguments.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
char * /* O - Decoded string */ char * /* O - Decoded string */
@ -566,6 +566,10 @@ httpDecode64(char *out, /* I - String to write to */
/* /*
* 'httpDecode64_2()' - Base64-decode a string. * 'httpDecode64_2()' - Base64-decode a string.
* *
* The caller must initialize "outlen" to the maximum size of the decoded
* string before calling @code httpDecode64_2@. On return "outlen" contains the
* decoded length of the string.
*
* @since CUPS 1.1.21/macOS 10.4@ * @since CUPS 1.1.21/macOS 10.4@
*/ */
@ -671,7 +675,7 @@ httpDecode64_2(char *out, /* I - String to write to */
* This function is deprecated. Use the httpEncode64_2() function instead * This function is deprecated. Use the httpEncode64_2() function instead
* which provides buffer length arguments. * which provides buffer length arguments.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
char * /* O - Encoded string */ char * /* O - Encoded string */
@ -690,7 +694,7 @@ httpEncode64(char *out, /* I - String to write to */
char * /* O - Encoded string */ char * /* O - Encoded string */
httpEncode64_2(char *out, /* I - String to write to */ httpEncode64_2(char *out, /* I - String to write to */
int outlen, /* I - Size of output string */ int outlen, /* I - Maximum size of output string */
const char *in, /* I - String to read from */ const char *in, /* I - String to read from */
int inlen) /* I - Size of input string */ int inlen) /* I - Size of input string */
{ {
@ -778,11 +782,11 @@ httpEncode64_2(char *out, /* I - String to write to */
/* /*
* 'httpGetDateString()' - Get a formatted date/time string from a time value. * 'httpGetDateString()' - Get a formatted date/time string from a time value.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
const char * /* O - Date/time string */ const char * /* O - Date/time string */
httpGetDateString(time_t t) /* I - UNIX time */ httpGetDateString(time_t t) /* I - Time in seconds */
{ {
_cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */ _cups_globals_t *cg = _cupsGlobals(); /* Pointer to library globals */
@ -798,7 +802,7 @@ httpGetDateString(time_t t) /* I - UNIX time */
*/ */
const char * /* O - Date/time string */ const char * /* O - Date/time string */
httpGetDateString2(time_t t, /* I - UNIX time */ httpGetDateString2(time_t t, /* I - Time in seconds */
char *s, /* I - String buffer */ char *s, /* I - String buffer */
int slen) /* I - Size of string buffer */ int slen) /* I - Size of string buffer */
{ {
@ -819,7 +823,7 @@ httpGetDateString2(time_t t, /* I - UNIX time */
* 'httpGetDateTime()' - Get a time value from a formatted date/time string. * 'httpGetDateTime()' - Get a time value from a formatted date/time string.
*/ */
time_t /* O - UNIX time */ time_t /* O - Time in seconds */
httpGetDateTime(const char *s) /* I - Date/time string */ httpGetDateTime(const char *s) /* I - Date/time string */
{ {
int i; /* Looping var */ int i; /* Looping var */
@ -888,7 +892,7 @@ httpGetDateTime(const char *s) /* I - Date/time string */
* *
* This function is deprecated; use the httpSeparateURI() function instead. * This function is deprecated; use the httpSeparateURI() function instead.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
void void
@ -912,7 +916,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
* This function is deprecated; use the httpSeparateURI() function instead. * This function is deprecated; use the httpSeparateURI() function instead.
* *
* @since CUPS 1.1.21/macOS 10.4@ * @since CUPS 1.1.21/macOS 10.4@
* @deprecated@ * @deprecated@ @exclude all@
*/ */
void void
@ -1419,7 +1423,7 @@ _httpStatus(cups_lang_t *lang, /* I - Language */
* 'httpStatus()' - Return a short string describing a HTTP status code. * 'httpStatus()' - Return a short string describing a HTTP status code.
* *
* The returned string is localized to the current POSIX locale and is based * The returned string is localized to the current POSIX locale and is based
* on the status strings defined in RFC 2616. * on the status strings defined in RFC 7231.
*/ */
const char * /* O - Localized status string */ const char * /* O - Localized status string */
@ -2310,6 +2314,8 @@ http_resolve_cb(
* Note: This function is needed because avahi_simple_poll_iterate is broken * Note: This function is needed because avahi_simple_poll_iterate is broken
* and always uses a timeout of 0 (!) milliseconds. * and always uses a timeout of 0 (!) milliseconds.
* (Avahi Ticket #364) * (Avahi Ticket #364)
*
* @private@
*/ */
static int /* O - Number of file descriptors matching */ static int /* O - Number of file descriptors matching */

60
cups/http.c
View File

@ -1,7 +1,7 @@
/* /*
* HTTP routines for CUPS. * HTTP routines for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* This file contains Kerberos support code, copyright 2006 by * This file contains Kerberos support code, copyright 2006 by
@ -11,7 +11,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -417,7 +417,7 @@ httpCompareCredentials(
* *
* This function is deprecated - use @link httpConnect2@ instead. * This function is deprecated - use @link httpConnect2@ instead.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
http_t * /* O - New HTTP connection */ http_t * /* O - New HTTP connection */
@ -439,7 +439,7 @@ http_t * /* O - New HTTP connection */
httpConnect2( httpConnect2(
const char *host, /* I - Host to connect to */ const char *host, /* I - Host to connect to */
int port, /* I - Port number */ int port, /* I - Port number */
http_addrlist_t *addrlist, /* I - List of addresses or NULL to lookup */ http_addrlist_t *addrlist, /* I - List of addresses or @code NULL@ to lookup */
int family, /* I - Address family to use or @code AF_UNSPEC@ for any */ int family, /* I - Address family to use or @code AF_UNSPEC@ for any */
http_encryption_t encryption, /* I - Type of encryption to use */ http_encryption_t encryption, /* I - Type of encryption to use */
int blocking, /* I - 1 for blocking connection, 0 for non-blocking */ int blocking, /* I - 1 for blocking connection, 0 for non-blocking */
@ -482,7 +482,7 @@ httpConnect2(
* This function is now deprecated. Please use the @link httpConnect2@ function * This function is now deprecated. Please use the @link httpConnect2@ function
* instead. * instead.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
http_t * /* O - New HTTP connection */ http_t * /* O - New HTTP connection */
@ -609,7 +609,7 @@ httpFieldValue(const char *name) /* I - String name */
/* /*
* 'httpFlush()' - Flush data from a HTTP connection. * 'httpFlush()' - Flush data read from a HTTP connection.
*/ */
void void
@ -679,7 +679,7 @@ httpFlush(http_t *http) /* I - HTTP connection */
/* /*
* 'httpFlushWrite()' - Flush data in write buffer. * 'httpFlushWrite()' - Flush data written to a HTTP connection.
* *
* @since CUPS 1.2/macOS 10.5@ * @since CUPS 1.2/macOS 10.5@
*/ */
@ -751,7 +751,7 @@ httpGet(http_t *http, /* I - HTTP connection */
/* /*
* 'httpGetActivity()' - Get the most recent activity for a connection. * 'httpGetActivity()' - Get the most recent activity for a connection.
* *
* The return value is the UNIX time of the last read or write. * The return value is the time in seconds of the last read or write.
* *
* @since CUPS 2.0/OS 10.10@ * @since CUPS 2.0/OS 10.10@
*/ */
@ -766,10 +766,10 @@ httpGetActivity(http_t *http) /* I - HTTP connection */
/* /*
* 'httpGetAuthString()' - Get the current authorization string. * 'httpGetAuthString()' - Get the current authorization string.
* *
* The authorization string is set by cupsDoAuthentication() and * The authorization string is set by @link cupsDoAuthentication@ and
* httpSetAuthString(). Use httpGetAuthString() to retrieve the * @link httpSetAuthString@. Use @link httpGetAuthString@ to retrieve the
* string to use with httpSetField() for the HTTP_FIELD_AUTHORIZATION * string to use with @link httpSetField@ for the
* value. * @code HTTP_FIELD_AUTHORIZATION@ value.
* *
* @since CUPS 1.3/macOS 10.5@ * @since CUPS 1.3/macOS 10.5@
*/ */
@ -891,7 +891,7 @@ httpGetContentEncoding(http_t *http) /* I - HTTP connection */
* @since CUPS 1.1.19/macOS 10.3@ * @since CUPS 1.1.19/macOS 10.3@
*/ */
const char * /* O - Cookie data or NULL */ const char * /* O - Cookie data or @code NULL@ */
httpGetCookie(http_t *http) /* I - HTTP connection */ httpGetCookie(http_t *http) /* I - HTTP connection */
{ {
return (http ? http->cookie : NULL); return (http ? http->cookie : NULL);
@ -1006,7 +1006,7 @@ httpGetKeepAlive(http_t *http) /* I - HTTP connection */
* This function is deprecated and will not return lengths larger than * This function is deprecated and will not return lengths larger than
* 2^31 - 1; use httpGetLength2() instead. * 2^31 - 1; use httpGetLength2() instead.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
int /* O - Content length */ int /* O - Content length */
@ -1150,7 +1150,7 @@ httpGetRemaining(http_t *http) /* I - HTTP connection */
* 'httpGets()' - Get a line of text from a HTTP connection. * 'httpGets()' - Get a line of text from a HTTP connection.
*/ */
char * /* O - Line or NULL */ char * /* O - Line or @code NULL@ */
httpGets(char *line, /* I - Line to read into */ httpGets(char *line, /* I - Line to read into */
int length, /* I - Max length of buffer */ int length, /* I - Max length of buffer */
http_t *http) /* I - HTTP connection */ http_t *http) /* I - HTTP connection */
@ -1346,10 +1346,10 @@ httpGetStatus(http_t *http) /* I - HTTP connection */
/* /*
* 'httpGetSubField()' - Get a sub-field value. * 'httpGetSubField()' - Get a sub-field value.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
char * /* O - Value or NULL */ char * /* O - Value or @code NULL@ */
httpGetSubField(http_t *http, /* I - HTTP connection */ httpGetSubField(http_t *http, /* I - HTTP connection */
http_field_t field, /* I - Field index */ http_field_t field, /* I - Field index */
const char *name, /* I - Name of sub-field */ const char *name, /* I - Name of sub-field */
@ -1365,7 +1365,7 @@ httpGetSubField(http_t *http, /* I - HTTP connection */
* @since CUPS 1.2/macOS 10.5@ * @since CUPS 1.2/macOS 10.5@
*/ */
char * /* O - Value or NULL */ char * /* O - Value or @code NULL@ */
httpGetSubField2(http_t *http, /* I - HTTP connection */ httpGetSubField2(http_t *http, /* I - HTTP connection */
http_field_t field, /* I - Field index */ http_field_t field, /* I - Field index */
const char *name, /* I - Name of sub-field */ const char *name, /* I - Name of sub-field */
@ -1616,7 +1616,7 @@ httpOptions(http_t *http, /* I - HTTP connection */
* *
* This function copies available data from the given HTTP connection, reading * This function copies available data from the given HTTP connection, reading
* a buffer as needed. The data is still available for reading using * a buffer as needed. The data is still available for reading using
* @link httpRead@ or @link httpRead2@. * @link httpRead2@.
* *
* For non-blocking connections the usual timeouts apply. * For non-blocking connections the usual timeouts apply.
* *
@ -1939,7 +1939,7 @@ httpPut(http_t *http, /* I - HTTP connection */
* This function is deprecated. Use the httpRead2() function which can * This function is deprecated. Use the httpRead2() function which can
* read more than 2GB of data. * read more than 2GB of data.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
int /* O - Number of bytes read */ int /* O - Number of bytes read */
@ -2326,7 +2326,7 @@ httpReadRequest(http_t *http, /* I - HTTP connection */
* This function is deprecated. Please use the @link httpReconnect2@ function * This function is deprecated. Please use the @link httpReconnect2@ function
* instead. * instead.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
int /* O - 0 on success, non-zero on failure */ int /* O - 0 on success, non-zero on failure */
@ -2467,9 +2467,10 @@ httpReconnect2(http_t *http, /* I - HTTP connection */
* 'httpSetAuthString()' - Set the current authorization string. * 'httpSetAuthString()' - Set the current authorization string.
* *
* This function just stores a copy of the current authorization string in * This function just stores a copy of the current authorization string in
* the HTTP connection object. You must still call httpSetField() to set * the HTTP connection object. You must still call @link httpSetField@ to set
* HTTP_FIELD_AUTHORIZATION prior to issuing a HTTP request using httpGet(), * @code HTTP_FIELD_AUTHORIZATION@ prior to issuing a HTTP request using
* httpHead(), httpOptions(), httpPost, or httpPut(). * @link httpGet@, @link httpHead@, @link httpOptions@, @link httpPost@, or
* @link httpPut@.
* *
* @since CUPS 1.3/macOS 10.5@ * @since CUPS 1.3/macOS 10.5@
*/ */
@ -2820,7 +2821,7 @@ httpSetTimeout(
http_t *http, /* I - HTTP connection */ http_t *http, /* I - HTTP connection */
double timeout, /* I - Number of seconds for timeout, double timeout, /* I - Number of seconds for timeout,
must be greater than 0 */ must be greater than 0 */
http_timeout_cb_t cb, /* I - Callback function or NULL */ http_timeout_cb_t cb, /* I - Callback function or @code NULL@ */
void *user_data) /* I - User data pointer */ void *user_data) /* I - User data pointer */
{ {
if (!http || timeout <= 0.0) if (!http || timeout <= 0.0)
@ -2864,6 +2865,8 @@ httpShutdown(http_t *http) /* I - HTTP connection */
/* /*
* 'httpTrace()' - Send an TRACE request to the server. * 'httpTrace()' - Send an TRACE request to the server.
*
* @exclude all@
*/ */
int /* O - Status of call (0 = success) */ int /* O - Status of call (0 = success) */
@ -3259,7 +3262,7 @@ httpWait(http_t *http, /* I - HTTP connection */
* This function is deprecated. Use the httpWrite2() function which can * This function is deprecated. Use the httpWrite2() function which can
* write more than 2GB of data. * write more than 2GB of data.
* *
* @deprecated@ * @deprecated@ @exclude all@
*/ */
int /* O - Number of bytes written */ int /* O - Number of bytes written */
@ -3667,6 +3670,9 @@ httpWriteResponse(http_t *http, /* I - HTTP connection */
return (0); return (0);
} }
if (http->state == HTTP_STATE_POST_RECV || http->state == HTTP_STATE_GET)
http->state ++;
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
/* /*
* Then start any content encoding... * Then start any content encoding...
@ -3895,7 +3901,7 @@ static http_t * /* O - HTTP connection */
http_create( http_create(
const char *host, /* I - Hostname */ const char *host, /* I - Hostname */
int port, /* I - Port number */ int port, /* I - Port number */
http_addrlist_t *addrlist, /* I - Address list or NULL */ http_addrlist_t *addrlist, /* I - Address list or @code NULL@ */
int family, /* I - Address family or AF_UNSPEC */ int family, /* I - Address family or AF_UNSPEC */
http_encryption_t encryption, /* I - Encryption to use */ http_encryption_t encryption, /* I - Encryption to use */
int blocking, /* I - 1 for blocking mode */ int blocking, /* I - 1 for blocking mode */

11
cups/http.h
View File

@ -1,14 +1,14 @@
/* /*
* Hyper-Text Transport Protocol definitions for CUPS. * Hyper-Text Transport Protocol definitions for CUPS.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -109,7 +109,7 @@ extern "C" {
* Types and structures... * Types and structures...
*/ */
typedef enum http_auth_e /**** HTTP authentication types ****/ typedef enum http_auth_e /**** HTTP authentication types @exclude all@ ****/
{ {
HTTP_AUTH_NONE, /* No authentication in use */ HTTP_AUTH_NONE, /* No authentication in use */
HTTP_AUTH_BASIC, /* Basic authentication in use */ HTTP_AUTH_BASIC, /* Basic authentication in use */
@ -393,7 +393,7 @@ typedef enum http_uri_coding_e /**** URI en/decode flags ****/
HTTP_URI_CODING_RFC6874 = 16 /* Use RFC 6874 address format */ HTTP_URI_CODING_RFC6874 = 16 /* Use RFC 6874 address format */
} http_uri_coding_t; } http_uri_coding_t;
typedef enum http_version_e /**** HTTP version numbers ****/ typedef enum http_version_e /**** HTTP version numbers @exclude all@ ****/
{ {
HTTP_VERSION_0_9 = 9, /* HTTP/0.9 */ HTTP_VERSION_0_9 = 9, /* HTTP/0.9 */
HTTP_VERSION_1_0 = 100, /* HTTP/1.0 */ HTTP_VERSION_1_0 = 100, /* HTTP/1.0 */
@ -427,6 +427,7 @@ typedef struct http_addrlist_s /**** Socket address list, which is
**** used to enumerate all of the **** used to enumerate all of the
**** addresses that are associated **** addresses that are associated
**** with a hostname. @since CUPS 1.2/macOS 10.5@ **** with a hostname. @since CUPS 1.2/macOS 10.5@
**** @exclude all@
****/ ****/
{ {
struct http_addrlist_s *next; /* Pointer to next address in list */ struct http_addrlist_s *next; /* Pointer to next address in list */
@ -435,7 +436,7 @@ typedef struct http_addrlist_s /**** Socket address list, which is
typedef struct _http_s http_t; /**** HTTP connection type ****/ typedef struct _http_s http_t; /**** HTTP connection type ****/
typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/macOS 10.7@ ****/ typedef struct http_credential_s /**** HTTP credential data @since CUPS 1.5/macOS 10.7@ @exclude all@ ****/
{ {
void *data; /* Pointer to credential data */ void *data; /* Pointer to credential data */
size_t datalen; /* Credential length */ size_t datalen; /* Credential length */

2
cups/ipp-private.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

102
cups/ipp-support.c
View File

@ -1,14 +1,14 @@
/* /*
* Internet Printing Protocol support functions for CUPS. * Internet Printing Protocol support functions for CUPS.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -429,10 +429,10 @@ static const char * const ipp_document_states[] =
"punch-quad-top", /* Finishings 2.0 */ "punch-quad-top", /* Finishings 2.0 */
"punch-quad-right", /* Finishings 2.0 */ "punch-quad-right", /* Finishings 2.0 */
"punch-quad-bottom", /* Finishings 2.0 */ "punch-quad-bottom", /* Finishings 2.0 */
"86", "punch-multiple-left",/* Finishings 2.1/Canon */
"87", "punch-multiple-top", /* Finishings 2.1/Canon */
"88", "punch-multiple-right",/* Finishings 2.1/Canon */
"89", "punch-multiple-bottom",/* Finishings 2.1/Canon */
"fold-accordian", /* Finishings 2.0 */ "fold-accordian", /* Finishings 2.0 */
"fold-double-gate", /* Finishings 2.0 */ "fold-double-gate", /* Finishings 2.0 */
"fold-gate", /* Finishings 2.0 */ "fold-gate", /* Finishings 2.0 */
@ -443,7 +443,8 @@ static const char * const ipp_document_states[] =
"fold-parallel", /* Finishings 2.0 */ "fold-parallel", /* Finishings 2.0 */
"fold-poster", /* Finishings 2.0 */ "fold-poster", /* Finishings 2.0 */
"fold-right-gate", /* Finishings 2.0 */ "fold-right-gate", /* Finishings 2.0 */
"fold-z" /* Finishings 2.0 */ "fold-z", /* Finishings 2.0 */
"fold-engineering-z" /* Finishings 2.1 */
}, },
* const ipp_finishings_vendor[] = * const ipp_finishings_vendor[] =
{ {
@ -896,12 +897,14 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"k-octets", "k-octets",
"k-octets-processed", "k-octets-processed",
"last-document", "last-document",
"materials-col-actual", /* IPP 3D */
"media-actual", "media-actual",
"media-col-actual", "media-col-actual",
"media-input-tray-check-actual", "media-input-tray-check-actual",
"media-sheets", "media-sheets",
"media-sheets-completed", "media-sheets-completed",
"more-info", "more-info",
"multiple-object-handling-actual", /* IPP 3D */
"number-up-actual", "number-up-actual",
"orientation-requested-actual", "orientation-requested-actual",
"output-bin-actual", "output-bin-actual",
@ -913,12 +916,17 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"pages", "pages",
"pages-completed", "pages-completed",
"pages-completed-current-copy", "pages-completed-current-copy",
"platform-temperature-actual", /* IPP 3D */
"presentation-direction-number-up-actual", "presentation-direction-number-up-actual",
"print-accuracy-actual", /* IPP 3D */
"print-base-actual", /* IPP 3D */
"print-color-mode-actual", "print-color-mode-actual",
"print-content-optimize-actual", "print-content-optimize-actual",
"print-objects-actual", /* IPP 3D */
"print-quality-actual", "print-quality-actual",
"print-rendering-intent-actual", "print-rendering-intent-actual",
"print-scaling-actual", /* IPP Paid Printing */ "print-scaling-actual", /* IPP Paid Printing */
"print-supports-actual", /* IPP 3D */
"printer-resolution-actual", "printer-resolution-actual",
"printer-up-time", "printer-up-time",
"separator-sheets-actual", "separator-sheets-actual",
@ -973,6 +981,20 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"insert-sheet", "insert-sheet",
"insert-sheet-default", "insert-sheet-default",
"insert-sheet-supported", "insert-sheet-supported",
"material-amount-units-supported", /* IPP 3D */
"material-diameter-supported", /* IPP 3D */
"material-purpose-supported", /* IPP 3D */
"material-rate-supported", /* IPP 3D */
"material-rate-units-supported", /* IPP 3D */
"material-shell-thickness-supported",/* IPP 3D */
"material-temperature-supported", /* IPP 3D */
"material-type-supported", /* IPP 3D */
"materials-col", /* IPP 3D */
"materials-col-database", /* IPP 3D */
"materials-col-default", /* IPP 3D */
"materials-col-ready", /* IPP 3D */
"materials-col-supported", /* IPP 3D */
"max-materials-col-supported", /* IPP 3D */
"max-stitching-locations-supported", "max-stitching-locations-supported",
"media", "media",
"media-back-coating-supported", "media-back-coating-supported",
@ -1005,6 +1027,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"multiple-document-handling", "multiple-document-handling",
"multiple-document-handling-default", "multiple-document-handling-default",
"multiple-document-handling-supported", "multiple-document-handling-supported",
"multiple-object-handling", /* IPP 3D */
"multiple-object-handling-default", /* IPP 3D */
"multiple-object-handling-supported",/* IPP 3D */
"number-up", "number-up",
"number-up-default", "number-up-default",
"number-up-supported", "number-up-supported",
@ -1033,15 +1058,27 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"pdl-init-file-name-subdirectory-supported", "pdl-init-file-name-subdirectory-supported",
"pdl-init-file-name-supported", "pdl-init-file-name-supported",
"pdl-init-file-supported", "pdl-init-file-supported",
"platform-temperature", /* IPP 3D */
"platform-temperature-default", /* IPP 3D */
"platform-temperature-supported", /* IPP 3D */
"presentation-direction-number-up", "presentation-direction-number-up",
"presentation-direction-number-up-default", "presentation-direction-number-up-default",
"presentation-direction-number-up-supported", "presentation-direction-number-up-supported",
"print-accuracy", /* IPP 3D */
"print-accuracy-default", /* IPP 3D */
"print-accuracy-supported", /* IPP 3D */
"print-base", /* IPP 3D */
"print-base-default", /* IPP 3D */
"print-base-supported", /* IPP 3D */
"print-color-mode", "print-color-mode",
"print-color-mode-default", "print-color-mode-default",
"print-color-mode-supported", "print-color-mode-supported",
"print-content-optimize", "print-content-optimize",
"print-content-optimize-default", "print-content-optimize-default",
"print-content-optimize-supported", "print-content-optimize-supported",
"print-objects", /* IPP 3D */
"print-objects-default", /* IPP 3D */
"print-objects-supported", /* IPP 3D */
"print-quality", "print-quality",
"print-quality-default", "print-quality-default",
"print-quality-supported", "print-quality-supported",
@ -1051,6 +1088,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"print-scaling", /* IPP Paid Printing */ "print-scaling", /* IPP Paid Printing */
"print-scaling-default", /* IPP Paid Printing */ "print-scaling-default", /* IPP Paid Printing */
"print-scaling-supported", /* IPP Paid Printing */ "print-scaling-supported", /* IPP Paid Printing */
"print-supports", /* IPP 3D */
"print-supports-default", /* IPP 3D */
"print-supports-supported", /* IPP 3D */
"printer-resolution", "printer-resolution",
"printer-resolution-default", "printer-resolution-default",
"printer-resolution-supported", "printer-resolution-supported",
@ -1165,10 +1205,12 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"job-state-reasons", "job-state-reasons",
"job-uri", "job-uri",
"job-uuid", "job-uuid",
"materials-col-actual", /* IPP 3D */
"media-actual", "media-actual",
"media-col-actual", "media-col-actual",
"media-check-input-tray-actual", "media-check-input-tray-actual",
"multiple-document-handling-actual", "multiple-document-handling-actual",
"multiple-object-handling-actual", /* IPP 3D */
"number-of-documents", "number-of-documents",
"number-of-intervening-jobs", "number-of-intervening-jobs",
"number-up-actual", "number-up-actual",
@ -1180,12 +1222,17 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"page-delivery-actual", "page-delivery-actual",
"page-order-received-actual", "page-order-received-actual",
"page-ranges-actual", "page-ranges-actual",
"platform-temperature-actual", /* IPP 3D */
"presentation-direction-number-up-actual", "presentation-direction-number-up-actual",
"print-accuracy-actual", /* IPP 3D */
"print-base-actual", /* IPP 3D */
"print-color-mode-actual", "print-color-mode-actual",
"print-content-optimize-actual", "print-content-optimize-actual",
"print-objects-actual", /* IPP 3D */
"print-quality-actual", "print-quality-actual",
"print-rendering-intent-actual", "print-rendering-intent-actual",
"print-scaling-actual", /* IPP Paid Printing */ "print-scaling-actual", /* IPP Paid Printing */
"print-supports-actual", /* IPP 3D */
"printer-resolution-actual", "printer-resolution-actual",
"separator-sheets-actual", "separator-sheets-actual",
"sheet-collate-actual", "sheet-collate-actual",
@ -1207,6 +1254,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
}; };
static const char * const job_template[] = static const char * const job_template[] =
{ /* job-template group */ { /* job-template group */
"accuracy-units-supported", /* IPP 3D */
"confirmation-sheet-print", /* IPP FaxOut */ "confirmation-sheet-print", /* IPP FaxOut */
"confirmation-sheet-print-default", "confirmation-sheet-print-default",
"copies", "copies",
@ -1314,6 +1362,20 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"job-sheets-default", "job-sheets-default",
"job-sheets-supported", "job-sheets-supported",
"logo-uri-schemes-supported", "logo-uri-schemes-supported",
"material-amount-units-supported", /* IPP 3D */
"material-diameter-supported", /* IPP 3D */
"material-purpose-supported", /* IPP 3D */
"material-rate-supported", /* IPP 3D */
"material-rate-units-supported", /* IPP 3D */
"material-shell-thickness-supported",/* IPP 3D */
"material-temperature-supported", /* IPP 3D */
"material-type-supported", /* IPP 3D */
"materials-col", /* IPP 3D */
"materials-col-database", /* IPP 3D */
"materials-col-default", /* IPP 3D */
"materials-col-ready", /* IPP 3D */
"materials-col-supported", /* IPP 3D */
"max-materials-col-supported", /* IPP 3D */
"max-save-info-supported", "max-save-info-supported",
"max-stitching-locations-supported", "max-stitching-locations-supported",
"media", "media",
@ -1347,6 +1409,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"multiple-document-handling", "multiple-document-handling",
"multiple-document-handling-default", "multiple-document-handling-default",
"multiple-document-handling-supported", "multiple-document-handling-supported",
"multiple-object-handling", /* IPP 3D */
"multiple-object-handling-default", /* IPP 3D */
"multiple-object-handling-supported",/* IPP 3D */
"number-of-retries", /* IPP FaxOut */ "number-of-retries", /* IPP FaxOut */
"number-of-retries-default", "number-of-retries-default",
"number-of-retries-supported", "number-of-retries-supported",
@ -1384,15 +1449,27 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"pdl-init-file-name-subdirectory-supported", "pdl-init-file-name-subdirectory-supported",
"pdl-init-file-name-supported", "pdl-init-file-name-supported",
"pdl-init-file-supported", "pdl-init-file-supported",
"platform-temperature", /* IPP 3D */
"platform-temperature-default", /* IPP 3D */
"platform-temperature-supported", /* IPP 3D */
"presentation-direction-number-up", "presentation-direction-number-up",
"presentation-direction-number-up-default", "presentation-direction-number-up-default",
"presentation-direction-number-up-supported", "presentation-direction-number-up-supported",
"print-accuracy", /* IPP 3D */
"print-accuracy-default", /* IPP 3D */
"print-accuracy-supported", /* IPP 3D */
"print-base", /* IPP 3D */
"print-base-default", /* IPP 3D */
"print-base-supported", /* IPP 3D */
"print-color-mode", "print-color-mode",
"print-color-mode-default", "print-color-mode-default",
"print-color-mode-supported", "print-color-mode-supported",
"print-content-optimize", "print-content-optimize",
"print-content-optimize-default", "print-content-optimize-default",
"print-content-optimize-supported", "print-content-optimize-supported",
"print-objects", /* IPP 3D */
"print-objects-default", /* IPP 3D */
"print-objects-supported", /* IPP 3D */
"print-quality", "print-quality",
"print-quality-default", "print-quality-default",
"print-quality-supported", "print-quality-supported",
@ -1402,6 +1479,9 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"print-scaling", /* IPP Paid Printing */ "print-scaling", /* IPP Paid Printing */
"print-scaling-default", /* IPP Paid Printing */ "print-scaling-default", /* IPP Paid Printing */
"print-scaling-supported", /* IPP Paid Printing */ "print-scaling-supported", /* IPP Paid Printing */
"print-supports", /* IPP 3D */
"print-supports-default", /* IPP 3D */
"print-supports-supported", /* IPP 3D */
"printer-resolution", "printer-resolution",
"printer-resolution-default", "printer-resolution-default",
"printer-resolution-supported", "printer-resolution-supported",
@ -1532,6 +1612,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"pages-per-minute", "pages-per-minute",
"pages-per-minute-color", "pages-per-minute-color",
"pdf-k-octets-supported", /* CUPS extension */ "pdf-k-octets-supported", /* CUPS extension */
"pdf-features-supported", /* IPP 3D */
"pdf-versions-supported", /* CUPS extension */ "pdf-versions-supported", /* CUPS extension */
"pdl-override-supported", "pdl-override-supported",
"port-monitor", /* CUPS extension */ "port-monitor", /* CUPS extension */
@ -1559,6 +1640,7 @@ ippCreateRequestedArray(ipp_t *request) /* I - IPP request */
"printer-get-attributes-supported", "printer-get-attributes-supported",
"printer-icc-profiles", "printer-icc-profiles",
"printer-icons", "printer-icons",
"printer-id", /* CUPS extension */
"printer-info", "printer-info",
"printer-input-tray", /* IPP JPS3 */ "printer-input-tray", /* IPP JPS3 */
"printer-is-accepting-jobs", "printer-is-accepting-jobs",
@ -2043,7 +2125,7 @@ ippOpString(ipp_op_t op) /* I - Operation ID */
* See if the operation ID is a known value... * See if the operation ID is a known value...
*/ */
if (op >= IPP_OP_PRINT_JOB && op <= IPP_OP_VALIDATE_DOCUMENT) if (op >= IPP_OP_PRINT_JOB && op < (ipp_op_t)(sizeof(ipp_std_ops) / sizeof(ipp_std_ops[0])))
return (ipp_std_ops[op]); return (ipp_std_ops[op]);
else if (op == IPP_OP_PRIVATE) else if (op == IPP_OP_PRIVATE)
return ("windows-ext"); return ("windows-ext");
@ -2161,7 +2243,7 @@ ippStateString(ipp_state_t state) /* I - State value */
/* /*
* 'ippTagString()' - Return the tag name corresponding to a tag value. * 'ippTagString()' - Return the tag name corresponding to a tag value.
* *
* The returned names are defined in RFC 2911 and 3382. * The returned names are defined in RFC 8011 and the IANA IPP Registry.
* *
* @since CUPS 1.4/macOS 10.6@ * @since CUPS 1.4/macOS 10.6@
*/ */
@ -2181,7 +2263,7 @@ ippTagString(ipp_tag_t tag) /* I - Tag value */
/* /*
* 'ippTagValue()' - Return the tag value corresponding to a tag name. * 'ippTagValue()' - Return the tag value corresponding to a tag name.
* *
* The tag names are defined in RFC 2911 and 3382. * The tag names are defined in RFC 8011 and the IANA IPP Registry.
* *
* @since CUPS 1.4/macOS 10.6@ * @since CUPS 1.4/macOS 10.6@
*/ */

197
cups/ipp.c
View File

@ -1,14 +1,14 @@
/* /*
* Internet Printing Protocol functions for CUPS. * Internet Printing Protocol functions for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -316,7 +316,7 @@ ippAddCollections(
/* /*
* 'ippAddDate()' - Add a date attribute to an IPP message. * 'ippAddDate()' - Add a dateTime attribute to an IPP message.
* *
* The @code ipp@ parameter refers to an IPP message previously created using * The @code ipp@ parameter refers to an IPP message previously created using
* the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions.
@ -1380,7 +1380,7 @@ ippContainsInteger(
* specified string value. * specified string value.
* *
* Returns non-zero when the attribute contains a matching charset, keyword, * Returns non-zero when the attribute contains a matching charset, keyword,
* language, mimeMediaType, name, text, URI, or URI scheme value. * naturalLanguage, mimeMediaType, name, text, uri, or uriScheme value.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
*/ */
@ -1419,11 +1419,6 @@ ippContainsString(
case IPP_TAG_CHARSET : case IPP_TAG_CHARSET :
case IPP_TAG_KEYWORD : case IPP_TAG_KEYWORD :
case IPP_TAG_LANGUAGE : case IPP_TAG_LANGUAGE :
case IPP_TAG_MIMETYPE :
case IPP_TAG_NAME :
case IPP_TAG_NAMELANG :
case IPP_TAG_TEXT :
case IPP_TAG_TEXTLANG :
case IPP_TAG_URI : case IPP_TAG_URI :
case IPP_TAG_URISCHEME : case IPP_TAG_URISCHEME :
for (i = attr->num_values, avalue = attr->values; for (i = attr->num_values, avalue = attr->values;
@ -1440,6 +1435,25 @@ ippContainsString(
} }
} }
case IPP_TAG_MIMETYPE :
case IPP_TAG_NAME :
case IPP_TAG_NAMELANG :
case IPP_TAG_TEXT :
case IPP_TAG_TEXTLANG :
for (i = attr->num_values, avalue = attr->values;
i > 0;
i --, avalue ++)
{
DEBUG_printf(("1ippContainsString: value[%d]=\"%s\"",
attr->num_values - i, avalue->string.text));
if (!_cups_strcasecmp(value, avalue->string.text))
{
DEBUG_puts("1ippContainsString: Returning 1 (match)");
return (1);
}
}
default : default :
break; break;
} }
@ -1745,12 +1759,12 @@ ippCopyAttributes(
/* /*
* 'ippDateToTime()' - Convert from RFC 1903 Date/Time format to UNIX time * 'ippDateToTime()' - Convert from RFC 2579 Date/Time format to time in
* in seconds. * seconds.
*/ */
time_t /* O - UNIX time value */ time_t /* O - UNIX time value */
ippDateToTime(const ipp_uchar_t *date) /* I - RFC 1903 date info */ ippDateToTime(const ipp_uchar_t *date) /* I - RFC 2579 date info */
{ {
struct tm unixdate; /* UNIX date/time info */ struct tm unixdate; /* UNIX date/time info */
time_t t; /* Computed time */ time_t t; /* Computed time */
@ -1762,7 +1776,7 @@ ippDateToTime(const ipp_uchar_t *date) /* I - RFC 1903 date info */
memset(&unixdate, 0, sizeof(unixdate)); memset(&unixdate, 0, sizeof(unixdate));
/* /*
* RFC-1903 date/time format is: * RFC-2579 date/time format is:
* *
* Byte(s) Description * Byte(s) Description
* ------- ----------- * ------- -----------
@ -2138,7 +2152,7 @@ ippFirstAttribute(ipp_t *ipp) /* I - IPP message */
* 'ippGetBoolean()' - Get a boolean value for an attribute. * 'ippGetBoolean()' - Get a boolean value for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2167,7 +2181,7 @@ ippGetBoolean(ipp_attribute_t *attr, /* I - IPP attribute */
* 'ippGetCollection()' - Get a collection value for an attribute. * 'ippGetCollection()' - Get a collection value for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2218,15 +2232,15 @@ ippGetCount(ipp_attribute_t *attr) /* I - IPP attribute */
/* /*
* 'ippGetDate()' - Get a date value for an attribute. * 'ippGetDate()' - Get a dateTime value for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
const ipp_uchar_t * /* O - Date value or @code NULL@ */ const ipp_uchar_t * /* O - dateTime value or @code NULL@ */
ippGetDate(ipp_attribute_t *attr, /* I - IPP attribute */ ippGetDate(ipp_attribute_t *attr, /* I - IPP attribute */
int element) /* I - Value number (0-based) */ int element) /* I - Value number (0-based) */
{ {
@ -2274,7 +2288,7 @@ ippGetGroupTag(ipp_attribute_t *attr) /* I - IPP attribute */
* 'ippGetInteger()' - Get the integer/enum value for an attribute. * 'ippGetInteger()' - Get the integer/enum value for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2327,7 +2341,7 @@ ippGetName(ipp_attribute_t *attr) /* I - IPP attribute */
* 'ippGetOctetString()' - Get an octetString value from an IPP attribute. * 'ippGetOctetString()' - Get an octetString value from an IPP attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
*/ */
@ -2390,7 +2404,7 @@ ippGetOperation(ipp_t *ipp) /* I - IPP request message */
* 'ippGetRange()' - Get a rangeOfInteger value from an attribute. * 'ippGetRange()' - Get a rangeOfInteger value from an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2452,7 +2466,7 @@ ippGetRequestId(ipp_t *ipp) /* I - IPP message */
* 'ippGetResolution()' - Get a resolution value for an attribute. * 'ippGetResolution()' - Get a resolution value for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2546,7 +2560,7 @@ ippGetStatusCode(ipp_t *ipp) /* I - IPP response or event message */
* 'ippGetString()' - Get the string and optionally the language code for an attribute. * 'ippGetString()' - Get the string and optionally the language code for an attribute.
* *
* The @code element@ parameter specifies which value to get from 0 to * The @code element@ parameter specifies which value to get from 0 to
* @link ippGetCount(attr)@ - 1. * @code ippGetCount(attr)@ - 1.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -2556,13 +2570,16 @@ ippGetString(ipp_attribute_t *attr, /* I - IPP attribute */
int element, /* I - Value number (0-based) */ int element, /* I - Value number (0-based) */
const char **language)/* O - Language code (@code NULL@ for don't care) */ const char **language)/* O - Language code (@code NULL@ for don't care) */
{ {
ipp_tag_t tag; /* Value tag */
/* /*
* Range check input... * Range check input...
*/ */
if (!attr || element < 0 || element >= attr->num_values || tag = ippGetValueTag(attr);
(attr->value_tag != IPP_TAG_TEXTLANG && attr->value_tag != IPP_TAG_NAMELANG &&
(attr->value_tag < IPP_TAG_TEXT || attr->value_tag > IPP_TAG_MIMETYPE))) if (!attr || element < 0 || element >= attr->num_values || (tag != IPP_TAG_TEXTLANG && tag != IPP_TAG_NAMELANG && (tag < IPP_TAG_TEXT || tag > IPP_TAG_MIMETYPE)))
return (NULL); return (NULL);
/* /*
@ -2608,7 +2625,7 @@ ippGetValueTag(ipp_attribute_t *attr) /* I - IPP attribute */
int /* O - Major version number or 0 on error */ int /* O - Major version number or 0 on error */
ippGetVersion(ipp_t *ipp, /* I - IPP message */ ippGetVersion(ipp_t *ipp, /* I - IPP message */
int *minor) /* O - Minor version number or @code NULL@ */ int *minor) /* O - Minor version number or @code NULL@ for don't care */
{ {
/* /*
* Range check input... * Range check input...
@ -2705,9 +2722,9 @@ ippNew(void)
/* /*
* 'ippNewRequest()' - Allocate a new IPP request message. * 'ippNewRequest()' - Allocate a new IPP request message.
* *
* The new request message is initialized with the attributes-charset and * The new request message is initialized with the "attributes-charset" and
* attributes-natural-language attributes added. The * "attributes-natural-language" attributes added. The
* attributes-natural-language value is derived from the current locale. * "attributes-natural-language" value is derived from the current locale.
* *
* @since CUPS 1.2/macOS 10.5@ * @since CUPS 1.2/macOS 10.5@
*/ */
@ -2769,11 +2786,11 @@ ippNewRequest(ipp_op_t op) /* I - Operation code */
/* /*
* 'ippNewResponse()' - Allocate a new IPP response message. * 'ippNewResponse()' - Allocate a new IPP response message.
* *
* The new response message is initialized with the same version-number, * The new response message is initialized with the same "version-number",
* request-id, attributes-charset, and attributes-natural-language as the * "request-id", "attributes-charset", and "attributes-natural-language" as the
* provided request message. If the attributes-charset or * provided request message. If the "attributes-charset" or
* attributes-natural-language attributes are missing from the request, * "attributes-natural-language" attributes are missing from the request,
* "utf-8" and a value derived from the current locale are substituted, * 'utf-8' and a value derived from the current locale are substituted,
* respectively. * respectively.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
@ -3689,7 +3706,7 @@ ippReadIO(void *src, /* I - Data source */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -3731,7 +3748,7 @@ ippSetBoolean(ipp_t *ipp, /* I - IPP message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -3772,7 +3789,7 @@ ippSetCollection(
/* /*
* 'ippSetDate()' - Set a date value in an attribute. * 'ippSetDate()' - Set a dateTime value in an attribute.
* *
* The @code ipp@ parameter refers to an IPP message previously created using * The @code ipp@ parameter refers to an IPP message previously created using
* the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions. * the @link ippNew@, @link ippNewRequest@, or @link ippNewResponse@ functions.
@ -3780,7 +3797,7 @@ ippSetCollection(
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -3789,7 +3806,7 @@ int /* O - 1 on success, 0 on failure */
ippSetDate(ipp_t *ipp, /* I - IPP message */ ippSetDate(ipp_t *ipp, /* I - IPP message */
ipp_attribute_t **attr, /* IO - IPP attribute */ ipp_attribute_t **attr, /* IO - IPP attribute */
int element, /* I - Value number (0-based) */ int element, /* I - Value number (0-based) */
const ipp_uchar_t *datevalue)/* I - Date value */ const ipp_uchar_t *datevalue)/* I - dateTime value */
{ {
_ipp_value_t *value; /* Current value */ _ipp_value_t *value; /* Current value */
@ -3837,7 +3854,7 @@ ippSetGroupTag(
ipp_tag_t group_tag) /* I - Group tag */ ipp_tag_t group_tag) /* I - Group tag */
{ {
/* /*
* Range check input - group tag must be 0x01 to 0x0F, per RFC 2911... * Range check input - group tag must be 0x01 to 0x0F, per RFC 8011...
*/ */
if (!ipp || !attr || !*attr || if (!ipp || !attr || !*attr ||
@ -3864,7 +3881,7 @@ ippSetGroupTag(
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -3949,7 +3966,7 @@ ippSetName(ipp_t *ipp, /* I - IPP message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
*/ */
@ -4067,7 +4084,7 @@ ippSetOperation(ipp_t *ipp, /* I - IPP request message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -4147,7 +4164,7 @@ ippSetRequestId(ipp_t *ipp, /* I - IPP message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -4255,7 +4272,7 @@ ippSetStatusCode(ipp_t *ipp, /* I - IPP response or event message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* @since CUPS 1.6/macOS 10.8@ * @since CUPS 1.6/macOS 10.8@
*/ */
@ -4317,7 +4334,7 @@ ippSetString(ipp_t *ipp, /* I - IPP message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* The @code format@ parameter uses formatting characters compatible with the * The @code format@ parameter uses formatting characters compatible with the
* printf family of standard functions. Additional arguments follow it as * printf family of standard functions. Additional arguments follow it as
@ -4355,7 +4372,7 @@ ippSetStringf(ipp_t *ipp, /* I - IPP message */
* The @code attr@ parameter may be modified as a result of setting the value. * The @code attr@ parameter may be modified as a result of setting the value.
* *
* The @code element@ parameter specifies which value to set from 0 to * The @code element@ parameter specifies which value to set from 0 to
* @link ippGetCount(attr)@. * @code ippGetCount(attr)@.
* *
* The @code format@ parameter uses formatting characters compatible with the * The @code format@ parameter uses formatting characters compatible with the
* printf family of standard functions. Additional arguments follow it as * printf family of standard functions. Additional arguments follow it as
@ -4698,19 +4715,19 @@ ippSetVersion(ipp_t *ipp, /* I - IPP message */
/* /*
* 'ippTimeToDate()' - Convert from UNIX time to RFC 1903 format. * 'ippTimeToDate()' - Convert from time in seconds to RFC 2579 format.
*/ */
const ipp_uchar_t * /* O - RFC-1903 date/time data */ const ipp_uchar_t * /* O - RFC-2579 date/time data */
ippTimeToDate(time_t t) /* I - UNIX time value */ ippTimeToDate(time_t t) /* I - Time in seconds */
{ {
struct tm *unixdate; /* UNIX unixdate/time info */ struct tm *unixdate; /* UNIX unixdate/time info */
ipp_uchar_t *date = _cupsGlobals()->ipp_date; ipp_uchar_t *date = _cupsGlobals()->ipp_date;
/* RFC-1903 date/time data */ /* RFC-2579 date/time data */
/* /*
* RFC-1903 date/time format is: * RFC-2579 date/time format is:
* *
* Byte(s) Description * Byte(s) Description
* ------- ----------- * ------- -----------
@ -4750,7 +4767,7 @@ ippTimeToDate(time_t t) /* I - UNIX time value */
* *
* This function validates the contents of an attribute based on the name and * This function validates the contents of an attribute based on the name and
* value tag. 1 is returned if the attribute is valid, 0 otherwise. On * value tag. 1 is returned if the attribute is valid, 0 otherwise. On
* failure, cupsLastErrorString() is set to a human-readable message. * failure, @link cupsLastErrorString@ is set to a human-readable message.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
*/ */
@ -4806,7 +4823,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad attribute name - invalid character " _("\"%s\": Bad attribute name - invalid character "
"(RFC 2911 section 4.1.3)."), attr->name); "(RFC 8011 section 5.1.4)."), attr->name);
return (0); return (0);
} }
@ -4814,7 +4831,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad attribute name - bad length %d " _("\"%s\": Bad attribute name - bad length %d "
"(RFC 2911 section 4.1.3)."), attr->name, "(RFC 8011 section 5.1.4)."), attr->name,
(int)(ptr - attr->name)); (int)(ptr - attr->name));
return (0); return (0);
} }
@ -4832,7 +4849,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad boolen value %d " _("\"%s\": Bad boolen value %d "
"(RFC 2911 section 4.1.11)."), attr->name, "(RFC 8011 section 5.1.21)."), attr->name,
attr->values[i].boolean); attr->values[i].boolean);
return (0); return (0);
} }
@ -4846,7 +4863,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad enum value %d - out of range " _("\"%s\": Bad enum value %d - out of range "
"(RFC 2911 section 4.1.4)."), attr->name, "(RFC 8011 section 5.1.5)."), attr->name,
attr->values[i].integer); attr->values[i].integer);
return (0); return (0);
} }
@ -4860,7 +4877,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad octetString value - bad length %d " _("\"%s\": Bad octetString value - bad length %d "
"(RFC 2911 section 4.1.10)."), attr->name, "(RFC 8011 section 5.1.20)."), attr->name,
attr->values[i].unknown.length); attr->values[i].unknown.length);
return (0); return (0);
} }
@ -4876,7 +4893,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime month %u " _("\"%s\": Bad dateTime month %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[2]); "(RFC 8011 section 5.1.15)."), attr->name, date[2]);
return (0); return (0);
} }
@ -4884,7 +4901,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime day %u " _("\"%s\": Bad dateTime day %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[3]); "(RFC 8011 section 5.1.15)."), attr->name, date[3]);
return (0); return (0);
} }
@ -4892,7 +4909,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime hours %u " _("\"%s\": Bad dateTime hours %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[4]); "(RFC 8011 section 5.1.15)."), attr->name, date[4]);
return (0); return (0);
} }
@ -4900,7 +4917,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime minutes %u " _("\"%s\": Bad dateTime minutes %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[5]); "(RFC 8011 section 5.1.15)."), attr->name, date[5]);
return (0); return (0);
} }
@ -4908,7 +4925,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime seconds %u " _("\"%s\": Bad dateTime seconds %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[6]); "(RFC 8011 section 5.1.15)."), attr->name, date[6]);
return (0); return (0);
} }
@ -4916,7 +4933,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime deciseconds %u " _("\"%s\": Bad dateTime deciseconds %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[7]); "(RFC 8011 section 5.1.15)."), attr->name, date[7]);
return (0); return (0);
} }
@ -4924,7 +4941,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime UTC sign '%c' " _("\"%s\": Bad dateTime UTC sign '%c' "
"(RFC 2911 section 4.1.14)."), attr->name, date[8]); "(RFC 8011 section 5.1.15)."), attr->name, date[8]);
return (0); return (0);
} }
@ -4932,7 +4949,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime UTC hours %u " _("\"%s\": Bad dateTime UTC hours %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[9]); "(RFC 8011 section 5.1.15)."), attr->name, date[9]);
return (0); return (0);
} }
@ -4940,7 +4957,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad dateTime UTC minutes %u " _("\"%s\": Bad dateTime UTC minutes %u "
"(RFC 2911 section 4.1.14)."), attr->name, date[10]); "(RFC 8011 section 5.1.15)."), attr->name, date[10]);
return (0); return (0);
} }
} }
@ -4954,7 +4971,7 @@ ippValidateAttribute(
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad resolution value %dx%d%s - cross " _("\"%s\": Bad resolution value %dx%d%s - cross "
"feed resolution must be positive " "feed resolution must be positive "
"(RFC 2911 section 4.1.15)."), attr->name, "(RFC 8011 section 5.1.16)."), attr->name,
attr->values[i].resolution.xres, attr->values[i].resolution.xres,
attr->values[i].resolution.yres, attr->values[i].resolution.yres,
attr->values[i].resolution.units == attr->values[i].resolution.units ==
@ -4969,7 +4986,7 @@ ippValidateAttribute(
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad resolution value %dx%d%s - feed " _("\"%s\": Bad resolution value %dx%d%s - feed "
"resolution must be positive " "resolution must be positive "
"(RFC 2911 section 4.1.15)."), attr->name, "(RFC 8011 section 5.1.16)."), attr->name,
attr->values[i].resolution.xres, attr->values[i].resolution.xres,
attr->values[i].resolution.yres, attr->values[i].resolution.yres,
attr->values[i].resolution.units == attr->values[i].resolution.units ==
@ -4984,7 +5001,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad resolution value %dx%d%s - bad " _("\"%s\": Bad resolution value %dx%d%s - bad "
"units value (RFC 2911 section 4.1.15)."), "units value (RFC 8011 section 5.1.16)."),
attr->name, attr->values[i].resolution.xres, attr->name, attr->values[i].resolution.xres,
attr->values[i].resolution.yres, attr->values[i].resolution.yres,
attr->values[i].resolution.units == attr->values[i].resolution.units ==
@ -5003,7 +5020,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad rangeOfInteger value %d-%d - lower " _("\"%s\": Bad rangeOfInteger value %d-%d - lower "
"greater than upper (RFC 2911 section 4.1.13)."), "greater than upper (RFC 8011 section 5.1.14)."),
attr->name, attr->values[i].range.lower, attr->name, attr->values[i].range.lower,
attr->values[i].range.upper); attr->values[i].range.upper);
return (0); return (0);
@ -5065,7 +5082,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad text value \"%s\" - bad UTF-8 " _("\"%s\": Bad text value \"%s\" - bad UTF-8 "
"sequence (RFC 2911 section 4.1.1)."), attr->name, "sequence (RFC 8011 section 5.1.2)."), attr->name,
attr->values[i].string.text); attr->values[i].string.text);
return (0); return (0);
} }
@ -5074,7 +5091,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad text value \"%s\" - bad length %d " _("\"%s\": Bad text value \"%s\" - bad length %d "
"(RFC 2911 section 4.1.1)."), attr->name, "(RFC 8011 section 5.1.2)."), attr->name,
attr->values[i].string.text, attr->values[i].string.text,
(int)(ptr - attr->values[i].string.text)); (int)(ptr - attr->values[i].string.text));
return (0); return (0);
@ -5123,7 +5140,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad name value \"%s\" - bad UTF-8 " _("\"%s\": Bad name value \"%s\" - bad UTF-8 "
"sequence (RFC 2911 section 4.1.2)."), attr->name, "sequence (RFC 8011 section 5.1.3)."), attr->name,
attr->values[i].string.text); attr->values[i].string.text);
return (0); return (0);
} }
@ -5132,7 +5149,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad name value \"%s\" - bad length %d " _("\"%s\": Bad name value \"%s\" - bad length %d "
"(RFC 2911 section 4.1.2)."), attr->name, "(RFC 8011 section 5.1.3)."), attr->name,
attr->values[i].string.text, attr->values[i].string.text,
(int)(ptr - attr->values[i].string.text)); (int)(ptr - attr->values[i].string.text));
return (0); return (0);
@ -5152,7 +5169,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad keyword value \"%s\" - invalid " _("\"%s\": Bad keyword value \"%s\" - invalid "
"character (RFC 2911 section 4.1.3)."), "character (RFC 8011 section 5.1.4)."),
attr->name, attr->values[i].string.text); attr->name, attr->values[i].string.text);
return (0); return (0);
} }
@ -5161,7 +5178,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad keyword value \"%s\" - bad " _("\"%s\": Bad keyword value \"%s\" - bad "
"length %d (RFC 2911 section 4.1.3)."), "length %d (RFC 8011 section 5.1.4)."),
attr->name, attr->values[i].string.text, attr->name, attr->values[i].string.text,
(int)(ptr - attr->values[i].string.text)); (int)(ptr - attr->values[i].string.text));
return (0); return (0);
@ -5183,7 +5200,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad URI value \"%s\" - %s " _("\"%s\": Bad URI value \"%s\" - %s "
"(RFC 2911 section 4.1.5)."), attr->name, "(RFC 8011 section 5.1.6)."), attr->name,
attr->values[i].string.text, attr->values[i].string.text,
uri_status_strings[uri_status - uri_status_strings[uri_status -
HTTP_URI_STATUS_OVERFLOW]); HTTP_URI_STATUS_OVERFLOW]);
@ -5194,7 +5211,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad URI value \"%s\" - bad length %d " _("\"%s\": Bad URI value \"%s\" - bad length %d "
"(RFC 2911 section 4.1.5)."), attr->name, "(RFC 8011 section 5.1.6)."), attr->name,
attr->values[i].string.text, attr->values[i].string.text,
(int)strlen(attr->values[i].string.text)); (int)strlen(attr->values[i].string.text));
} }
@ -5217,7 +5234,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad uriScheme value \"%s\" - bad " _("\"%s\": Bad uriScheme value \"%s\" - bad "
"characters (RFC 2911 section 4.1.6)."), "characters (RFC 8011 section 5.1.7)."),
attr->name, attr->values[i].string.text); attr->name, attr->values[i].string.text);
return (0); return (0);
} }
@ -5226,7 +5243,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad uriScheme value \"%s\" - bad " _("\"%s\": Bad uriScheme value \"%s\" - bad "
"length %d (RFC 2911 section 4.1.6)."), "length %d (RFC 8011 section 5.1.7)."),
attr->name, attr->values[i].string.text, attr->name, attr->values[i].string.text,
(int)(ptr - attr->values[i].string.text)); (int)(ptr - attr->values[i].string.text));
return (0); return (0);
@ -5246,7 +5263,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad charset value \"%s\" - bad " _("\"%s\": Bad charset value \"%s\" - bad "
"characters (RFC 2911 section 4.1.7)."), "characters (RFC 8011 section 5.1.8)."),
attr->name, attr->values[i].string.text); attr->name, attr->values[i].string.text);
return (0); return (0);
} }
@ -5255,7 +5272,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad charset value \"%s\" - bad " _("\"%s\": Bad charset value \"%s\" - bad "
"length %d (RFC 2911 section 4.1.7)."), "length %d (RFC 8011 section 5.1.8)."),
attr->name, attr->values[i].string.text, attr->name, attr->values[i].string.text,
(int)(ptr - attr->values[i].string.text)); (int)(ptr - attr->values[i].string.text));
return (0); return (0);
@ -5301,7 +5318,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad naturalLanguage value \"%s\" - bad " _("\"%s\": Bad naturalLanguage value \"%s\" - bad "
"characters (RFC 2911 section 4.1.8)."), "characters (RFC 8011 section 5.1.9)."),
attr->name, attr->values[i].string.text); attr->name, attr->values[i].string.text);
regfree(&re); regfree(&re);
return (0); return (0);
@ -5311,7 +5328,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad naturalLanguage value \"%s\" - bad " _("\"%s\": Bad naturalLanguage value \"%s\" - bad "
"length %d (RFC 2911 section 4.1.8)."), "length %d (RFC 8011 section 5.1.9)."),
attr->name, attr->values[i].string.text, attr->name, attr->values[i].string.text,
(int)strlen(attr->values[i].string.text)); (int)strlen(attr->values[i].string.text));
regfree(&re); regfree(&re);
@ -5355,7 +5372,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad mimeMediaType value \"%s\" - bad " _("\"%s\": Bad mimeMediaType value \"%s\" - bad "
"characters (RFC 2911 section 4.1.9)."), "characters (RFC 8011 section 5.1.10)."),
attr->name, attr->values[i].string.text); attr->name, attr->values[i].string.text);
regfree(&re); regfree(&re);
return (0); return (0);
@ -5365,7 +5382,7 @@ ippValidateAttribute(
{ {
ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST,
_("\"%s\": Bad mimeMediaType value \"%s\" - bad " _("\"%s\": Bad mimeMediaType value \"%s\" - bad "
"length %d (RFC 2911 section 4.1.9)."), "length %d (RFC 8011 section 5.1.10)."),
attr->name, attr->values[i].string.text, attr->name, attr->values[i].string.text,
(int)strlen(attr->values[i].string.text)); (int)strlen(attr->values[i].string.text));
regfree(&re); regfree(&re);
@ -5388,8 +5405,8 @@ ippValidateAttribute(
* 'ippValidateAttributes()' - Validate all attributes in an IPP message. * 'ippValidateAttributes()' - Validate all attributes in an IPP message.
* *
* This function validates the contents of the IPP message, including each * This function validates the contents of the IPP message, including each
* attribute. Like @link ippValidateAttribute@, cupsLastErrorString() is set * attribute. Like @link ippValidateAttribute@, @link cupsLastErrorString@ is
* to a human-readable message on failure. * set to a human-readable message on failure.
* *
* @since CUPS 1.7/macOS 10.9@ * @since CUPS 1.7/macOS 10.9@
*/ */

280
cups/ipp.h
View File

@ -1,14 +1,14 @@
/* /*
* Internet Printing Protocol definitions for CUPS. * Internet Printing Protocol definitions for CUPS.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products. * Copyright 1997-2006 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -77,7 +77,7 @@ extern "C" {
* Types and structures... * Types and structures...
*/ */
typedef enum ipp_dstate_e /**** Document states ****/ typedef enum ipp_dstate_e /**** Document states @exclude all@ ****/
{ {
IPP_DOCUMENT_PENDING = 3, /* Document is pending */ IPP_DOCUMENT_PENDING = 3, /* Document is pending */
IPP_DOCUMENT_PROCESSING = 5, /* Document is processing */ IPP_DOCUMENT_PROCESSING = 5, /* Document is processing */
@ -94,10 +94,10 @@ typedef enum ipp_dstate_e /**** Document states ****/
# endif /* !_CUPS_NO_DEPRECATED */ # endif /* !_CUPS_NO_DEPRECATED */
} ipp_dstate_t; } ipp_dstate_t;
typedef enum ipp_finishings_e /**** Finishings ****/ typedef enum ipp_finishings_e /**** Finishings values ****/
{ {
IPP_FINISHINGS_NONE = 3, /* No finishing */ IPP_FINISHINGS_NONE = 3, /* No finishing */
IPP_FINISHINGS_STAPLE, /* Staple (any location) */ IPP_FINISHINGS_STAPLE, /* Staple (any location/method) */
IPP_FINISHINGS_PUNCH, /* Punch (any location/count) */ IPP_FINISHINGS_PUNCH, /* Punch (any location/count) */
IPP_FINISHINGS_COVER, /* Add cover */ IPP_FINISHINGS_COVER, /* Add cover */
IPP_FINISHINGS_BIND, /* Bind */ IPP_FINISHINGS_BIND, /* Bind */
@ -150,6 +150,10 @@ typedef enum ipp_finishings_e /**** Finishings ****/
IPP_FINISHINGS_PUNCH_QUAD_TOP, /* Punch 4 holes top edge */ IPP_FINISHINGS_PUNCH_QUAD_TOP, /* Punch 4 holes top edge */
IPP_FINISHINGS_PUNCH_QUAD_RIGHT, /* Punch 4 holes right side */ IPP_FINISHINGS_PUNCH_QUAD_RIGHT, /* Punch 4 holes right side */
IPP_FINISHINGS_PUNCH_QUAD_BOTTOM, /* Punch 4 holes bottom edge */ IPP_FINISHINGS_PUNCH_QUAD_BOTTOM, /* Punch 4 holes bottom edge */
IPP_FINISHINGS_PUNCH_MULTIPLE_LEFT, /* Pucnh multiple holes left side */
IPP_FINISHINGS_PUNCH_MULTIPLE_TOP, /* Pucnh multiple holes top edge */
IPP_FINISHINGS_PUNCH_MULTIPLE_RIGHT, /* Pucnh multiple holes right side */
IPP_FINISHINGS_PUNCH_MULTIPLE_BOTTOM, /* Pucnh multiple holes bottom edge */
IPP_FINISHINGS_FOLD_ACCORDIAN = 90, /* Accordian-fold the paper vertically into four sections */ IPP_FINISHINGS_FOLD_ACCORDIAN = 90, /* Accordian-fold the paper vertically into four sections */
IPP_FINISHINGS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */ IPP_FINISHINGS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */
IPP_FINISHINGS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline */ IPP_FINISHINGS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline */
@ -161,41 +165,42 @@ typedef enum ipp_finishings_e /**** Finishings ****/
IPP_FINISHINGS_FOLD_POSTER, /* Fold the paper in half horizontally and vertically; sometimes also called a cross fold */ IPP_FINISHINGS_FOLD_POSTER, /* Fold the paper in half horizontally and vertically; sometimes also called a cross fold */
IPP_FINISHINGS_FOLD_RIGHT_GATE, /* Fold the bottom quarter of the paper towards the midline */ IPP_FINISHINGS_FOLD_RIGHT_GATE, /* Fold the bottom quarter of the paper towards the midline */
IPP_FINISHINGS_FOLD_Z, /* Fold the paper vertically into three sections, forming a Z */ IPP_FINISHINGS_FOLD_Z, /* Fold the paper vertically into three sections, forming a Z */
IPP_FINISHINGS_FOLD_ENGINEERING_Z, /* Fold the paper vertically into two small sections and one larger, forming an elongated Z */
/* CUPS extensions for finishings (pre-standard versions of values above) */ /* CUPS extensions for finishings (pre-standard versions of values above) */
IPP_FINISHINGS_CUPS_PUNCH_TOP_LEFT = 0x40000046, IPP_FINISHINGS_CUPS_PUNCH_TOP_LEFT = 0x40000046,
/* Punch 1 hole top left */ /* Punch 1 hole top left @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_LEFT,/* Punch 1 hole bottom left */ IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_LEFT,/* Punch 1 hole bottom left @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_TOP_RIGHT, /* Punch 1 hole top right */ IPP_FINISHINGS_CUPS_PUNCH_TOP_RIGHT, /* Punch 1 hole top right @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_RIGHT, IPP_FINISHINGS_CUPS_PUNCH_BOTTOM_RIGHT,
/* Punch 1 hole bottom right */ /* Punch 1 hole bottom right @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_DUAL_LEFT, /* Punch 2 holes left side */ IPP_FINISHINGS_CUPS_PUNCH_DUAL_LEFT, /* Punch 2 holes left side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_DUAL_TOP, /* Punch 2 holes top edge */ IPP_FINISHINGS_CUPS_PUNCH_DUAL_TOP, /* Punch 2 holes top edge @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_DUAL_RIGHT, /* Punch 2 holes right side */ IPP_FINISHINGS_CUPS_PUNCH_DUAL_RIGHT, /* Punch 2 holes right side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_DUAL_BOTTOM,/* Punch 2 holes bottom edge */ IPP_FINISHINGS_CUPS_PUNCH_DUAL_BOTTOM,/* Punch 2 holes bottom edge @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_LEFT,/* Punch 3 holes left side */ IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_LEFT,/* Punch 3 holes left side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_TOP, /* Punch 3 holes top edge */ IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_TOP, /* Punch 3 holes top edge @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_RIGHT, IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_RIGHT,
/* Punch 3 holes right side */ /* Punch 3 holes right side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_BOTTOM, IPP_FINISHINGS_CUPS_PUNCH_TRIPLE_BOTTOM,
/* Punch 3 holes bottom edge */ /* Punch 3 holes bottom edge @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_QUAD_LEFT, /* Punch 4 holes left side */ IPP_FINISHINGS_CUPS_PUNCH_QUAD_LEFT, /* Punch 4 holes left side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_QUAD_TOP, /* Punch 4 holes top edge */ IPP_FINISHINGS_CUPS_PUNCH_QUAD_TOP, /* Punch 4 holes top edge @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_QUAD_RIGHT, /* Punch 4 holes right side */ IPP_FINISHINGS_CUPS_PUNCH_QUAD_RIGHT, /* Punch 4 holes right side @exclude all@ */
IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM,/* Punch 4 holes bottom edge */ IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM,/* Punch 4 holes bottom edge @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN = 0x4000005A, IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN = 0x4000005A,
/* Accordian-fold the paper vertically into four sections */ /* Accordian-fold the paper vertically into four sections @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */ IPP_FINISHINGS_CUPS_FOLD_DOUBLE_GATE, /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline */ IPP_FINISHINGS_CUPS_FOLD_GATE, /* Fold the top and bottom quarters of the paper towards the midline @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_HALF, /* Fold the paper in half vertically */ IPP_FINISHINGS_CUPS_FOLD_HALF, /* Fold the paper in half vertically @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_HALF_Z, /* Fold the paper in half horizontally, then Z-fold the paper vertically */ IPP_FINISHINGS_CUPS_FOLD_HALF_Z, /* Fold the paper in half horizontally, then Z-fold the paper vertically @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_LEFT_GATE, /* Fold the top quarter of the paper towards the midline */ IPP_FINISHINGS_CUPS_FOLD_LEFT_GATE, /* Fold the top quarter of the paper towards the midline @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_LETTER, /* Fold the paper into three sections vertically; sometimes also known as a C fold*/ IPP_FINISHINGS_CUPS_FOLD_LETTER, /* Fold the paper into three sections vertically; sometimes also known as a C fold @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_PARALLEL, /* Fold the paper in half vertically two times, yielding four sections */ IPP_FINISHINGS_CUPS_FOLD_PARALLEL, /* Fold the paper in half vertically two times, yielding four sections @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_POSTER, /* Fold the paper in half horizontally and vertically; sometimes also called a cross fold */ IPP_FINISHINGS_CUPS_FOLD_POSTER, /* Fold the paper in half horizontally and vertically; sometimes also called a cross fold @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_RIGHT_GATE, /* Fold the bottom quarter of the paper towards the midline */ IPP_FINISHINGS_CUPS_FOLD_RIGHT_GATE, /* Fold the bottom quarter of the paper towards the midline @exclude all@ */
IPP_FINISHINGS_CUPS_FOLD_Z /* Fold the paper vertically into three sections, forming a Z */ IPP_FINISHINGS_CUPS_FOLD_Z /* Fold the paper vertically into three sections, forming a Z @exclude all@ */
} ipp_finishings_t; } ipp_finishings_t;
# ifndef _CUPS_NO_DEPRECATED # ifndef _CUPS_NO_DEPRECATED
# define IPP_FINISHINGS_JOB_OFFSET IPP_FINISHINGS_JOG_OFFSET # define IPP_FINISHINGS_JOB_OFFSET IPP_FINISHINGS_JOG_OFFSET
@ -203,7 +208,7 @@ typedef enum ipp_finishings_e /**** Finishings ****/
typedef enum ipp_finishings_e ipp_finish_t; typedef enum ipp_finishings_e ipp_finish_t;
# endif /* !_CUPS_NO_DEPRECATED */ # endif /* !_CUPS_NO_DEPRECATED */
typedef enum ipp_jcollate_e /**** Job collation types ****/ typedef enum ipp_jcollate_e /**** Job collation types @deprecated@ @exclude all@ ****/
{ {
IPP_JCOLLATE_UNCOLLATED_SHEETS = 3, IPP_JCOLLATE_UNCOLLATED_SHEETS = 3,
IPP_JCOLLATE_COLLATED_DOCUMENTS, IPP_JCOLLATE_COLLATED_DOCUMENTS,
@ -243,98 +248,98 @@ typedef enum ipp_op_e /**** IPP operations ****/
{ {
IPP_OP_CUPS_INVALID = -1, /* Invalid operation name for @link ippOpValue@ */ IPP_OP_CUPS_INVALID = -1, /* Invalid operation name for @link ippOpValue@ */
IPP_OP_CUPS_NONE = 0, /* No operation @private@ */ IPP_OP_CUPS_NONE = 0, /* No operation @private@ */
IPP_OP_PRINT_JOB = 0x0002, /* Print a single file */ IPP_OP_PRINT_JOB = 0x0002, /* Print-Job: Print a single file */
IPP_OP_PRINT_URI, /* Print a single URL */ IPP_OP_PRINT_URI, /* Print-URI: Print a single URL @exclude all@ */
IPP_OP_VALIDATE_JOB, /* Validate job options */ IPP_OP_VALIDATE_JOB, /* Validate-Job: Validate job values prior to submission */
IPP_OP_CREATE_JOB, /* Create an empty print job */ IPP_OP_CREATE_JOB, /* Create-Job: Create an empty print job */
IPP_OP_SEND_DOCUMENT, /* Add a file to a job */ IPP_OP_SEND_DOCUMENT, /* Send-Document: Add a file to a job */
IPP_OP_SEND_URI, /* Add a URL to a job */ IPP_OP_SEND_URI, /* Send-URI: Add a URL to a job @exclude all@ */
IPP_OP_CANCEL_JOB, /* Cancel a job */ IPP_OP_CANCEL_JOB, /* Cancel-Job: Cancel a job */
IPP_OP_GET_JOB_ATTRIBUTES, /* Get job attributes */ IPP_OP_GET_JOB_ATTRIBUTES, /* Get-Job-Attribute: Get information about a job */
IPP_OP_GET_JOBS, /* Get a list of jobs */ IPP_OP_GET_JOBS, /* Get-Jobs: Get a list of jobs */
IPP_OP_GET_PRINTER_ATTRIBUTES, /* Get printer attributes */ IPP_OP_GET_PRINTER_ATTRIBUTES, /* Get-Printer-Attributes: Get information about a printer */
IPP_OP_HOLD_JOB, /* Hold a job for printing */ IPP_OP_HOLD_JOB, /* Hold-Job: Hold a job for printing */
IPP_OP_RELEASE_JOB, /* Release a job for printing */ IPP_OP_RELEASE_JOB, /* Release-Job: Release a job for printing */
IPP_OP_RESTART_JOB, /* Reprint a job */ IPP_OP_RESTART_JOB, /* Restart-Job: Reprint a job @deprecated@ */
IPP_OP_PAUSE_PRINTER = 0x0010, /* Stop a printer */ IPP_OP_PAUSE_PRINTER = 0x0010, /* Pause-Printer: Stop a printer */
IPP_OP_RESUME_PRINTER, /* Start a printer */ IPP_OP_RESUME_PRINTER, /* Resume-Printer: Start a printer */
IPP_OP_PURGE_JOBS, /* Cancel all jobs */ IPP_OP_PURGE_JOBS, /* Purge-Jobs: Delete all jobs @deprecated@ @exclude all@ */
IPP_OP_SET_PRINTER_ATTRIBUTES, /* Set printer attributes */ IPP_OP_SET_PRINTER_ATTRIBUTES, /* Set-Printer-Attributes: Set printer values */
IPP_OP_SET_JOB_ATTRIBUTES, /* Set job attributes */ IPP_OP_SET_JOB_ATTRIBUTES, /* Set-Job-Attributes: Set job values */
IPP_OP_GET_PRINTER_SUPPORTED_VALUES, /* Get supported attribute values */ IPP_OP_GET_PRINTER_SUPPORTED_VALUES, /* Get-Printer-Supported-Values: Get supported values */
IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create one or more printer subscriptions @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS, /* Create-Printer-Subscriptions: Create one or more printer subscriptions @since CUPS 1.2/macOS 10.5@ */
IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create one of more job subscriptions @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CREATE_JOB_SUBSCRIPTIONS, /* Create-Job-Subscriptions: Create one of more job subscriptions @since CUPS 1.2/macOS 10.5@ */
IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get subscription attributes @since CUPS 1.2/macOS 10.5@ */ IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES, /* Get-Subscription-Attributes: Get subscription information @since CUPS 1.2/macOS 10.5@ */
IPP_OP_GET_SUBSCRIPTIONS, /* Get list of subscriptions @since CUPS 1.2/macOS 10.5@ */ IPP_OP_GET_SUBSCRIPTIONS, /* Get-Subscriptions: Get list of subscriptions @since CUPS 1.2/macOS 10.5@ */
IPP_OP_RENEW_SUBSCRIPTION, /* Renew a printer subscription @since CUPS 1.2/macOS 10.5@ */ IPP_OP_RENEW_SUBSCRIPTION, /* Renew-Subscription: Renew a printer subscription @since CUPS 1.2/macOS 10.5@ */
IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel a subscription @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CANCEL_SUBSCRIPTION, /* Cancel-Subscription: Cancel a subscription @since CUPS 1.2/macOS 10.5@ */
IPP_OP_GET_NOTIFICATIONS, /* Get notification events @since CUPS 1.2/macOS 10.5@ */ IPP_OP_GET_NOTIFICATIONS, /* Get-Notifications: Get notification events @since CUPS 1.2/macOS 10.5@ */
IPP_OP_SEND_NOTIFICATIONS, /* Send notification events @private@ */ IPP_OP_SEND_NOTIFICATIONS, /* Send-Notifications: Send notification events @private@ */
IPP_OP_GET_RESOURCE_ATTRIBUTES, /* Get resource attributes @private@ */ IPP_OP_GET_RESOURCE_ATTRIBUTES, /* Get-Resource-Attributes: Get resource information @private@ */
IPP_OP_GET_RESOURCE_DATA, /* Get resource data @private@ */ IPP_OP_GET_RESOURCE_DATA, /* Get-Resource-Data: Get resource data @private@ @deprecated@ */
IPP_OP_GET_RESOURCES, /* Get list of resources @private@ */ IPP_OP_GET_RESOURCES, /* Get-Resources: Get list of resources @private@ */
IPP_OP_GET_PRINT_SUPPORT_FILES, /* Get printer support files @private@ */ IPP_OP_GET_PRINT_SUPPORT_FILES, /* Get-Printer-Support-Files: Get printer support files @private@ */
IPP_OP_ENABLE_PRINTER, /* Start a printer */ IPP_OP_ENABLE_PRINTER, /* Enable-Printer: Accept new jobs for a printer */
IPP_OP_DISABLE_PRINTER, /* Stop a printer */ IPP_OP_DISABLE_PRINTER, /* Disable-Printer: Reject new jobs for a printer */
IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB, IPP_OP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
/* Stop printer after the current job */ /* Pause-Printer-After-Current-Job: Stop printer after the current job */
IPP_OP_HOLD_NEW_JOBS, /* Hold new jobs */ IPP_OP_HOLD_NEW_JOBS, /* Hold-New-Jobs: Hold new jobs */
IPP_OP_RELEASE_HELD_NEW_JOBS, /* Release new jobs */ IPP_OP_RELEASE_HELD_NEW_JOBS, /* Release-Held-New-Jobs: Release new jobs that were previously held */
IPP_OP_DEACTIVATE_PRINTER, /* Stop a printer */ IPP_OP_DEACTIVATE_PRINTER, /* Deactivate-Printer: Stop a printer and do not accept jobs @deprecated@ @exclude all@ */
IPP_OP_ACTIVATE_PRINTER, /* Start a printer */ IPP_OP_ACTIVATE_PRINTER, /* Activate-Printer: Start a printer and accept jobs @deprecated@ @exclude all@ */
IPP_OP_RESTART_PRINTER, /* Restart a printer */ IPP_OP_RESTART_PRINTER, /* Restart-Printer: Restart a printer @exclude all@ */
IPP_OP_SHUTDOWN_PRINTER, /* Turn a printer off */ IPP_OP_SHUTDOWN_PRINTER, /* Shutdown-Printer: Turn a printer off @exclude all@ */
IPP_OP_STARTUP_PRINTER, /* Turn a printer on */ IPP_OP_STARTUP_PRINTER, /* Startup-Printer: Turn a printer on @exclude all@ */
IPP_OP_REPROCESS_JOB, /* Reprint a job */ IPP_OP_REPROCESS_JOB, /* Reprocess-Job: Reprint a job @deprecated@ @exclude all@*/
IPP_OP_CANCEL_CURRENT_JOB, /* Cancel the current job */ IPP_OP_CANCEL_CURRENT_JOB, /* Cancel-Current-Job: Cancel the current job */
IPP_OP_SUSPEND_CURRENT_JOB, /* Suspend the current job */ IPP_OP_SUSPEND_CURRENT_JOB, /* Suspend-Current-Job: Suspend the current job */
IPP_OP_RESUME_JOB, /* Resume the current job */ IPP_OP_RESUME_JOB, /* Resume-Job: Resume the current job */
IPP_OP_PROMOTE_JOB, /* Promote a job to print sooner */ IPP_OP_PROMOTE_JOB, /* Promote-Job: Promote a job to print sooner */
IPP_OP_SCHEDULE_JOB_AFTER, /* Schedule a job to print after another */ IPP_OP_SCHEDULE_JOB_AFTER, /* Schedule-Job-After: Schedule a job to print after another */
IPP_OP_CANCEL_DOCUMENT = 0x0033, /* Cancel-Document */ IPP_OP_CANCEL_DOCUMENT = 0x0033, /* Cancel-Document: Cancel a document @exclude all@ */
IPP_OP_GET_DOCUMENT_ATTRIBUTES, /* Get-Document-Attributes */ IPP_OP_GET_DOCUMENT_ATTRIBUTES, /* Get-Document-Attributes: Get document information @exclude all@ */
IPP_OP_GET_DOCUMENTS, /* Get-Documents */ IPP_OP_GET_DOCUMENTS, /* Get-Documents: Get a list of documents in a job @exclude all@ */
IPP_OP_DELETE_DOCUMENT, /* Delete-Document */ IPP_OP_DELETE_DOCUMENT, /* Delete-Document: Delete a document @deprecated@ @exclude all@ */
IPP_OP_SET_DOCUMENT_ATTRIBUTES, /* Set-Document-Attributes */ IPP_OP_SET_DOCUMENT_ATTRIBUTES, /* Set-Document-Attributes: Set document values @exclude all@ */
IPP_OP_CANCEL_JOBS, /* Cancel-Jobs */ IPP_OP_CANCEL_JOBS, /* Cancel-Jobs: Cancel all jobs (administrative) */
IPP_OP_CANCEL_MY_JOBS, /* Cancel-My-Jobs */ IPP_OP_CANCEL_MY_JOBS, /* Cancel-My-Jobs: Cancel a user's jobs */
IPP_OP_RESUBMIT_JOB, /* Resubmit-Job */ IPP_OP_RESUBMIT_JOB, /* Resubmit-Job: Copy and reprint a job @exclude all@ */
IPP_OP_CLOSE_JOB, /* Close-Job */ IPP_OP_CLOSE_JOB, /* Close-Job: Close a job and start printing */
IPP_OP_IDENTIFY_PRINTER, /* Identify-Printer */ IPP_OP_IDENTIFY_PRINTER, /* Identify-Printer: Make the printer beep, flash, or display a message for identification */
IPP_OP_VALIDATE_DOCUMENT, /* Validate-Document */ IPP_OP_VALIDATE_DOCUMENT, /* Validate-Document: Validate document values prior to submission @exclude all@ */
IPP_OP_ADD_DOCUMENT_IMAGES, /* Add-Document-Images */ IPP_OP_ADD_DOCUMENT_IMAGES, /* Add-Document-Images: Add image(s) from the specified scanner source @exclude all@ */
IPP_OP_ACKNOWLEDGE_DOCUMENT, /* Acknowledge-Document */ IPP_OP_ACKNOWLEDGE_DOCUMENT, /* Acknowledge-Document: Acknowledge processing of a document @exclude all@ */
IPP_OP_ACKNOWLEDGE_IDENTIFY_PRINTER, /* Acknowledge-Identify-Printer */ IPP_OP_ACKNOWLEDGE_IDENTIFY_PRINTER, /* Acknowledge-Identify-Printer: Acknowledge action on an Identify-Printer request @exclude all@ */
IPP_OP_ACKNOWLEDGE_JOB, /* Acknowledge-Job */ IPP_OP_ACKNOWLEDGE_JOB, /* Acknowledge-Job: Acknowledge processing of a job @exclude all@ */
IPP_OP_FETCH_DOCUMENT, /* Fetch-Document */ IPP_OP_FETCH_DOCUMENT, /* Fetch-Document: Fetch a document for processing @exclude all@ */
IPP_OP_FETCH_JOB, /* Fetch-Job */ IPP_OP_FETCH_JOB, /* Fetch-Job: Fetch a job for processing @exclude all@ */
IPP_OP_GET_OUTPUT_DEVICE_ATTRIBUTES, /* Get-Output-Device-Attributes */ IPP_OP_GET_OUTPUT_DEVICE_ATTRIBUTES, /* Get-Output-Device-Attributes: Get printer information for a specific output device @exclude all@ */
IPP_OP_UPDATE_ACTIVE_JOBS, /* Update-Active-Jobs */ IPP_OP_UPDATE_ACTIVE_JOBS, /* Update-Active-Jobs: Update the list of active jobs that a proxy has processed @exclude all@ */
IPP_OP_DEREGISTER_OUTPUT_DEVICE, /* Deregister-Output-Device */ IPP_OP_DEREGISTER_OUTPUT_DEVICE, /* Deregister-Output-Device: Remove an output device @exclude all@ */
IPP_OP_UPDATE_DOCUMENT_STATUS, /* Update-Document-Status */ IPP_OP_UPDATE_DOCUMENT_STATUS, /* Update-Document-Status: Update document values @exclude all@ */
IPP_OP_UPDATE_JOB_STATUS, /* Update-Job-Status */ IPP_OP_UPDATE_JOB_STATUS, /* Update-Job-Status: Update job values @exclude all@ */
IPP_OP_UPDATE_OUTPUT_DEVICE_ATTRIBUTES, IPP_OP_UPDATE_OUTPUT_DEVICE_ATTRIBUTES,
/* Update-Output-Device-Attributes */ /* Update-Output-Device-Attributes: Update output device values @exclude all@ */
IPP_OP_GET_NEXT_DOCUMENT_DATA, /* Get-Next-Document-Data */ IPP_OP_GET_NEXT_DOCUMENT_DATA, /* Get-Next-Document-Data: Scan more document data @exclude all@ */
IPP_OP_PRIVATE = 0x4000, /* Reserved @private@ */ IPP_OP_PRIVATE = 0x4000, /* Reserved @private@ */
IPP_OP_CUPS_GET_DEFAULT, /* Get the default printer */ IPP_OP_CUPS_GET_DEFAULT, /* CUPS-Get-Default: Get the default printer */
IPP_OP_CUPS_GET_PRINTERS, /* Get a list of printers and/or classes */ IPP_OP_CUPS_GET_PRINTERS, /* CUPS-Get-Printers: Get a list of printers and/or classes */
IPP_OP_CUPS_ADD_MODIFY_PRINTER, /* Add or modify a printer */ IPP_OP_CUPS_ADD_MODIFY_PRINTER, /* CUPS-Add-Modify-Printer: Add or modify a printer */
IPP_OP_CUPS_DELETE_PRINTER, /* Delete a printer */ IPP_OP_CUPS_DELETE_PRINTER, /* CUPS-Delete-Printer: Delete a printer */
IPP_OP_CUPS_GET_CLASSES, /* Get a list of classes @deprecated@ */ IPP_OP_CUPS_GET_CLASSES, /* CUPS-Get-Classes: Get a list of classes @deprecated@ @exclude all@ */
IPP_OP_CUPS_ADD_MODIFY_CLASS, /* Add or modify a class */ IPP_OP_CUPS_ADD_MODIFY_CLASS, /* CUPS-Add-Modify-Class: Add or modify a class */
IPP_OP_CUPS_DELETE_CLASS, /* Delete a class */ IPP_OP_CUPS_DELETE_CLASS, /* CUPS-Delete-Class: Delete a class */
IPP_OP_CUPS_ACCEPT_JOBS, /* Accept new jobs on a printer */ IPP_OP_CUPS_ACCEPT_JOBS, /* CUPS-Accept-Jobs: Accept new jobs on a printer @exclude all@ */
IPP_OP_CUPS_REJECT_JOBS, /* Reject new jobs on a printer */ IPP_OP_CUPS_REJECT_JOBS, /* CUPS-Reject-Jobs: Reject new jobs on a printer @exclude all@ */
IPP_OP_CUPS_SET_DEFAULT, /* Set the default printer */ IPP_OP_CUPS_SET_DEFAULT, /* CUPS-Set-Default: Set the default printer */
IPP_OP_CUPS_GET_DEVICES, /* Get a list of supported devices @deprecated@ */ IPP_OP_CUPS_GET_DEVICES, /* CUPS-Get-Devices: Get a list of supported devices @deprecated@ */
IPP_OP_CUPS_GET_PPDS, /* Get a list of supported drivers @deprecated@ */ IPP_OP_CUPS_GET_PPDS, /* CUPS-Get-PPDs: Get a list of supported drivers @deprecated@ */
IPP_OP_CUPS_MOVE_JOB, /* Move a job to a different printer */ IPP_OP_CUPS_MOVE_JOB, /* CUPS-Move-Job: Move a job to a different printer */
IPP_OP_CUPS_AUTHENTICATE_JOB, /* Authenticate a job @since CUPS 1.2/macOS 10.5@ */ IPP_OP_CUPS_AUTHENTICATE_JOB, /* CUPS-Authenticate-Job: Authenticate a job @since CUPS 1.2/macOS 10.5@ */
IPP_OP_CUPS_GET_PPD, /* Get a PPD file @deprecated@ */ IPP_OP_CUPS_GET_PPD, /* CUPS-Get-PPD: Get a PPD file @deprecated@ */
IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* Get a document file @since CUPS 1.4/macOS 10.6@ */ IPP_OP_CUPS_GET_DOCUMENT = 0x4027, /* CUPS-Get-Document: Get a document file @since CUPS 1.4/macOS 10.6@ */
IPP_OP_CUPS_CREATE_LOCAL_PRINTER /* Create a local (temporary) printer @since CUPS 2.2 */ IPP_OP_CUPS_CREATE_LOCAL_PRINTER /* CUPS-Create-Local-Printer: Create a local (temporary) printer @since CUPS 2.2@ */
# ifndef _CUPS_NO_DEPRECATED # ifndef _CUPS_NO_DEPRECATED
# define IPP_PRINT_JOB IPP_OP_PRINT_JOB # define IPP_PRINT_JOB IPP_OP_PRINT_JOB
@ -359,7 +364,7 @@ typedef enum ipp_op_e /**** IPP operations ****/
# define IPP_CREATE_PRINTER_SUBSCRIPTION IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS # define IPP_CREATE_PRINTER_SUBSCRIPTION IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS
# define IPP_CREATE_JOB_SUBSCRIPTION IPP_OP_CREATE_JOB_SUBSCRIPTIONS # define IPP_CREATE_JOB_SUBSCRIPTION IPP_OP_CREATE_JOB_SUBSCRIPTIONS
# define IPP_OP_CREATE_PRINTER_SUBSCRIPTION IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS # define IPP_OP_CREATE_PRINTER_SUBSCRIPTION IPP_OP_CREATE_PRINTER_SUBSCRIPTIONS
# define IPP_OP_CREATE_JOB_SUBSCRIPTION IPP_OP_CREATE_JOB_SUBSCRIPTIONS # define IPP_OP_CREATE_JOB_SUBSCRIPTION IPP_OP_CREATE_JOB_SUBSCRIPTIONS
# define IPP_GET_SUBSCRIPTION_ATTRIBUTES IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES # define IPP_GET_SUBSCRIPTION_ATTRIBUTES IPP_OP_GET_SUBSCRIPTION_ATTRIBUTES
# define IPP_GET_SUBSCRIPTIONS IPP_OP_GET_SUBSCRIPTIONS # define IPP_GET_SUBSCRIPTIONS IPP_OP_GET_SUBSCRIPTIONS
# define IPP_RENEW_SUBSCRIPTION IPP_OP_RENEW_SUBSCRIPTION # define IPP_RENEW_SUBSCRIPTION IPP_OP_RENEW_SUBSCRIPTION
@ -437,7 +442,7 @@ typedef enum ipp_orient_e /**** Orientation values ****/
# endif /* !_CUPS_NO_DEPRECATED */ # endif /* !_CUPS_NO_DEPRECATED */
} ipp_orient_t; } ipp_orient_t;
typedef enum ipp_pstate_e /**** Printer states ****/ typedef enum ipp_pstate_e /**** Printer state values ****/
{ {
IPP_PSTATE_IDLE = 3, /* Printer is idle */ IPP_PSTATE_IDLE = 3, /* Printer is idle */
IPP_PSTATE_PROCESSING, /* Printer is working */ IPP_PSTATE_PROCESSING, /* Printer is working */
@ -450,7 +455,7 @@ typedef enum ipp_pstate_e /**** Printer states ****/
# endif /* _CUPS_NO_DEPRECATED */ # endif /* _CUPS_NO_DEPRECATED */
} ipp_pstate_t; } ipp_pstate_t;
typedef enum ipp_quality_e /**** Qualities ****/ typedef enum ipp_quality_e /**** Print quality values ****/
{ {
IPP_QUALITY_DRAFT = 3, /* Draft quality */ IPP_QUALITY_DRAFT = 3, /* Draft quality */
IPP_QUALITY_NORMAL, /* Normal quality */ IPP_QUALITY_NORMAL, /* Normal quality */
@ -463,7 +468,7 @@ typedef enum ipp_res_e /**** Resolution units ****/
IPP_RES_PER_CM /* Pixels per centimeter */ IPP_RES_PER_CM /* Pixels per centimeter */
} ipp_res_t; } ipp_res_t;
typedef enum ipp_state_e /**** IPP states ****/ typedef enum ipp_state_e /**** ipp_t state values ****/
{ {
IPP_STATE_ERROR = -1, /* An error occurred */ IPP_STATE_ERROR = -1, /* An error occurred */
IPP_STATE_IDLE, /* Nothing is happening/request completed */ IPP_STATE_IDLE, /* Nothing is happening/request completed */
@ -480,7 +485,7 @@ typedef enum ipp_state_e /**** IPP states ****/
# endif /* !_CUPS_NO_DEPRECATED */ # endif /* !_CUPS_NO_DEPRECATED */
} ipp_state_t; } ipp_state_t;
typedef enum ipp_status_e /**** IPP status codes ****/ typedef enum ipp_status_e /**** IPP status code values ****/
{ {
IPP_STATUS_CUPS_INVALID = -1, /* Invalid status name for @link ippErrorValue@ */ IPP_STATUS_CUPS_INVALID = -1, /* Invalid status name for @link ippErrorValue@ */
IPP_STATUS_OK = 0x0000, /* successful-ok */ IPP_STATUS_OK = 0x0000, /* successful-ok */
@ -493,7 +498,7 @@ typedef enum ipp_status_e /**** IPP status codes ****/
IPP_STATUS_OK_EVENTS_COMPLETE, /* successful-ok-events-complete */ IPP_STATUS_OK_EVENTS_COMPLETE, /* successful-ok-events-complete */
IPP_STATUS_REDIRECTION_OTHER_SITE = 0x0200, IPP_STATUS_REDIRECTION_OTHER_SITE = 0x0200,
/* redirection-other-site @private@ */ /* redirection-other-site @private@ */
IPP_STATUS_CUPS_SEE_OTHER = 0x0280, /* cups-see-other */ IPP_STATUS_CUPS_SEE_OTHER = 0x0280, /* cups-see-other @private@ */
IPP_STATUS_ERROR_BAD_REQUEST = 0x0400,/* client-error-bad-request */ IPP_STATUS_ERROR_BAD_REQUEST = 0x0400,/* client-error-bad-request */
IPP_STATUS_ERROR_FORBIDDEN, /* client-error-forbidden */ IPP_STATUS_ERROR_FORBIDDEN, /* client-error-forbidden */
IPP_STATUS_ERROR_NOT_AUTHENTICATED, /* client-error-not-authenticated */ IPP_STATUS_ERROR_NOT_AUTHENTICATED, /* client-error-not-authenticated */
@ -569,7 +574,7 @@ typedef enum ipp_status_e /**** IPP status codes ****/
IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED = 0x1000, IPP_STATUS_ERROR_CUPS_AUTHENTICATION_CANCELED = 0x1000,
/* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/macOS 10.7@ */ /* cups-authentication-canceled - Authentication canceled by user @since CUPS 1.5/macOS 10.7@ */
IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */ IPP_STATUS_ERROR_CUPS_PKI, /* cups-pki-error - Error negotiating a secure connection @since CUPS 1.5/macOS 10.7@ */
IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED/* cups-upgrade-required - TLS upgrade required */ IPP_STATUS_ERROR_CUPS_UPGRADE_REQUIRED/* cups-upgrade-required - TLS upgrade required @since CUPS 1.5/macOS 10.7@ */
# ifndef _CUPS_NO_DEPRECATED # ifndef _CUPS_NO_DEPRECATED
# define IPP_OK IPP_STATUS_OK # define IPP_OK IPP_STATUS_OK
@ -631,7 +636,7 @@ typedef enum ipp_status_e /**** IPP status codes ****/
# endif /* _CUPS_NO_DEPRECATED */ # endif /* _CUPS_NO_DEPRECATED */
} ipp_status_t; } ipp_status_t;
typedef enum ipp_tag_e /**** Format tags for attributes ****/ typedef enum ipp_tag_e /**** Value and group tag values for attributes ****/
{ {
IPP_TAG_CUPS_INVALID = -1, /* Invalid tag name for @link ippTagValue@ */ IPP_TAG_CUPS_INVALID = -1, /* Invalid tag name for @link ippTagValue@ */
IPP_TAG_ZERO = 0x00, /* Zero tag - used for separators */ IPP_TAG_ZERO = 0x00, /* Zero tag - used for separators */
@ -643,7 +648,7 @@ typedef enum ipp_tag_e /**** Format tags for attributes ****/
IPP_TAG_SUBSCRIPTION, /* Subscription group */ IPP_TAG_SUBSCRIPTION, /* Subscription group */
IPP_TAG_EVENT_NOTIFICATION, /* Event group */ IPP_TAG_EVENT_NOTIFICATION, /* Event group */
IPP_TAG_RESOURCE, /* Resource group @private@ */ IPP_TAG_RESOURCE, /* Resource group @private@ */
IPP_TAG_DOCUMENT, /* Document group */ IPP_TAG_DOCUMENT, /* Document group @exclude all@ */
IPP_TAG_UNSUPPORTED_VALUE = 0x10, /* Unsupported value */ IPP_TAG_UNSUPPORTED_VALUE = 0x10, /* Unsupported value */
IPP_TAG_DEFAULT, /* Default value */ IPP_TAG_DEFAULT, /* Default value */
IPP_TAG_UNKNOWN, /* Unknown value */ IPP_TAG_UNKNOWN, /* Unknown value */
@ -658,10 +663,10 @@ typedef enum ipp_tag_e /**** Format tags for attributes ****/
IPP_TAG_DATE, /* Date/time value */ IPP_TAG_DATE, /* Date/time value */
IPP_TAG_RESOLUTION, /* Resolution value */ IPP_TAG_RESOLUTION, /* Resolution value */
IPP_TAG_RANGE, /* Range value */ IPP_TAG_RANGE, /* Range value */
IPP_TAG_BEGIN_COLLECTION, /* Beginning of collection value */ IPP_TAG_BEGIN_COLLECTION, /* Beginning of collection value @exclude all@ */
IPP_TAG_TEXTLANG, /* Text-with-language value */ IPP_TAG_TEXTLANG, /* Text-with-language value */
IPP_TAG_NAMELANG, /* Name-with-language value */ IPP_TAG_NAMELANG, /* Name-with-language value */
IPP_TAG_END_COLLECTION, /* End of collection value */ IPP_TAG_END_COLLECTION, /* End of collection value @exclude all@ */
IPP_TAG_TEXT = 0x41, /* Text value */ IPP_TAG_TEXT = 0x41, /* Text value */
IPP_TAG_NAME, /* Name value */ IPP_TAG_NAME, /* Name value */
IPP_TAG_RESERVED_STRING, /* Reserved for future string value @private@ */ IPP_TAG_RESERVED_STRING, /* Reserved for future string value @private@ */
@ -671,8 +676,8 @@ typedef enum ipp_tag_e /**** Format tags for attributes ****/
IPP_TAG_CHARSET, /* Character set value */ IPP_TAG_CHARSET, /* Character set value */
IPP_TAG_LANGUAGE, /* Language value */ IPP_TAG_LANGUAGE, /* Language value */
IPP_TAG_MIMETYPE, /* MIME media type value */ IPP_TAG_MIMETYPE, /* MIME media type value */
IPP_TAG_MEMBERNAME, /* Collection member name value */ IPP_TAG_MEMBERNAME, /* Collection member name value @exclude all@ */
IPP_TAG_EXTENSION = 0x7f, /* Extension point for 32-bit tags */ IPP_TAG_EXTENSION = 0x7f, /* Extension point for 32-bit tags @exclude all@ */
IPP_TAG_CUPS_MASK = 0x7fffffff, /* Mask for copied attribute values @private@ */ IPP_TAG_CUPS_MASK = 0x7fffffff, /* Mask for copied attribute values @private@ */
/* The following expression is used to avoid compiler warnings with +/-0x80000000 */ /* The following expression is used to avoid compiler warnings with +/-0x80000000 */
IPP_TAG_CUPS_CONST = -0x7fffffff-1 /* Bitflag for copied/const attribute values @private@ */ IPP_TAG_CUPS_CONST = -0x7fffffff-1 /* Bitflag for copied/const attribute values @private@ */
@ -683,17 +688,18 @@ typedef enum ipp_tag_e /**** Format tags for attributes ****/
# endif /* !_CUPS_NO_DEPRECATED */ # endif /* !_CUPS_NO_DEPRECATED */
} ipp_tag_t; } ipp_tag_t;
typedef unsigned char ipp_uchar_t; /**** Unsigned 8-bit integer/character ****/ typedef unsigned char ipp_uchar_t; /**** Unsigned 8-bit integer/character @exclude all@ ****/
typedef struct _ipp_s ipp_t; /**** IPP request/response data ****/ typedef struct _ipp_s ipp_t; /**** IPP request/response data ****/
typedef struct _ipp_attribute_s ipp_attribute_t; typedef struct _ipp_attribute_s ipp_attribute_t;
/**** IPP attribute ****/ /**** IPP attribute ****/
/**** New in CUPS 1.2/macOS 10.5 ****/ /**** New in CUPS 1.2/macOS 10.5 ****/
typedef ssize_t (*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes); typedef ssize_t (*ipp_iocb_t)(void *context, ipp_uchar_t *buffer, size_t bytes);
/**** IPP IO Callback Function @since CUPS 1.2/macOS 10.5@ ****/ /**** ippReadIO/ippWriteIO callback function @since CUPS 1.2/macOS 10.5@ ****/
/**** New in CUPS 1.6/macOS 10.8 ****/ /**** New in CUPS 1.6/macOS 10.8 ****/
typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr); typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr);
/**** ippCopyAttributes callback function @since CUPS 1.6/macOS 10.8 ****/
/* /*
@ -800,7 +806,7 @@ typedef union _ipp_value_u /**** Attribute Value ****/
} _ipp_value_t; } _ipp_value_t;
typedef _ipp_value_t ipp_value_t; /**** Convenience typedef that will be removed @private@ ****/ typedef _ipp_value_t ipp_value_t; /**** Convenience typedef that will be removed @private@ ****/
struct _ipp_attribute_s /**** Attribute ****/ struct _ipp_attribute_s /**** IPP attribute ****/
{ {
ipp_attribute_t *next; /* Next attribute in list */ ipp_attribute_t *next; /* Next attribute in list */
ipp_tag_t group_tag, /* Job/Printer/Operation group tag */ ipp_tag_t group_tag, /* Job/Printer/Operation group tag */

2
cups/langprintf.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

11
cups/language-private.h
View File

@ -1,14 +1,14 @@
/* /*
* Private localization support for CUPS. * Private localization support for CUPS.
* *
* Copyright 2007-2010 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products. * Copyright 1997-2006 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -22,6 +22,9 @@
# include <stdio.h> # include <stdio.h>
# include <cups/transcode.h> # include <cups/transcode.h>
# ifdef __APPLE__
# include <CoreFoundation/CoreFoundation.h>
# endif /* __APPLE__ */
# ifdef __cplusplus # ifdef __cplusplus
extern "C" { extern "C" {
@ -51,8 +54,8 @@ typedef struct _cups_message_s /**** Message catalog entry ****/
*/ */
# ifdef __APPLE__ # ifdef __APPLE__
extern const char *_cupsAppleLanguage(const char *locale, char *language, extern const char *_cupsAppleLanguage(const char *locale, char *language, size_t langsize);
size_t langsize); extern const char *_cupsAppleLocale(CFStringRef languageName, char *locale, size_t localesize);
# endif /* __APPLE__ */ # endif /* __APPLE__ */
extern void _cupsCharmapFlush(void); extern void _cupsCharmapFlush(void);
extern const char *_cupsEncodingName(cups_encoding_t encoding); extern const char *_cupsEncodingName(cups_encoding_t encoding);

132
cups/language.c
View File

@ -1,14 +1,14 @@
/* /*
* I18N/language support for CUPS. * I18N/language support for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -118,11 +118,13 @@ typedef struct
} _apple_language_locale_t; } _apple_language_locale_t;
static const _apple_language_locale_t apple_language_locale[] = static const _apple_language_locale_t apple_language_locale[] =
{ /* Locale to language ID LUT */ { /* Language to locale ID LUT */
{ "en", "en_US" }, { "en", "en_US" },
{ "nb", "no" }, { "nb", "no" },
{ "zh-Hans", "zh_CN" }, { "nb_NO", "no" },
{ "zh-Hant", "zh_TW" } { "zh-Hans", "zh_CN" },
{ "zh-Hant", "zh_TW" },
{ "zh-Hant_CN", "zh_TW" }
}; };
#endif /* __APPLE__ */ #endif /* __APPLE__ */
@ -239,6 +241,75 @@ _cupsAppleLanguage(const char *locale, /* I - Locale ID */
return (language); return (language);
} }
/*
* '_cupsAppleLocale()' - Get the locale associated with an Apple language ID.
*/
const char * /* O - Locale */
_cupsAppleLocale(CFStringRef languageName, /* I - Apple language ID */
char *locale, /* I - Buffer for locale */
size_t localesize) /* I - Size of buffer */
{
int i; /* Looping var */
CFStringRef localeName; /* Locale as a CF string */
localeName = CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, languageName);
if (localeName)
{
/*
* Copy the locale name and tweak as needed...
*/
if (!CFStringGetCString(localeName, locale, (CFIndex)localesize, kCFStringEncodingASCII))
*locale = '\0';
CFRelease(localeName);
/*
* Map new language identifiers to locales...
*/
for (i = 0;
i < (int)(sizeof(apple_language_locale) /
sizeof(apple_language_locale[0]));
i ++)
{
if (!strcmp(locale, apple_language_locale[i].language))
{
strlcpy(locale, apple_language_locale[i].locale, localesize);
break;
}
}
}
else
{
/*
* Just try the Apple language name...
*/
if (!CFStringGetCString(languageName, locale, (CFIndex)localesize, kCFStringEncodingASCII))
*locale = '\0';
}
if (!*locale)
return (NULL);
/*
* Convert language subtag into region subtag...
*/
if (locale[2] == '-')
locale[2] = '_';
if (!strchr(locale, '.'))
strlcat(locale, ".UTF-8", localesize);
return (locale);
}
#endif /* __APPLE__ */ #endif /* __APPLE__ */
@ -1134,13 +1205,11 @@ _cupsMessageNew(void *context) /* I - User data */
static const char * /* O - Locale string */ static const char * /* O - Locale string */
appleLangDefault(void) appleLangDefault(void)
{ {
int i; /* Looping var */
CFBundleRef bundle; /* Main bundle (if any) */ CFBundleRef bundle; /* Main bundle (if any) */
CFArrayRef bundleList; /* List of localizations in bundle */ CFArrayRef bundleList; /* List of localizations in bundle */
CFPropertyListRef localizationList = NULL; CFPropertyListRef localizationList = NULL;
/* List of localization data */ /* List of localization data */
CFStringRef languageName; /* Current name */ CFStringRef languageName; /* Current name */
CFStringRef localeName; /* Canonical from of name */
char *lang; /* LANG environment variable */ char *lang; /* LANG environment variable */
_cups_globals_t *cg = _cupsGlobals(); _cups_globals_t *cg = _cupsGlobals();
/* Pointer to library globals */ /* Pointer to library globals */
@ -1225,49 +1294,11 @@ appleLangDefault(void)
if (languageName && if (languageName &&
CFGetTypeID(languageName) == CFStringGetTypeID()) CFGetTypeID(languageName) == CFStringGetTypeID())
{ {
localeName = CFLocaleCreateCanonicalLocaleIdentifierFromString( if (_cupsAppleLocale(languageName, cg->language, sizeof(cg->language)))
kCFAllocatorDefault, languageName);
if (localeName)
{
CFStringGetCString(localeName, cg->language, sizeof(cg->language),
kCFStringEncodingASCII);
CFRelease(localeName);
DEBUG_printf(("3appleLangDefault: cg->language=\"%s\"", DEBUG_printf(("3appleLangDefault: cg->language=\"%s\"",
cg->language)); cg->language));
/*
* Map new language identifiers to locales...
*/
for (i = 0;
i < (int)(sizeof(apple_language_locale) /
sizeof(apple_language_locale[0]));
i ++)
{
if (!strcmp(cg->language, apple_language_locale[i].language))
{
DEBUG_printf(("3appleLangDefault: mapping \"%s\" to \"%s\"...",
cg->language, apple_language_locale[i].locale));
strlcpy(cg->language, apple_language_locale[i].locale,
sizeof(cg->language));
break;
}
}
/*
* Convert language subtag into region subtag...
*/
if (cg->language[2] == '-')
cg->language[2] = '_';
if (!strchr(cg->language, '.'))
strlcat(cg->language, ".UTF-8", sizeof(cg->language));
}
else else
DEBUG_puts("3appleLangDefault: Unable to get localeName."); DEBUG_puts("3appleLangDefault: Unable to get locale.");
} }
} }
@ -1371,10 +1402,11 @@ appleMessageLoad(const char *locale) /* I - Locale ID */
locale = "Japanese"; locale = "Japanese";
else if (!strncmp(locale, "es", 2)) else if (!strncmp(locale, "es", 2))
locale = "Spanish"; locale = "Spanish";
else if (!strcmp(locale, "zh_HK")) else if (!strcmp(locale, "zh_HK") || !strncmp(locale, "zh-Hant", 7))
{ {
/* /*
* <rdar://problem/22130168> * <rdar://problem/22130168>
* <rdar://problem/27245567>
* *
* Try zh_TW first, then zh... Sigh... * Try zh_TW first, then zh... Sigh...
*/ */

4
cups/language.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -32,7 +32,7 @@ extern "C" {
* Types... * Types...
*/ */
typedef enum cups_encoding_e /**** Language Encodings ****/ typedef enum cups_encoding_e /**** Language Encodings @exclude all@ ****/
{ {
CUPS_AUTO_ENCODING = -1, /* Auto-detect the encoding @private@ */ CUPS_AUTO_ENCODING = -1, /* Auto-detect the encoding @private@ */
CUPS_US_ASCII, /* US ASCII */ CUPS_US_ASCII, /* US ASCII */

2
cups/libcups2.def
View File

@ -118,8 +118,6 @@ _ppdNormalizeMakeAndModel
_ppdOpen _ppdOpen
_ppdOpenFile _ppdOpenFile
_ppdParseOptions _ppdParseOptions
_pwgGenerateSize
_pwgInitSize
_pwgInputSlotForSource _pwgInputSlotForSource
_pwgMediaNearSize _pwgMediaNearSize
_pwgMediaTable _pwgMediaTable

2
cups/md5passwd.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/notify.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

61
cups/options.c
View File

@ -1,14 +1,14 @@
/* /*
* Option routines for CUPS. * Option routines for CUPS.
* *
* Copyright 2007-2014 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products. * Copyright 1997-2007 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -29,6 +29,31 @@ static int cups_find_option(const char *name, int num_options,
cups_option_t *option, int prev, int *rdiff); cups_option_t *option, int prev, int *rdiff);
/*
* 'cupsAddIntegerOption()' - Add an integer option to an option array.
*
* New option arrays can be initialized simply by passing 0 for the
* "num_options" parameter.
*
* @since CUPS 2.2.4/macOS 10.13@
*/
int /* O - Number of options */
cupsAddIntegerOption(
const char *name, /* I - Name of option */
int value, /* I - Value of option */
int num_options, /* I - Number of options */
cups_option_t **options) /* IO - Pointer to options */
{
char strvalue[32]; /* String value */
snprintf(strvalue, sizeof(strvalue), "%d", value);
return (cupsAddOption(name, strvalue, num_options, options));
}
/* /*
* 'cupsAddOption()' - Add an option to an option array. * 'cupsAddOption()' - Add an option to an option array.
* *
@ -154,6 +179,38 @@ cupsFreeOptions(
} }
/*
* 'cupsGetIntegerOption()' - Get an integer option value.
*
* INT_MIN is returned when the option does not exist, is not an integer, or
* exceeds the range of values for the "int" type.
*
* @since CUPS 2.2.4/macOS 10.13@
*/
int /* O - Option value or @code INT_MIN@ */
cupsGetIntegerOption(
const char *name, /* I - Name of option */
int num_options, /* I - Number of options */
cups_option_t *options) /* I - Options */
{
const char *value = cupsGetOption(name, num_options, options);
/* String value of option */
char *ptr; /* Pointer into string value */
long intvalue; /* Integer value */
if (!value || !*value)
return (INT_MIN);
intvalue = strtol(value, &ptr, 10);
if (intvalue < INT_MIN || intvalue > INT_MAX || *ptr)
return (INT_MIN);
return ((int)intvalue);
}
/* /*
* 'cupsGetOption()' - Get an option value. * 'cupsGetOption()' - Get an option value.
*/ */

2
cups/ppd-attr.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
*/ */
/* /*

912
cups/ppd-cache.c
View File

File diff suppressed because it is too large Load Diff

2
cups/ppd-conflicts.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

2
cups/ppd-custom.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

2
cups/ppd-emit.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

6
cups/ppd-localize.c
View File

@ -1,14 +1,14 @@
/* /*
* PPD localization routines for CUPS. * PPD localization routines for CUPS.
* *
* Copyright 2007-2016 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *
@ -665,7 +665,7 @@ _ppdLocalizedAttr(ppd_file_t *ppd, /* I - PPD file */
/* /*
* <rdar://problem/22130168> * <rdar://problem/22130168>
* *
* Hong Kong locale needs special handling... Sigh... * Multiple locales need special handling... Sigh...
*/ */
if (!strcmp(ll_CC, "zh_HK")) if (!strcmp(ll_CC, "zh_HK"))

2
cups/ppd-mark.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

2
cups/ppd-page.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

21
cups/ppd-private.h
View File

@ -1,14 +1,14 @@
/* /*
* Private PPD definitions for CUPS. * Private PPD definitions for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *
@ -47,7 +47,7 @@ extern "C" {
* Constants... * Constants...
*/ */
# define _PPD_CACHE_VERSION 7 /* Version number in cache file */ # define _PPD_CACHE_VERSION 8 /* Version number in cache file */
/* /*
@ -100,7 +100,7 @@ typedef enum _pwg_print_color_mode_e /**** PWG print-color-mode indices ****/
{ {
_PWG_PRINT_COLOR_MODE_MONOCHROME = 0, /* print-color-mode=monochrome */ _PWG_PRINT_COLOR_MODE_MONOCHROME = 0, /* print-color-mode=monochrome */
_PWG_PRINT_COLOR_MODE_COLOR, /* print-color-mode=color */ _PWG_PRINT_COLOR_MODE_COLOR, /* print-color-mode=color */
/* Other proposed values are not supported by CUPS yet. */ /* Other values are not supported by CUPS yet. */
_PWG_PRINT_COLOR_MODE_MAX _PWG_PRINT_COLOR_MODE_MAX
} _pwg_print_color_mode_t; } _pwg_print_color_mode_t;
@ -119,14 +119,6 @@ typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/
cups_option_t *options; /* Options to apply */ cups_option_t *options; /* Options to apply */
} _pwg_finishings_t; } _pwg_finishings_t;
typedef struct _pwg_material_s /**** PWG material mapping data ****/
{
char *key, /* material-key value */
*name; /* material-name value */
int num_props; /* Number of properties */
cups_option_t *props; /* Material properties */
} _pwg_material_t;
struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/
{ {
int num_bins; /* Number of output bins */ int num_bins; /* Number of output bins */
@ -166,11 +158,6 @@ struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/
cups_array_t *mandatory; /* cupsMandatory value */ cups_array_t *mandatory; /* cupsMandatory value */
char *charge_info_uri; /* cupsChargeInfoURI value */ char *charge_info_uri; /* cupsChargeInfoURI value */
cups_array_t *support_files; /* Support files - ICC profiles, etc. */ cups_array_t *support_files; /* Support files - ICC profiles, etc. */
char *cups_3d, /* cups3D value */
*cups_layer_order; /* cupsLayerOrder value */
int cups_accuracy[3]; /* cupsAccuracy value - x, y, and z in nanometers */
int cups_volume[3]; /* cupsVolume value - x, y, and z in millimeters */
cups_array_t *materials; /* cupsMaterial values */
}; };

2
cups/ppd-util.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

22
cups/ppd.c
View File

@ -1,14 +1,14 @@
/* /*
* PPD file routines for CUPS. * PPD file routines for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved. * Copyright 1997-2007 by Easy Software Products, all rights reserved.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *
@ -579,12 +579,28 @@ _ppdOpen(
/* /*
* <rdar://problem/22130168> * <rdar://problem/22130168>
* <rdar://problem/27245567>
* *
* Need to use a different base language for some locales... * Need to use a different base language for some locales...
*/ */
if (!strcmp(lang->language, "zh_HK")) if (!strcmp(lang->language, "zh_HK"))
strlcpy(ll, "zh_TW.", sizeof(ll)); { /* Traditional Chinese + variants */
strlcpy(ll_CC, "zh_TW.", sizeof(ll_CC));
strlcpy(ll, "zh_", sizeof(ll));
}
else if (!strncmp(lang->language, "zh", 2))
strlcpy(ll, "zh_", sizeof(ll)); /* Any Chinese variant */
else if (!strncmp(lang->language, "jp", 2))
{ /* Any Japanese variant */
strlcpy(ll_CC, "ja", sizeof(ll_CC));
strlcpy(ll, "jp", sizeof(ll));
}
else if (!strncmp(lang->language, "nb", 2) || !strncmp(lang->language, "no", 2))
{ /* Any Norwegian variant */
strlcpy(ll_CC, "nb", sizeof(ll_CC));
strlcpy(ll, "no", sizeof(ll));
}
else else
snprintf(ll, sizeof(ll), "%2.2s.", lang->language); snprintf(ll, sizeof(ll), "%2.2s.", lang->language);

2
cups/ppd.h
View File

@ -12,7 +12,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* PostScript is a trademark of Adobe Systems, Inc. * PostScript is a trademark of Adobe Systems, Inc.
* *

141
cups/pwg-media.c
View File

@ -1,13 +1,13 @@
/* /*
* PWG media name API implementation for CUPS. * PWG media name API implementation for CUPS.
* *
* Copyright 2009-2016 by Apple Inc. * Copyright 2009-2017 by Apple Inc.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -37,8 +37,7 @@ static int pwg_compare_pwg(pwg_media_t *a, pwg_media_t *b);
static int pwg_compare_ppd(pwg_media_t *a, pwg_media_t *b); static int pwg_compare_ppd(pwg_media_t *a, pwg_media_t *b);
static char *pwg_format_inches(char *buf, size_t bufsize, int val); static char *pwg_format_inches(char *buf, size_t bufsize, int val);
static char *pwg_format_millimeters(char *buf, size_t bufsize, int val); static char *pwg_format_millimeters(char *buf, size_t bufsize, int val);
static int pwg_scan_measurement(const char *buf, char **bufptr, int numer, static int pwg_scan_measurement(const char *buf, char **bufptr, int numer, int denom);
int denom);
/* /*
@ -61,7 +60,7 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_IN("na_index-5x8_5x8in", NULL, "5x8", 5, 8), _PWG_MEDIA_IN("na_index-5x8_5x8in", NULL, "5x8", 5, 8),
_PWG_MEDIA_IN("na_number-14_5x11.5in", NULL, "Env14", 5, 11.5), _PWG_MEDIA_IN("na_number-14_5x11.5in", NULL, "Env14", 5, 11.5),
_PWG_MEDIA_IN("na_invoice_5.5x8.5in", "invoice", "Statement", 5.5, 8.5), _PWG_MEDIA_IN("na_invoice_5.5x8.5in", "invoice", "Statement", 5.5, 8.5),
_PWG_MEDIA_IN("na_index-4x6-ext_6x8in", NULL, NULL, 6, 8), _PWG_MEDIA_IN("na_index-4x6-ext_6x8in", NULL, "6x8", 6, 8),
_PWG_MEDIA_IN("na_6x9_6x9in", "na-6x9-envelope", "6x9", 6, 9), _PWG_MEDIA_IN("na_6x9_6x9in", "na-6x9-envelope", "6x9", 6, 9),
_PWG_MEDIA_IN("na_c5_6.5x9.5in", NULL, "6.5x9.5", 6.5, 9.5), _PWG_MEDIA_IN("na_c5_6.5x9.5in", NULL, "6.5x9.5", 6.5, 9.5),
_PWG_MEDIA_IN("na_7x9_7x9in", "na-7x9-envelope", "7x9", 7, 9), _PWG_MEDIA_IN("na_7x9_7x9in", "na-7x9-envelope", "7x9", 7, 9),
@ -86,7 +85,7 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_IN("na_10x15_10x15in", "na-10x15-envelope", "10x15", 10, 15), _PWG_MEDIA_IN("na_10x15_10x15in", "na-10x15-envelope", "10x15", 10, 15),
_PWG_MEDIA_IN("na_11x12_11x12in", NULL, "11x12", 11, 12), _PWG_MEDIA_IN("na_11x12_11x12in", NULL, "11x12", 11, 12),
_PWG_MEDIA_IN("na_edp_11x14in", NULL, "11x14", 11, 14), _PWG_MEDIA_IN("na_edp_11x14in", NULL, "11x14", 11, 14),
_PWG_MEDIA_IN("na_fanfold-us_11x14.875in", NULL, NULL, 11, 14.875), _PWG_MEDIA_IN("na_fanfold-us_11x14.875in", NULL, "11x14.875", 11, 14.875),
_PWG_MEDIA_IN("na_11x15_11x15in", NULL, "11x15", 11, 15), _PWG_MEDIA_IN("na_11x15_11x15in", NULL, "11x15", 11, 15),
_PWG_MEDIA_IN("na_ledger_11x17in", "tabloid", "Tabloid", 11, 17), _PWG_MEDIA_IN("na_ledger_11x17in", "tabloid", "Tabloid", 11, 17),
_PWG_MEDIA_IN("na_eur-edp_12x14in", NULL, NULL, 12, 14), _PWG_MEDIA_IN("na_eur-edp_12x14in", NULL, NULL, 12, 14),
@ -98,8 +97,8 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24), _PWG_MEDIA_IN("na_arch-c_18x24in", "arch-c", "ARCHC", 18, 24),
_PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34), _PWG_MEDIA_IN("na_d_22x34in", "d", "AnsiD", 22, 34),
_PWG_MEDIA_IN("na_arch-d_24x36in", "arch-d", "ARCHD", 24, 36), _PWG_MEDIA_IN("na_arch-d_24x36in", "arch-d", "ARCHD", 24, 36),
_PWG_MEDIA_IN("asme_f_28x40in", "f", NULL, 28, 40), _PWG_MEDIA_IN("asme_f_28x40in", "f", "28x40", 28, 40),
_PWG_MEDIA_IN("na_wide-format_30x42in", NULL, NULL, 30, 42), _PWG_MEDIA_IN("na_wide-format_30x42in", NULL, "30x42", 30, 42),
_PWG_MEDIA_IN("na_e_34x44in", "e", "AnsiE", 34, 44), _PWG_MEDIA_IN("na_e_34x44in", "e", "AnsiE", 34, 44),
_PWG_MEDIA_IN("na_arch-e_36x48in", "arch-e", "ARCHE", 36, 48), _PWG_MEDIA_IN("na_arch-e_36x48in", "arch-e", "ARCHE", 36, 48),
_PWG_MEDIA_IN("na_f_44x68in", NULL, "AnsiF", 44, 68), _PWG_MEDIA_IN("na_f_44x68in", NULL, "AnsiF", 44, 68),
@ -116,35 +115,35 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, "A4Tab", 225, 297), _PWG_MEDIA_MM("iso_a4-tab_225x297mm", NULL, "A4Tab", 225, 297),
_PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3), _PWG_MEDIA_MM("iso_a4-extra_235.5x322.3mm", NULL, "A4Extra", 235.5, 322.3),
_PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420), _PWG_MEDIA_MM("iso_a3_297x420mm", "iso-a3", "A3", 297, 420),
_PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", NULL, 297, 630), _PWG_MEDIA_MM("iso_a4x3_297x630mm", "iso-a4x3", "A4x3", 297, 630),
_PWG_MEDIA_MM("iso_a4x4_297x841mm", "iso-a4x4", NULL, 297, 841), _PWG_MEDIA_MM("iso_a4x4_297x841mm", "iso-a4x4", "A4x4", 297, 841),
_PWG_MEDIA_MM("iso_a4x5_297x1051mm", "iso-a4x5", NULL, 297, 1051), _PWG_MEDIA_MM("iso_a4x5_297x1051mm", "iso-a4x5", "A4x5", 297, 1051),
_PWG_MEDIA_MM("iso_a4x6_297x1261mm", "iso-a4x6", NULL, 297, 1261), _PWG_MEDIA_MM("iso_a4x6_297x1261mm", "iso-a4x6", "A4x6", 297, 1261),
_PWG_MEDIA_MM("iso_a4x7_297x1471mm", "iso-a4x7", NULL, 297, 1471), _PWG_MEDIA_MM("iso_a4x7_297x1471mm", "iso-a4x7", "A4x7", 297, 1471),
_PWG_MEDIA_MM("iso_a4x8_297x1682mm", "iso-a4x8", NULL, 297, 1682), _PWG_MEDIA_MM("iso_a4x8_297x1682mm", "iso-a4x8", "A4x8", 297, 1682),
_PWG_MEDIA_MM("iso_a4x9_297x1892mm", "iso-a4x9", NULL, 297, 1892), _PWG_MEDIA_MM("iso_a4x9_297x1892mm", "iso-a4x9", "A4x9", 297, 1892),
_PWG_MEDIA_MM("iso_a3-extra_322x445mm", "iso-a3-extra", "A3Extra", 322, 445), _PWG_MEDIA_MM("iso_a3-extra_322x445mm", "iso-a3-extra", "A3Extra", 322, 445),
_PWG_MEDIA_MM("iso_a2_420x594mm", "iso-a2", "A2", 420, 594), _PWG_MEDIA_MM("iso_a2_420x594mm", "iso-a2", "A2", 420, 594),
_PWG_MEDIA_MM("iso_a3x3_420x891mm", "iso-a3x3", NULL, 420, 891), _PWG_MEDIA_MM("iso_a3x3_420x891mm", "iso-a3x3", "A3x3", 420, 891),
_PWG_MEDIA_MM("iso_a3x4_420x1189mm", "iso-a3x4", NULL, 420, 1189), _PWG_MEDIA_MM("iso_a3x4_420x1189mm", "iso-a3x4", "A3x4", 420, 1189),
_PWG_MEDIA_MM("iso_a3x5_420x1486mm", "iso-a3x5", NULL, 420, 1486), _PWG_MEDIA_MM("iso_a3x5_420x1486mm", "iso-a3x5", "A3x6", 420, 1486),
_PWG_MEDIA_MM("iso_a3x6_420x1783mm", "iso-a3x6", NULL, 420, 1783), _PWG_MEDIA_MM("iso_a3x6_420x1783mm", "iso-a3x6", "A3x6", 420, 1783),
_PWG_MEDIA_MM("iso_a3x7_420x2080mm", "iso-a3x7", NULL, 420, 2080), _PWG_MEDIA_MM("iso_a3x7_420x2080mm", "iso-a3x7", "A3x7", 420, 2080),
_PWG_MEDIA_MM("iso_a1_594x841mm", "iso-a1", "A1", 594, 841), _PWG_MEDIA_MM("iso_a1_594x841mm", "iso-a1", "A1", 594, 841),
_PWG_MEDIA_MM("iso_a2x3_594x1261mm", "iso-a2x3", NULL, 594, 1261), _PWG_MEDIA_MM("iso_a2x3_594x1261mm", "iso-a2x3", "A2x3", 594, 1261),
_PWG_MEDIA_MM("iso_a2x4_594x1682mm", "iso-a2x4", NULL, 594, 1682), _PWG_MEDIA_MM("iso_a2x4_594x1682mm", "iso-a2x4", "A2x4", 594, 1682),
_PWG_MEDIA_MM("iso_a2x5_594x2102mm", "iso-a2x5", NULL, 594, 2102), _PWG_MEDIA_MM("iso_a2x5_594x2102mm", "iso-a2x5", "A2x5", 594, 2102),
_PWG_MEDIA_MM("iso_a0_841x1189mm", "iso-a0", "A0", 841, 1189), _PWG_MEDIA_MM("iso_a0_841x1189mm", "iso-a0", "A0", 841, 1189),
_PWG_MEDIA_MM("iso_a1x3_841x1783mm", "iso-a1x3", NULL, 841, 1783), _PWG_MEDIA_MM("iso_a1x3_841x1783mm", "iso-a1x3", "A1x3", 841, 1783),
_PWG_MEDIA_MM("iso_a1x4_841x2378mm", "iso-a1x4", NULL, 841, 2378), _PWG_MEDIA_MM("iso_a1x4_841x2378mm", "iso-a1x4", "A1x4", 841, 2378),
_PWG_MEDIA_MM("iso_2a0_1189x1682mm", NULL, NULL, 1189, 1682), _PWG_MEDIA_MM("iso_2a0_1189x1682mm", NULL, "1189x1682mm", 1189, 1682),
_PWG_MEDIA_MM("iso_a0x3_1189x2523mm", NULL, NULL, 1189, 2523), _PWG_MEDIA_MM("iso_a0x3_1189x2523mm", NULL, "A0x3", 1189, 2523),
_PWG_MEDIA_MM("iso_b10_31x44mm", "iso-b10", "ISOB10", 31, 44), _PWG_MEDIA_MM("iso_b10_31x44mm", "iso-b10", "ISOB10", 31, 44),
_PWG_MEDIA_MM("iso_b9_44x62mm", "iso-b9", "ISOB9", 44, 62), _PWG_MEDIA_MM("iso_b9_44x62mm", "iso-b9", "ISOB9", 44, 62),
_PWG_MEDIA_MM("iso_b8_62x88mm", "iso-b8", "ISOB8", 62, 88), _PWG_MEDIA_MM("iso_b8_62x88mm", "iso-b8", "ISOB8", 62, 88),
_PWG_MEDIA_MM("iso_b7_88x125mm", "iso-b7", "ISOB7", 88, 125), _PWG_MEDIA_MM("iso_b7_88x125mm", "iso-b7", "ISOB7", 88, 125),
_PWG_MEDIA_MM("iso_b6_125x176mm", "iso-b6", "ISOB6", 125, 176), _PWG_MEDIA_MM("iso_b6_125x176mm", "iso-b6", "ISOB6", 125, 176),
_PWG_MEDIA_MM("iso_b6c4_125x324mm", NULL, NULL, 125, 324), _PWG_MEDIA_MM("iso_b6c4_125x324mm", NULL, "125x324mm", 125, 324),
_PWG_MEDIA_MM("iso_b5_176x250mm", "iso-b5", "ISOB5", 176, 250), _PWG_MEDIA_MM("iso_b5_176x250mm", "iso-b5", "ISOB5", 176, 250),
_PWG_MEDIA_MM("iso_b5-extra_201x276mm", NULL, "ISOB5Extra", 201, 276), _PWG_MEDIA_MM("iso_b5-extra_201x276mm", NULL, "ISOB5Extra", 201, 276),
_PWG_MEDIA_MM("iso_b4_250x353mm", "iso-b4", "ISOB4", 250, 353), _PWG_MEDIA_MM("iso_b4_250x353mm", "iso-b4", "ISOB4", 250, 353),
@ -152,11 +151,11 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("iso_b2_500x707mm", "iso-b2", "ISOB2", 500, 707), _PWG_MEDIA_MM("iso_b2_500x707mm", "iso-b2", "ISOB2", 500, 707),
_PWG_MEDIA_MM("iso_b1_707x1000mm", "iso-b1", "ISOB1", 707, 1000), _PWG_MEDIA_MM("iso_b1_707x1000mm", "iso-b1", "ISOB1", 707, 1000),
_PWG_MEDIA_MM("iso_b0_1000x1414mm", "iso-b0", "ISOB0", 1000, 1414), _PWG_MEDIA_MM("iso_b0_1000x1414mm", "iso-b0", "ISOB0", 1000, 1414),
_PWG_MEDIA_MM("iso_c10_28x40mm", "iso-c10", NULL, 28, 40), _PWG_MEDIA_MM("iso_c10_28x40mm", "iso-c10", "EnvC10", 28, 40),
_PWG_MEDIA_MM("iso_c9_40x57mm", "iso-c9", NULL, 40, 57), _PWG_MEDIA_MM("iso_c9_40x57mm", "iso-c9", "EnvC9", 40, 57),
_PWG_MEDIA_MM("iso_c8_57x81mm", "iso-c8", NULL, 57, 81), _PWG_MEDIA_MM("iso_c8_57x81mm", "iso-c8", "EnvC8", 57, 81),
_PWG_MEDIA_MM("iso_c7_81x114mm", "iso-c7", "EnvC7", 81, 114), _PWG_MEDIA_MM("iso_c7_81x114mm", "iso-c7", "EnvC7", 81, 114),
_PWG_MEDIA_MM("iso_c7c6_81x162mm", NULL, NULL, 81, 162), _PWG_MEDIA_MM("iso_c7c6_81x162mm", NULL, "EnvC76", 81, 162),
_PWG_MEDIA_MM("iso_c6_114x162mm", "iso-c6", "EnvC6", 114, 162), _PWG_MEDIA_MM("iso_c6_114x162mm", "iso-c6", "EnvC6", 114, 162),
_PWG_MEDIA_MM("iso_c6c5_114x229mm", NULL, "EnvC65", 114, 229), _PWG_MEDIA_MM("iso_c6c5_114x229mm", NULL, "EnvC65", 114, 229),
_PWG_MEDIA_MM("iso_c5_162x229mm", "iso-c5", "EnvC5", 162, 229), _PWG_MEDIA_MM("iso_c5_162x229mm", "iso-c5", "EnvC5", 162, 229),
@ -166,16 +165,16 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("iso_c1_648x917mm", "iso-c1", "EnvC1", 648, 917), _PWG_MEDIA_MM("iso_c1_648x917mm", "iso-c1", "EnvC1", 648, 917),
_PWG_MEDIA_MM("iso_c0_917x1297mm", "iso-c0", "EnvC0", 917, 1297), _PWG_MEDIA_MM("iso_c0_917x1297mm", "iso-c0", "EnvC0", 917, 1297),
_PWG_MEDIA_MM("iso_dl_110x220mm", "iso-designated", "EnvDL", 110, 220), _PWG_MEDIA_MM("iso_dl_110x220mm", "iso-designated", "EnvDL", 110, 220),
_PWG_MEDIA_MM("iso_ra4_215x305mm", "iso-ra4", NULL, 215, 305), _PWG_MEDIA_MM("iso_ra4_215x305mm", "iso-ra4", "RA4", 215, 305),
_PWG_MEDIA_MM("iso_sra4_225x320mm", "iso-sra4", NULL, 225, 320), _PWG_MEDIA_MM("iso_sra4_225x320mm", "iso-sra4", "SRA4", 225, 320),
_PWG_MEDIA_MM("iso_ra3_305x430mm", "iso-ra3", NULL, 305, 430), _PWG_MEDIA_MM("iso_ra3_305x430mm", "iso-ra3", "RA3", 305, 430),
_PWG_MEDIA_MM("iso_sra3_320x450mm", "iso-sra3", NULL, 320, 450), _PWG_MEDIA_MM("iso_sra3_320x450mm", "iso-sra3", "SRA3", 320, 450),
_PWG_MEDIA_MM("iso_ra2_430x610mm", "iso-ra2", NULL, 430, 610), _PWG_MEDIA_MM("iso_ra2_430x610mm", "iso-ra2", "RA2", 430, 610),
_PWG_MEDIA_MM("iso_sra2_450x640mm", "iso-sra2", NULL, 450, 640), _PWG_MEDIA_MM("iso_sra2_450x640mm", "iso-sra2", "SRA2", 450, 640),
_PWG_MEDIA_MM("iso_ra1_610x860mm", "iso-ra1", NULL, 610, 860), _PWG_MEDIA_MM("iso_ra1_610x860mm", "iso-ra1", "RA1", 610, 860),
_PWG_MEDIA_MM("iso_sra1_640x900mm", "iso-sra1", NULL, 640, 900), _PWG_MEDIA_MM("iso_sra1_640x900mm", "iso-sra1", "SRA1", 640, 900),
_PWG_MEDIA_MM("iso_ra0_860x1220mm", "iso-ra0", NULL, 860, 1220), _PWG_MEDIA_MM("iso_ra0_860x1220mm", "iso-ra0", "RA0", 860, 1220),
_PWG_MEDIA_MM("iso_sra0_900x1280mm", "iso-sra0", NULL, 900, 1280), _PWG_MEDIA_MM("iso_sra0_900x1280mm", "iso-sra0", "SRA0", 900, 1280),
/* Japanese Standard Sheet Media Sizes */ /* Japanese Standard Sheet Media Sizes */
_PWG_MEDIA_MM("jis_b10_32x45mm", "jis-b10", "B10", 32, 45), _PWG_MEDIA_MM("jis_b10_32x45mm", "jis-b10", "B10", 32, 45),
@ -189,7 +188,7 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("jis_b2_515x728mm", "jis-b2", "B2", 515, 728), _PWG_MEDIA_MM("jis_b2_515x728mm", "jis-b2", "B2", 515, 728),
_PWG_MEDIA_MM("jis_b1_728x1030mm", "jis-b1", "B1", 728, 1030), _PWG_MEDIA_MM("jis_b1_728x1030mm", "jis-b1", "B1", 728, 1030),
_PWG_MEDIA_MM("jis_b0_1030x1456mm", "jis-b0", "B0", 1030, 1456), _PWG_MEDIA_MM("jis_b0_1030x1456mm", "jis-b0", "B0", 1030, 1456),
_PWG_MEDIA_MM("jis_exec_216x330mm", NULL, NULL, 216, 330), _PWG_MEDIA_MM("jis_exec_216x330mm", NULL, "216x330mm", 216, 330),
_PWG_MEDIA_MM("jpn_kaku2_240x332mm", NULL, "EnvKaku2", 240, 332), _PWG_MEDIA_MM("jpn_kaku2_240x332mm", NULL, "EnvKaku2", 240, 332),
_PWG_MEDIA_MM("jpn_kaku3_216x277mm", NULL, "EnvKaku3", 216, 277), _PWG_MEDIA_MM("jpn_kaku3_216x277mm", NULL, "EnvKaku3", 216, 277),
_PWG_MEDIA_MM("jpn_kaku4_197x267mm", NULL, "EnvKaku4", 197, 267), _PWG_MEDIA_MM("jpn_kaku4_197x267mm", NULL, "EnvKaku4", 197, 267),
@ -204,7 +203,7 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("jpn_chou3_120x235mm", NULL, "EnvChou3", 120, 235), _PWG_MEDIA_MM("jpn_chou3_120x235mm", NULL, "EnvChou3", 120, 235),
_PWG_MEDIA_MM("jpn_chou40_90x225mm", NULL, "EnvChou40", 90, 225), _PWG_MEDIA_MM("jpn_chou40_90x225mm", NULL, "EnvChou40", 90, 225),
_PWG_MEDIA_MM("jpn_oufuku_148x200mm", NULL, "DoublePostcardRotated", 148, 200), _PWG_MEDIA_MM("jpn_oufuku_148x200mm", NULL, "DoublePostcardRotated", 148, 200),
_PWG_MEDIA_MM("jpn_kahu_240x322.1mm", NULL, NULL, 240, 322.1), _PWG_MEDIA_MM("jpn_kahu_240x322.1mm", NULL, "240x322mm", 240, 322.1),
/* Chinese Standard Sheet Media Sizes */ /* Chinese Standard Sheet Media Sizes */
_PWG_MEDIA_MM("prc_32k_97x151mm", NULL, "PRC32K", 97, 151), _PWG_MEDIA_MM("prc_32k_97x151mm", NULL, "PRC32K", 97, 151),
@ -215,9 +214,9 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_MM("prc_6_120x320mm", NULL, NULL, 120, 320), _PWG_MEDIA_MM("prc_6_120x320mm", NULL, NULL, 120, 320),
_PWG_MEDIA_MM("prc_16k_146x215mm", NULL, "PRC16K", 146, 215), _PWG_MEDIA_MM("prc_16k_146x215mm", NULL, "PRC16K", 146, 215),
_PWG_MEDIA_MM("prc_7_160x230mm", NULL, "EnvPRC7", 160, 230), _PWG_MEDIA_MM("prc_7_160x230mm", NULL, "EnvPRC7", 160, 230),
_PWG_MEDIA_MM("om_juuro-ku-kai_198x275mm", NULL, NULL, 198, 275), _PWG_MEDIA_MM("om_juuro-ku-kai_198x275mm", NULL, "198x275mm", 198, 275),
_PWG_MEDIA_MM("om_pa-kai_267x389mm", NULL, NULL, 267, 389), _PWG_MEDIA_MM("om_pa-kai_267x389mm", NULL, "267x389mm", 267, 389),
_PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, NULL, 275, 395), _PWG_MEDIA_MM("om_dai-pa-kai_275x395mm", NULL, "275x395mm", 275, 395),
/* Chinese Standard Sheet Media Inch Sizes */ /* Chinese Standard Sheet Media Inch Sizes */
_PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, "roc16k", 7.75, 10.75), _PWG_MEDIA_IN("roc_16k_7.75x10.75in", NULL, "roc16k", 7.75, 10.75),
@ -227,16 +226,16 @@ static pwg_media_t const cups_pwg_media[] =
_PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5), _PWG_MEDIA_IN("oe_photo-l_3.5x5in", NULL, "3.5x5", 3.5, 5),
/* Other Metric Standard Sheet Media Sizes */ /* Other Metric Standard Sheet Media Sizes */
_PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, "om_small-photo", 100, 150), _PWG_MEDIA_MM("om_small-photo_100x150mm", NULL, "100x150mm", 100, 150),
_PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230), _PWG_MEDIA_MM("om_italian_110x230mm", NULL, "EnvItalian", 110, 230),
_PWG_MEDIA_MM("om_large-photo_200x300", NULL, "om_large-photo", 200, 300), _PWG_MEDIA_MM("om_large-photo_200x300", NULL, "200x300mm", 200, 300),
_PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330), _PWG_MEDIA_MM("om_folio_210x330mm", "folio", "Folio", 210, 330),
_PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315), _PWG_MEDIA_MM("om_folio-sp_215x315mm", NULL, "FolioSP", 215, 315),
_PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220), _PWG_MEDIA_MM("om_invite_220x220mm", NULL, "EnvInvite", 220, 220),
_PWG_MEDIA_MM("om_small-photo_100x200mm", NULL, "om_wide-photo", 100, 200), _PWG_MEDIA_MM("om_small-photo_100x200mm", NULL, "100x200mm", 100, 200),
/* Disc Sizes */ /* Disc Sizes */
_PWG_MEDIA_MM("disc_standard_40x118mm", NULL, NULL, 118, 118) _PWG_MEDIA_MM("disc_standard_40x118mm", NULL, "Disc", 118, 118)
}; };
@ -378,11 +377,6 @@ pwgFormatSizeName(char *keyword, /* I - Keyword buffer */
return (1); return (1);
} }
/* For macOS 10.8 and earlier... */
void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix,
const char *name, int width, int length)
{ pwgFormatSizeName(keyword, keysize, prefix, name, width, length, NULL); }
/* /*
* 'pwgInitSize()' - Initialize a pwg_size_t structure using IPP Job Template * 'pwgInitSize()' - Initialize a pwg_size_t structure using IPP Job Template
@ -560,10 +554,6 @@ pwgInitSize(pwg_size_t *size, /* I - Size to initialize */
return (1); return (1);
} }
/* For macOS 10.8 and earlier */
int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set)
{ return (pwgInitSize(size, job, margins_set)); }
/* /*
* 'pwgMediaForLegacy()' - Find a PWG media size by ISO/IPP legacy name. * 'pwgMediaForLegacy()' - Find a PWG media size by ISO/IPP legacy name.
@ -771,6 +761,8 @@ pwgMediaForPPD(const char *ppd) /* I - PPD size name */
* [oe|om]_WIDTHxHEIGHTuu_WIDTHxHEIGHTuu * [oe|om]_WIDTHxHEIGHTuu_WIDTHxHEIGHTuu
*/ */
char wstr[32], lstr[32]; /* Width and length as strings */
size = &(cg->pwg_media); size = &(cg->pwg_media);
size->width = w; size->width = w;
size->length = l; size->length = l;
@ -779,6 +771,12 @@ pwgMediaForPPD(const char *ppd) /* I - PPD size name */
pwgFormatSizeName(cg->pwg_name, sizeof(cg->pwg_name), pwgFormatSizeName(cg->pwg_name, sizeof(cg->pwg_name),
custom ? "custom" : NULL, custom ? ppd + 7 : NULL, custom ? "custom" : NULL, custom ? ppd + 7 : NULL,
size->width, size->length, NULL); size->width, size->length, NULL);
if ((w % 635) == 0 && (l % 635) == 0)
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%s", pwg_format_inches(wstr, sizeof(wstr), w), pwg_format_inches(lstr, sizeof(lstr), l));
else
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%smm", pwg_format_millimeters(wstr, sizeof(wstr), w), pwg_format_millimeters(lstr, sizeof(lstr), l));
size->ppd = cg->ppd_name;
} }
} }
} }
@ -869,6 +867,8 @@ pwgMediaForPWG(const char *pwg) /* I - PWG size name */
if (ptr) if (ptr)
{ {
char wstr[32], lstr[32]; /* Width and length strings */
if (!strncmp(pwg, "disc_", 5)) if (!strncmp(pwg, "disc_", 5))
w = l; /* Make the media size OUTERxOUTER */ w = l; /* Make the media size OUTERxOUTER */
@ -878,6 +878,12 @@ pwgMediaForPWG(const char *pwg) /* I - PWG size name */
strlcpy(cg->pwg_name, pwg, sizeof(cg->pwg_name)); strlcpy(cg->pwg_name, pwg, sizeof(cg->pwg_name));
size->pwg = cg->pwg_name; size->pwg = cg->pwg_name;
if (numer == 100)
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%smm", pwg_format_millimeters(wstr, sizeof(wstr), w), pwg_format_millimeters(lstr, sizeof(lstr), l));
else
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%s", pwg_format_inches(wstr, sizeof(wstr), w), pwg_format_inches(lstr, sizeof(lstr), l));
size->ppd = cg->ppd_name;
} }
} }
} }
@ -927,6 +933,7 @@ _pwgMediaNearSize(int width, /* I - Width in hundredths of millimeters *
int dw, dl, /* Difference in width and length */ int dw, dl, /* Difference in width and length */
best_dw = 999, /* Best difference in width and length */ best_dw = 999, /* Best difference in width and length */
best_dl = 999; best_dl = 999;
char wstr[32], lstr[32]; /* Width and length as strings */
_cups_globals_t *cg = _cupsGlobals(); /* Global data */ _cups_globals_t *cg = _cupsGlobals(); /* Global data */
@ -979,6 +986,12 @@ _pwgMediaNearSize(int width, /* I - Width in hundredths of millimeters *
cg->pwg_media.width = width; cg->pwg_media.width = width;
cg->pwg_media.length = length; cg->pwg_media.length = length;
if ((width % 635) == 0 && (length % 635) == 0)
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%s", pwg_format_inches(wstr, sizeof(wstr), width), pwg_format_inches(lstr, sizeof(lstr), length));
else
snprintf(cg->ppd_name, sizeof(cg->ppd_name), "%sx%smm", pwg_format_millimeters(wstr, sizeof(wstr), width), pwg_format_millimeters(lstr, sizeof(lstr), length));
cg->pwg_media.ppd = cg->ppd_name;
return (&(cg->pwg_media)); return (&(cg->pwg_media));
} }
@ -1038,8 +1051,8 @@ pwg_compare_pwg(pwg_media_t *a, /* I - First size */
static char * /* O - String */ static char * /* O - String */
pwg_format_inches(char *buf, /* I - Buffer */ pwg_format_inches(char *buf, /* I - Buffer */
size_t bufsize, /* I - Size of buffer */ size_t bufsize, /* I - Size of buffer */
int val) /* I - Value in hundredths of millimeters */ int val) /* I - Value in hundredths of millimeters */
{ {
int thousandths, /* Thousandths of inches */ int thousandths, /* Thousandths of inches */
integer, /* Integer portion */ integer, /* Integer portion */
@ -1079,8 +1092,8 @@ pwg_format_inches(char *buf, /* I - Buffer */
static char * /* O - String */ static char * /* O - String */
pwg_format_millimeters(char *buf, /* I - Buffer */ pwg_format_millimeters(char *buf, /* I - Buffer */
size_t bufsize, /* I - Size of buffer */ size_t bufsize, /* I - Size of buffer */
int val) /* I - Value in hundredths of millimeters */ int val) /* I - Value in hundredths of millimeters */
{ {
int integer, /* Integer portion */ int integer, /* Integer portion */
fraction; /* Fractional portion */ fraction; /* Fractional portion */

2
cups/pwg-private.h
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

8
cups/pwg.h
View File

@ -1,13 +1,13 @@
/* /*
* PWG media API definitions for CUPS. * PWG media API definitions for CUPS.
* *
* Copyright 2009-2013 by Apple Inc. * Copyright 2009-2017 by Apple Inc.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -39,7 +39,7 @@ extern "C" {
* Types and structures... * Types and structures...
*/ */
typedef struct pwg_map_s /**** Map element - PPD to/from PWG */ typedef struct pwg_map_s /**** Map element - PPD to/from PWG @exclude all@ */
{ {
char *pwg, /* PWG media keyword */ char *pwg, /* PWG media keyword */
*ppd; /* PPD option keyword */ *ppd; /* PPD option keyword */
@ -54,7 +54,7 @@ typedef struct pwg_media_s /**** Common media size data ****/
length; /* Length in 2540ths */ length; /* Length in 2540ths */
} pwg_media_t; } pwg_media_t;
typedef struct pwg_size_s /**** Size element - PPD to/from PWG */ typedef struct pwg_size_s /**** Size element - PPD to/from PWG @exclude all@ */
{ {
pwg_map_t map; /* Map element */ pwg_map_t map; /* Map element */
int width, /* Width in 2540ths */ int width, /* Width in 2540ths */

2
cups/raster-private.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

15
cups/raster.h
View File

@ -10,7 +10,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -52,6 +52,9 @@ extern "C" {
# define CUPS_RASTER_SYNCv2 0x52615332 /* RaS2 */ # define CUPS_RASTER_SYNCv2 0x52615332 /* RaS2 */
# define CUPS_RASTER_REVSYNCv2 0x32536152 /* 2SaR */ # define CUPS_RASTER_REVSYNCv2 0x32536152 /* 2SaR */
# define CUPS_RASTER_SYNCapple 0x554E4952 /* UNIR */
# define CUPS_RASTER_REVSYNCapple 0x52494E55 /* RINU */
# define CUPS_RASTER_SYNC_PWG CUPS_RASTER_SYNCv2 # define CUPS_RASTER_SYNC_PWG CUPS_RASTER_SYNCv2
/* /*
@ -75,6 +78,13 @@ extern "C" {
# define CUPS_RASTER_HAVE_PWGRASTER 1 # define CUPS_RASTER_HAVE_PWGRASTER 1
/*
* The following definition can be used to determine if Apple Raster is
* supported (beta).
*/
# define CUPS_RASTER_HAVE_APPLERASTER 1
/* /*
* The following PWG 5102.4 definitions specify indices into the * The following PWG 5102.4 definitions specify indices into the
* cupsInteger[] array in the raster header. * cupsInteger[] array in the raster header.
@ -202,7 +212,8 @@ enum cups_mode_e /**** cupsRasterOpen modes ****/
CUPS_RASTER_READ = 0, /* Open stream for reading */ CUPS_RASTER_READ = 0, /* Open stream for reading */
CUPS_RASTER_WRITE = 1, /* Open stream for writing */ CUPS_RASTER_WRITE = 1, /* Open stream for writing */
CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/macOS 10.5@ */ CUPS_RASTER_WRITE_COMPRESSED = 2, /* Open stream for compressed writing @since CUPS 1.3/macOS 10.5@ */
CUPS_RASTER_WRITE_PWG = 3 /* Open stream for compressed writing in PWG mode @since CUPS 1.5/macOS 10.7@ */ CUPS_RASTER_WRITE_PWG = 3, /* Open stream for compressed writing in PWG Raster mode @since CUPS 1.5/macOS 10.7@ */
CUPS_RASTER_WRITE_APPLE = 4 /* Open stream for compressed writing in AppleRaster mode (beta) @private@ */
}; };
typedef enum cups_mode_e cups_mode_t; /**** cupsRasterOpen modes ****/ typedef enum cups_mode_e cups_mode_t; /**** cupsRasterOpen modes ****/

2
cups/request.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/sidechannel.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/sidechannel.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

4
cups/snmp.c
View File

@ -739,6 +739,10 @@ asn1_debug(const char *prefix, /* I - Prefix string */
_cups_globals_t *cg = _cupsGlobals(); /* Global data */ _cups_globals_t *cg = _cupsGlobals(); /* Global data */
#ifdef __clang_analyzer__ /* Suppress bogus clang error */
memset(string, 0, sizeof(string));
#endif /* __clang_analyzer__ */
if (cg->snmp_debug <= 0) if (cg->snmp_debug <= 0)
return; return;

2
cups/snprintf.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/string-private.h
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

20
cups/string.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -231,15 +231,12 @@ _cupsStrFormatd(char *buf, /* I - String */
* Next, find the decimal point... * Next, find the decimal point...
*/ */
/* 07/22/2016 Mopria-notice: this causes "struct lconv has no member named 'decimal_point'" if (loc && loc->decimal_point)
compilation error in Android so commenting out
if (loc && loc->decimal_point)
{ {
dec = loc->decimal_point; dec = loc->decimal_point;
declen = (int)strlen(dec); declen = (int)strlen(dec);
} }
else else
*/
{ {
dec = "."; dec = ".";
declen = 1; declen = 1;
@ -448,16 +445,12 @@ _cupsStrScand(const char *buf, /* I - Pointer to number */
buf ++; buf ++;
/* 07/22/2016 Mopria-notice: this causes "struct lconv has no member named 'decimal_point'"
compilation error in Android so commenting out
if (loc && loc->decimal_point) if (loc && loc->decimal_point)
{ {
strlcpy(tempptr, loc->decimal_point, sizeof(temp) - (size_t)(tempptr - temp)); strlcpy(tempptr, loc->decimal_point, sizeof(temp) - (size_t)(tempptr - temp));
tempptr += strlen(tempptr); tempptr += strlen(tempptr);
} }
else else if (tempptr < (temp + sizeof(temp) - 1))
*/
if (tempptr < (temp + sizeof(temp) - 1))
*tempptr++ = '.'; *tempptr++ = '.';
else else
{ {
@ -702,10 +695,11 @@ _cups_strlcat(char *dst, /* O - Destination string */
*/ */
dstlen = strlen(dst); dstlen = strlen(dst);
size -= dstlen + 1;
if (!size) if (size < (dstlen + 1))
return (dstlen); /* No room, return immediately... */ return (dstlen); /* No room, return immediately... */
size -= dstlen + 1;
/* /*
* Figure out how much room is needed... * Figure out how much room is needed...

2
cups/tempfile.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testadmin.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testarray.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testcache.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testconflicts.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testcreds.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testcups.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

9
cups/testdest.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -218,9 +218,9 @@ enum_cb(void *user_data, /* I - User data (unused) */
(void)flags; (void)flags;
if (dest->instance) if (dest->instance)
printf("%s/%s:\n", dest->name, dest->instance); printf("%s%s/%s:\n", (flags & CUPS_DEST_FLAGS_REMOVED) ? "REMOVE " : "", dest->name, dest->instance);
else else
printf("%s:\n", dest->name); printf("%s%s:\n", (flags & CUPS_DEST_FLAGS_REMOVED) ? "REMOVE " : "", dest->name);
for (i = 0; i < dest->num_options; i ++) for (i = 0; i < dest->num_options; i ++)
printf(" %s=\"%s\"\n", dest->options[i].name, dest->options[i].value); printf(" %s=\"%s\"\n", dest->options[i].name, dest->options[i].value);
@ -594,7 +594,8 @@ show_supported(http_t *http, /* I - Connection to destination */
} }
else if (!value) else if (!value)
{ {
puts(option); printf("%s (%s)\n", option, cupsCheckDestSupported(http, dest, dinfo, option, NULL) ? "supported" : "not-supported");
if ((attr = cupsFindDestSupported(http, dest, dinfo, option)) != NULL) if ((attr = cupsFindDestSupported(http, dest, dinfo, option)) != NULL)
{ {
count = ippGetCount(attr); count = ippGetCount(attr);

2
cups/testfile.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testhttp.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testi18n.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testipp.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testlang.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testoptions.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

4
cups/testppd.c
View File

@ -1,14 +1,14 @@
/* /*
* PPD test program for CUPS. * PPD test program for CUPS.
* *
* Copyright 2007-2015 by Apple Inc. * Copyright 2007-2017 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products. * Copyright 1997-2006 by Easy Software Products.
* *
* These coded instructions, statements, and computer programs are the * These coded instructions, statements, and computer programs are the
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testpwg.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/testsnmp.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

2
cups/thread-private.h
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */

5
cups/thread.c
View File

@ -7,7 +7,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -150,8 +150,7 @@ _cupsRWUnlock(_cups_rwlock_t *rwlock) /* I - Reader/writer lock */
void void
_cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */ _cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */
{ {
// Mopria-notice: pthread_cancel is not defined in the Android, commenting out. pthread_cancel(thread);
// pthread_cancel(thread);
} }

50
cups/tls-darwin.c
View File

@ -8,7 +8,7 @@
* property of Apple Inc. and are protected by Federal copyright * property of Apple Inc. and are protected by Federal copyright
* law. Distribution and use rights are outlined in the file "LICENSE.txt" * law. Distribution and use rights are outlined in the file "LICENSE.txt"
* which should have been included with this file. If this file is * 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/". * missing or damaged, see the license at "http://www.cups.org/".
* *
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -21,7 +21,7 @@
#include <spawn.h> #include <spawn.h>
extern char **environ; extern char **environ; /* @private@ */
/* /*
@ -41,6 +41,8 @@ static int tls_auto_create = 0;
static char *tls_common_name = NULL; static char *tls_common_name = NULL;
/* Default common name */ /* Default common name */
#ifdef HAVE_SECKEYCHAINOPEN #ifdef HAVE_SECKEYCHAINOPEN
static int tls_cups_keychain = 0;
/* Opened the CUPS keychain? */
static SecKeychainRef tls_keychain = NULL; static SecKeychainRef tls_keychain = NULL;
/* Server cert keychain */ /* Server cert keychain */
#else #else
@ -1322,7 +1324,6 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */
case TLS_DHE_RSA_WITH_AES_256_CBC_SHA : case TLS_DHE_RSA_WITH_AES_256_CBC_SHA :
case TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA : case TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA :
case TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA : case TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA :
// case TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA :
case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA : case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA :
case TLS_DH_DSS_WITH_AES_128_CBC_SHA256 : case TLS_DH_DSS_WITH_AES_128_CBC_SHA256 :
case TLS_DH_RSA_WITH_AES_128_CBC_SHA256 : case TLS_DH_RSA_WITH_AES_128_CBC_SHA256 :
@ -1335,6 +1336,14 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */
case TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA : case TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA :
case TLS_DHE_PSK_WITH_AES_128_CBC_SHA : case TLS_DHE_PSK_WITH_AES_128_CBC_SHA :
case TLS_DHE_PSK_WITH_AES_256_CBC_SHA : case TLS_DHE_PSK_WITH_AES_256_CBC_SHA :
case TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 :
case TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 :
if (tls_options & _HTTP_TLS_DENY_CBC)
{
DEBUG_printf(("4_httpTLSStart: Excluding CBC cipher suite %d", supported[i]));
break;
}
// case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 : // case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 :
// case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 : // case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 :
case TLS_DH_RSA_WITH_AES_128_GCM_SHA256 : case TLS_DH_RSA_WITH_AES_128_GCM_SHA256 :
@ -1345,15 +1354,28 @@ _httpTLSStart(http_t *http) /* I - HTTP connection */
case TLS_DH_DSS_WITH_AES_256_GCM_SHA384 : case TLS_DH_DSS_WITH_AES_256_GCM_SHA384 :
case TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 : case TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 :
case TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 : case TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 :
case TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 :
case TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 :
if (tls_options & _HTTP_TLS_ALLOW_DH) if (tls_options & _HTTP_TLS_ALLOW_DH)
enabled[num_enabled ++] = supported[i]; enabled[num_enabled ++] = supported[i];
else else
DEBUG_printf(("4_httpTLSStart: Excluding DH/DHE cipher suite %d", supported[i])); DEBUG_printf(("4_httpTLSStart: Excluding DH/DHE cipher suite %d", supported[i]));
break; break;
/* Anything else we'll assume is secure */ case TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA :
case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 :
case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 :
case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 :
case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 :
case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 :
case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 :
case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 :
case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 :
if (tls_options & _HTTP_TLS_DENY_CBC)
{
DEBUG_printf(("4_httpTLSStart: Excluding CBC cipher suite %d", supported[i]));
break;
}
/* Anything else we'll assume is "secure" */
default : default :
enabled[num_enabled ++] = supported[i]; enabled[num_enabled ++] = supported[i];
break; break;
@ -1747,6 +1769,7 @@ http_cdsa_copy_server(
CFMutableDictionaryRef query = NULL; /* Query qualifiers */ CFMutableDictionaryRef query = NULL; /* Query qualifiers */
CFArrayRef list = NULL; /* Keychain list */ CFArrayRef list = NULL; /* Keychain list */
SecKeychainRef syschain = NULL;/* System keychain */ SecKeychainRef syschain = NULL;/* System keychain */
SecKeychainStatus status = 0; /* Keychain status */
DEBUG_printf(("3http_cdsa_copy_server(common_name=\"%s\")", common_name)); DEBUG_printf(("3http_cdsa_copy_server(common_name=\"%s\")", common_name));
@ -1769,6 +1792,11 @@ http_cdsa_copy_server(
_cupsMutexLock(&tls_mutex); _cupsMutexLock(&tls_mutex);
err = SecKeychainGetStatus(tls_keychain, &status);
if (err == noErr && !(status & kSecUnlockStateStatus) && tls_cups_keychain)
SecKeychainUnlock(tls_keychain, _CUPS_CDSA_PASSLEN, _CUPS_CDSA_PASSWORD, TRUE);
CFDictionaryAddValue(query, kSecClass, kSecClassIdentity); CFDictionaryAddValue(query, kSecClass, kSecClassIdentity);
CFDictionaryAddValue(query, kSecMatchPolicy, policy); CFDictionaryAddValue(query, kSecMatchPolicy, policy);
CFDictionaryAddValue(query, kSecReturnRef, kCFBooleanTrue); CFDictionaryAddValue(query, kSecReturnRef, kCFBooleanTrue);
@ -1901,9 +1929,15 @@ http_cdsa_open_keychain(
*/ */
if (!path) if (!path)
{
path = http_cdsa_default_path(filename, filesize); path = http_cdsa_default_path(filename, filesize);
tls_cups_keychain = 1;
}
else else
{
strlcpy(filename, path, filesize); strlcpy(filename, path, filesize);
tls_cups_keychain = 0;
}
/* /*
* Save the interaction setting and disable while we open the keychain... * Save the interaction setting and disable while we open the keychain...
@ -1912,7 +1946,7 @@ http_cdsa_open_keychain(
SecKeychainGetUserInteractionAllowed(&interaction); SecKeychainGetUserInteractionAllowed(&interaction);
SecKeychainSetUserInteractionAllowed(FALSE); SecKeychainSetUserInteractionAllowed(FALSE);
if (access(path, R_OK)) if (access(path, R_OK) && tls_cups_keychain)
{ {
/* /*
* Create a new keychain at the given path... * Create a new keychain at the given path...
@ -1931,7 +1965,7 @@ http_cdsa_open_keychain(
if (err == noErr) if (err == noErr)
err = SecKeychainGetStatus(keychain, &status); err = SecKeychainGetStatus(keychain, &status);
if (err == noErr && !(status & kSecUnlockStateStatus)) if (err == noErr && !(status & kSecUnlockStateStatus) && tls_cups_keychain)
err = SecKeychainUnlock(keychain, _CUPS_CDSA_PASSLEN, _CUPS_CDSA_PASSWORD, TRUE); err = SecKeychainUnlock(keychain, _CUPS_CDSA_PASSLEN, _CUPS_CDSA_PASSWORD, TRUE);
} }

Some files were not shown because too many files have changed in this diff Show More