Comparar commits
1 Commits
| Autor | SHA1 | Data | |
|---|---|---|---|
 msweet
|
bc3c4e76d7 |
+616
-1
@@ -1,6 +1,621 @@
|
||||
CHANGES.txt - 09/18/2000
|
||||
CHANGES.txt - 05/01/2001
|
||||
------------------------
|
||||
|
||||
CHANGES IN CUPS V1.1.7
|
||||
|
||||
- Configuration script changes, including new
|
||||
"--with-docdir=/dir" option to relocate CUPS
|
||||
documentation and web content according to your
|
||||
favorite version of the FHS.
|
||||
- Documentation updates for encryption, SLP, etc.
|
||||
- New Software Test Plan and automated test script to
|
||||
test CUPS prior to installation.
|
||||
- All scheduler configuration files are now case
|
||||
insensitive to match Apache.
|
||||
- Added support for Apache ListenBackLog, LogFormat,
|
||||
Require, UseCanonicalName, Satisfy, <Limit>,
|
||||
<LimitExcept>, LimitRequestSize, and Options
|
||||
directives.
|
||||
- Added support for all Apache log levels...
|
||||
- Added support for "double" HostNameLookups.
|
||||
- Added new "RunAsUser" directive to support non-root
|
||||
configurations on the standard (priviledged) ports.
|
||||
- Added support for non-root invocation of the lpd
|
||||
backend (does no reserve a priviledged port, which
|
||||
might not work with some LPD servers...)
|
||||
- Added new PrintcapFormat directive to control the
|
||||
output format of the printcap file (BSD or Solaris
|
||||
formats are supported at present.)
|
||||
- The CUPS directory service routines now handle
|
||||
ECONNREFUSED errors gracefully rather than shutting
|
||||
all browsing off.
|
||||
- ippErrorString() now returns the recommended error
|
||||
messages from the IPP/1.1 Model and Semantics
|
||||
document.
|
||||
- Fixed a minor IPP compliance issue with responses
|
||||
to requests without the attributes-charset or
|
||||
attributes-natural-language attributes.
|
||||
- Sun fix: need httpFlush() call for chunked IPP
|
||||
requests in cupsDoFileRequest().
|
||||
- httpConnect() now looks up "localhost" by name and
|
||||
by address (127.0.0.1) for users the go to the
|
||||
trouble of removing the required localhost entry
|
||||
in /etc/hosts or on their DNS server...
|
||||
- Added support for Linux 2.4.x devfs parallel port
|
||||
filenames (/dev/parallel/N).
|
||||
- cupsDo[File]Request() and cupsGetPPD() no longer
|
||||
block trying to reconnect to a crashed or inaccessable
|
||||
server.
|
||||
- Added new ppdEmitJCL() function to better handle
|
||||
PJL commands from PPD files.
|
||||
- A bug in UpdateJob() would cause the scheduler to
|
||||
consume 100% CPU until another request was submitted.
|
||||
- The cancel command did not support the "-" option to
|
||||
cancel all jobs on all printers.
|
||||
- The cancel and lprm commands did not support cancelling
|
||||
the next/current job in the queue.
|
||||
- The pdftops and pstoraster filters were using unsafe
|
||||
temporary file functions; while this is not a problem
|
||||
in normal configurations (the CUPS temporary directory
|
||||
is restricted), they now use the cupsTempFd() function.
|
||||
- The mime.types file was missing the recognition rule
|
||||
for Sun Raster images.
|
||||
- The admin CGI was passing a printer make string to
|
||||
ippSetCGIVars() that was being replaced in that
|
||||
function.
|
||||
- "lpoptions -l" would resave the options...
|
||||
- The EPSON drivers now send the "end packet mode"
|
||||
command when printing to USB devices.
|
||||
- The scheduler initialized certificates before loading
|
||||
the cupsd.conf file.
|
||||
- The scheduler used /dev/random to collect random data,
|
||||
which could block if insufficient entropy information
|
||||
had been collected by the kernel. Now use
|
||||
/dev/urandom.
|
||||
- Fixed a bug in the whitespace skipping code in
|
||||
httpGetSubField().
|
||||
- The LPD backend now supports a new "order" option:
|
||||
"lpd://server/queue?order=control,data" (default) and
|
||||
"lpd://server/queue?order=data,control".
|
||||
- The scheduler enforced a 30 second timeout on all
|
||||
clients regardless of the Timeout directive and if a
|
||||
CGI was currently running.
|
||||
- cupsParseOptions() now sets boolean options to
|
||||
option=true or option=false.
|
||||
- The "percent complete" calculations in the LPD backend
|
||||
could overflow on large files, causing the percentage
|
||||
to wrap to 0 every 40MB or so.
|
||||
- Fixed a memory reallocation bug in pstoraster that
|
||||
could cause it to crash.
|
||||
- The LPD backend now sanitizes the job title to avoid
|
||||
potential problems on remote LPD servers.
|
||||
- The lp command did not send the requesting-user-name
|
||||
attribute when altering a job.
|
||||
- The pstops filter did not handle PostScript files with
|
||||
lines longer than 8191 bytes.
|
||||
- The scheduler no longer uses inet_addr() to convert IP
|
||||
addresses in dot format (mmm.nnn.ooo.ppp) to the
|
||||
32-bit format, since it will not work for IPv6
|
||||
addresses.
|
||||
- New "Classification" directive to force labeling of
|
||||
the current classification on each page.
|
||||
- New "page-label" attribute to add per-page labels
|
||||
("For Official Use Only", "Draft", etc.)
|
||||
- The scheduler now sets the HTTPS environment variable
|
||||
for CGI programs when a client connects using
|
||||
encryption.
|
||||
- Fixed a recursion bug in the scheduler that could
|
||||
cause cupsd to crash when a printer was removed.
|
||||
- The LPDEST and PRINTER environment variables didn't
|
||||
support instances.
|
||||
- Dropped the "file" backend from the device list that
|
||||
is reported, since it is only available for *testing*
|
||||
and should never be used in a production environment.
|
||||
The file: device can still be used, but it won't show
|
||||
up in the list of devices from lpinfo or the web
|
||||
interface.
|
||||
- Added support for /dev/lpa# parallel ports under *BSD.
|
||||
- Added META variables to the CGI header template to
|
||||
prevent caching of the results.
|
||||
- Fixed an unaligned memory buffer for the pstoraster
|
||||
clist states; this caused bus errors for some
|
||||
combinations of printers, drivers, and options.
|
||||
- Re-added black reduction for colorful colors; this
|
||||
helps to prevent dark colors from getting desaturated.
|
||||
(only used when converting RGB to CMYK)
|
||||
- Added two new directives - MaxJobsPerPrinter and
|
||||
MaxJobsPerUser - to allow an administrator to set
|
||||
the maximum number of pending jobs in a queue or
|
||||
submitted by a user.
|
||||
- The scheduler no longer stops a printer if it can't
|
||||
create the status pipe or run the filters or backend.
|
||||
This will allow heavily loaded servers to service
|
||||
clients or start print jobs as the load allows.
|
||||
- Fixed a bug in the Set-Job-Attributes code that could
|
||||
crash the scheduler (patch from Martin Zielinski)
|
||||
- cupsSetDests() did not quote option values with
|
||||
embedded spaces.
|
||||
- Added support for the Enable-Printer and
|
||||
Disable-Printer extension operations (same as
|
||||
CUPS-Accept-Jobs and CUPS-Reject-Jobs.)
|
||||
- The AppSocket and IPP backends now wait for the print
|
||||
job to be finished before exiting; this should prevent
|
||||
the loss of print jobs with older JetDirect firmware
|
||||
and make consecutive print jobs print faster.
|
||||
- The BMP loading code did not handle resolution values
|
||||
of 0. This is a problem with BMP image files produced
|
||||
by the GIMP.
|
||||
- The HTTP Upgrade code (upgrade to TLS encryption)
|
||||
bypassed the authentication checks.
|
||||
- The HTTP Upgrade code did not send a 426 status code
|
||||
to the client and end the current request. This caused
|
||||
a race condition between the client and server for the
|
||||
upgrade to TLS.
|
||||
- Fixed a bug in the EOF and Trailer detection code in
|
||||
the pstops filter.
|
||||
- The imagetoraster filter did not add the margins to
|
||||
the custom page size in the raster header.
|
||||
- The imagetops filter did not adjust the custom page
|
||||
size to the size of the printed image.
|
||||
- The imagetops filter did not include DSC comments
|
||||
which are required by some printers.
|
||||
- The imagetops filter did not insert newlines in
|
||||
Base85 encoded output, causing files to contain
|
||||
lines longer than 255 characters (violation of the
|
||||
DSC).
|
||||
- Added support for the DeskJet 900 series duplexer
|
||||
and CRET color modes in the HP driver.
|
||||
- Added support for PPD-defined margins in the HP
|
||||
driver.
|
||||
- Fixed the debugging output from pstoraster - the
|
||||
font list was not terminated by a newline.
|
||||
- Some versions of the HP-UX pam_unix authentication
|
||||
module apparently do not pass the appdata_ptr argument
|
||||
to the conversation function, preventing the scheduler
|
||||
from authenticating users using PAM under HP-UX. A
|
||||
workaround using a static variable has been added to
|
||||
address this problem.
|
||||
- Fixed a bug in the scheduler SortPrinters() function
|
||||
that could cause printers to disappear or the
|
||||
scheduler to crash when adding a printer.
|
||||
- Changed the pstops filter to not do per-page filtering
|
||||
if the file does not conform to at least version 3.0
|
||||
of the document structuring conventions. This seems
|
||||
to "fix" printing with broken apps.
|
||||
- The image filters did not handle older TIFF files that
|
||||
lacked the samples-per-pixel and bits-per-pixel tags.
|
||||
- Added new cupsGetJobs() and cupsFreeJobs() functions
|
||||
to manage print jobs.
|
||||
- cupsEncodeOptions() would encode names of 0 length and
|
||||
cupsAddOption() and cupsParseOptions() would add names
|
||||
of 0 length.
|
||||
- The scheduler might block waiting for status messages
|
||||
after starting a new print job. Thanks to Florent
|
||||
Guiliani for finding this bug!
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.6-3
|
||||
|
||||
- The configure script put the JPEG library before the
|
||||
TIFF library; this caused problems in some
|
||||
configurations since the TIFF library also supports
|
||||
JPEG compression of TIFF images.
|
||||
- Updated the configure script and makefiles to handle
|
||||
admin man pages with the "1m" extension (HP-UX, IRIX,
|
||||
Solaris, Tru64) and in odd directories (IRIX)
|
||||
- The updated cupsTempFile() function did not return
|
||||
the filename when called with a filename buffer of
|
||||
NULL (previously it used a static buffer.)
|
||||
- FreeBSD uses /dev/unlptN, but NetBSD and OpenBSD use
|
||||
/dev/ulptN.
|
||||
- DeletePrinter() didn't remove the printer from any
|
||||
classes it was a member of.
|
||||
- DeletePrinterFromClass() didn't preserve the
|
||||
implicit status of a class.
|
||||
- DeletePrinterFromClasses() didn't remove printers
|
||||
from implicit classes.
|
||||
- StartJob() didn't send the job-sheets, job-priority,
|
||||
and job-hold-until attributes to remote printers.
|
||||
- LoadAllJobs() was looking for job-sheets-completed
|
||||
instead of job-media-sheets-completed. This would
|
||||
prevent accumulation of page data after a restart
|
||||
of the scheduler.
|
||||
- The pstops and imagetops filters now generate copies
|
||||
using the appropriate method for a Level 1, 2, or 3
|
||||
printer since some Level 2/3 printers don't support
|
||||
the /#copies variable anymore.
|
||||
- The man page for cups-lpd did not mention the "-o"
|
||||
option.
|
||||
- The IPP backend didn't handle version-not-supported
|
||||
errors and revert to IPP/1.0 (previously it only checked
|
||||
for a bad-request error)
|
||||
- Caldera fix: lpc now reports unimplemented commands as
|
||||
unimplemented, not invalid.
|
||||
- Caldera fix: lpq didn't recognize BSD lpq "-a" option.
|
||||
- Caldera fix: lpr didn't recognize BSD lpr "-1", "-2",
|
||||
"-3", "-4", "-q", or "-U" options.
|
||||
- RedHat fixes: patches to GNU Ghostscript
|
||||
- SuSE fix: temp file creation patch to GNU Ghostscript
|
||||
(pstoraster).
|
||||
- SuSE fix: remove cgi-bin/abort.c and cgi-bin/email.c,
|
||||
which are not used.
|
||||
- SuSE fix: missing NULL check in cgi_initialize_post().
|
||||
- SuSE fix: potential buffer overflows in
|
||||
cgi_initialize_string().
|
||||
- SuSE fix: potential buffer overflows in
|
||||
ippSetCGIVars()
|
||||
- SuSE fix: more NULL checks in ppdOpen(); also make
|
||||
sure that all memory is freed on error to avoid memory
|
||||
leaks.
|
||||
- SuSE fix: Exit from child if setgid() or setuid()
|
||||
fails.
|
||||
- SuSE fix: Added setgroups() calls after setgid() and
|
||||
setuid() calls.
|
||||
- SuSE fix: potential buffer overflows in httpEncode64()
|
||||
calls.
|
||||
- SuSE fix: potential buffer overflows in httpSeparate()
|
||||
- SuSE fix: potential buffer overflows in ippWrite() for
|
||||
bad input.
|
||||
- SuSE fix: potential nul skip in ppd_decode() for
|
||||
missing hex digits.
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.6-2
|
||||
|
||||
- Added changes to support NetBSD startup scripts.
|
||||
- Added separate compiler options for pstoraster
|
||||
(Ghostscript) to avoid compiler-induced errors
|
||||
from Ghostscript's twisted code.
|
||||
- The mime.types file contained syntax errors.
|
||||
- Updated the *BSD USB device filenames to use
|
||||
the /dev/unlptN files so that the USB device
|
||||
is not reset prior to printing (causes print
|
||||
corruption on many printers)
|
||||
- Added new cupsTempFd() function to avoid serious
|
||||
security bug in glibc fopen() function. The glibc
|
||||
fopen() function unlinks a file before creating it,
|
||||
which opens up possible symlink attacks.
|
||||
- Now reject 0-length names in add-printer and add-class
|
||||
requests.
|
||||
- Fix for pstoraster when ZLIB is not available.
|
||||
- cupsGetPPD() didn't reconnect when a HTTP connection
|
||||
was lost.
|
||||
- SuSE fix: httpConnect() didn't check that the
|
||||
value from gethostbyname() was a valid IPv4 address.
|
||||
- SuSE fix: httpConnect() didn't allow file descriptor 0
|
||||
to be used for a socket.
|
||||
- SuSE fix: ippRead() didn't confirm that all values in
|
||||
a set were numeric or string types.
|
||||
- SuSE fix: lppasswd race condition fixes.
|
||||
- SuSE fix: directive names could overflow buffer when
|
||||
reading *.conf files.
|
||||
- SuSE fix: HEAD requests for PPD files did not use the
|
||||
same logic as GET requests.
|
||||
- SuSE fix: possible buffer overflow when adding
|
||||
/index.html to requested directory name.
|
||||
- SuSE fix: possible buffer overflow when converting
|
||||
IPP attributes to string options for filters.
|
||||
- SuSE fix: creating file: device output with mode 0666
|
||||
instead of mode 0600.
|
||||
- SuSE fix: creating job info files with mode 0640
|
||||
instead of 0600.
|
||||
- SuSE fix: don't rely on snprintf() for including
|
||||
system name in log filenames.
|
||||
- SuSE fix: add bounds checking when copying quoted
|
||||
and hex strings.
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.6-1
|
||||
|
||||
- Added configure check for getting the correct
|
||||
strftime() format string; %c is not Y2k safe,
|
||||
and %KC and NULL are not universally supported.
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.6
|
||||
|
||||
- Fixed another possible DoS attack in httpGets()
|
||||
- Added check for "LANGUAGE = PCL" and "LANGUAGE =
|
||||
POSTSCRIPT" in mime.types.
|
||||
- Resolution options were not being passed into the
|
||||
filter programs properly.
|
||||
- The default compiler options for GCC no longer include
|
||||
"-g3", which apparently is deprecated in newer
|
||||
versions of GCC.
|
||||
- CheckJobs() could cause cupsd to crash if a job is
|
||||
cancelled in StartJob().
|
||||
- The printers.conf and classes.conf files are now
|
||||
written with restricted permissions.
|
||||
- The round-robin algorithm used by FindAvailablePrinter()
|
||||
had problems; fixes contributed by Joel Fredrikson.
|
||||
- If LoadAllJobs() is unable to determine the file type
|
||||
of a print job, assume "application/vnd.cups-raw".
|
||||
- The web interface now provides a job_printer_name
|
||||
value for any corresponding job_printer_uri value.
|
||||
- The cups-lpd mini-daemon now logs the client address
|
||||
and hostname as well as all commands and errors in the
|
||||
syslog file.
|
||||
- The IPP backend now detects the supported file formats
|
||||
and only specifies the document format if it is
|
||||
supported. This makes IPP printing to network print
|
||||
servers and cards more reliable without affecting the
|
||||
capabilities of CUPS servers.
|
||||
- The time_at_xyz attributes are now converted to human-
|
||||
readable dates and times for the web interfaces.
|
||||
- The HP and EPSON sample drivers now correctly catch
|
||||
signals and eject the current page when a job is
|
||||
cancelled.
|
||||
- Fixed bug in CGI code - did not ignore control
|
||||
characters (e.g. newlines) in form data. This caused
|
||||
sporatic web interface problems.
|
||||
- The file type logging code in the scheduler referenced
|
||||
the optional document-format attribute; the new code
|
||||
uses the resolved MIME type instead.
|
||||
- The client.conf parsing code now removes trailing
|
||||
whitespace.
|
||||
- The MaxJobs directive was being treated as a boolean
|
||||
instead of an integer.
|
||||
- The scheduler would not timeout remote printers if
|
||||
BrowseInterval was set to 0.
|
||||
- The lpadmin command now supports setting of options
|
||||
and user-level access control.
|
||||
- Added "-E" option to all printing commands to force
|
||||
encryption.
|
||||
- The client code did not consume the response to the
|
||||
OPTIONS request when switching to secure mode.
|
||||
- The scheduler did not output a Content-Length field
|
||||
when responding to an OPTIONS request.
|
||||
- Added documentation on using cups-lpd with xinetd
|
||||
to the man page.
|
||||
- The socket backend now starts retries at 5 seconds and
|
||||
increases the interval to 30 seconds. This should
|
||||
provide faster printing when multiple jobs/files are
|
||||
queued for a printer.
|
||||
- The filters and backends no longer buffer output to
|
||||
stderr. This should provide much more accurate status
|
||||
reporting.
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.5-2
|
||||
|
||||
- Fixed configure check for OpenSSL to work with RSA
|
||||
code.
|
||||
- Added configure check for <sys/ioctl.h>, and use this
|
||||
check in backend/serial.c.
|
||||
- Updated configure script handling of data,
|
||||
configuration, and state directories to use datadir,
|
||||
sysconfdir, and localstatedir variables.
|
||||
- NetBSD uses different serial port filenames than
|
||||
FreeBSD and OpenBSD.
|
||||
- The pdftops filter didn't need some X-specific files.
|
||||
- The scheduler makefile doesn't do a chown anymore when
|
||||
installing (cupsd did this automatically on startup
|
||||
anyways)
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.5-1
|
||||
|
||||
- There was a typo in the top-level Makefile
|
||||
- The top-level Makefile did not install an init script
|
||||
for run level 5.
|
||||
- The configure script did not add the "crypto" library
|
||||
when checking for the OpenSSL library.
|
||||
- The OKIDATA PPD files were missing.
|
||||
- The config.h.in file defined the wrong version number.
|
||||
- The serial backend did not define "funky_hex" under *BSD.
|
||||
- Updated the Visual C++ project files and some of the
|
||||
CUPS API sources to compile under Windows again.
|
||||
|
||||
|
||||
CHANGES IN CUPS V1.1.5
|
||||
|
||||
- Security updates - new default configuration does
|
||||
not broadcast printer information and only allows
|
||||
access from the local system.
|
||||
- EXPERIMENTAL encryption support - CUPS now optionally
|
||||
supports TLS/SSL encryption via the OpenSSL library.
|
||||
- Documentation updates.
|
||||
- Makefile/configure script updates.
|
||||
- The RPM spec file didn't work out-of-the-box under
|
||||
RedHat or Mandrake.
|
||||
- Minor code cleanup to remove extraneous compiler
|
||||
warnings.
|
||||
- cupsTempFile() was using %p for the temporary
|
||||
filename; this should have been %08x (just 8 digit
|
||||
hex)
|
||||
- Deleting a printer with active print jobs would still
|
||||
crash the server.
|
||||
- ippWrite() and ipp_write_file() didn't send the
|
||||
correct value length for name-with-language and
|
||||
text-with-language attributes.
|
||||
- Updated IPP code to support copied strings (that
|
||||
should not be freed); this provides slightly more
|
||||
efficient IPP server performance.
|
||||
- Updated PDF filter to Xpdf 0.91.
|
||||
- httpGets() could go into an infinite loop if a line
|
||||
longer than the input buffer size was sent by a
|
||||
client. This could be used in a Denial-of-Service
|
||||
attack.
|
||||
- The lpstat and CUPS API functions now request only the
|
||||
data required when getting the list of printer or
|
||||
class information. This should improve performance
|
||||
with large numbers of printers on slower machines.
|
||||
- The scheduler was always enforcing the FilterLimit,
|
||||
even if FilterLimit was set to 0.
|
||||
- Updated the Linux USB backend to support Mandrake's
|
||||
/dev/usb/usblp# filenames.
|
||||
- The PRINTER and LPDEST environment variables did not
|
||||
override the lpoptions default printer.
|
||||
- The PPD read functions incorrectly included trailing
|
||||
characters (usually whitespace) after quoted string
|
||||
attributes.
|
||||
- The multiple-document-handling attribute handling code
|
||||
did not check for the correct value for collated
|
||||
copies (separate-documents-uncollated-copies).
|
||||
- The EPSON driver did not work with OKIDATA printers in
|
||||
EPSON emulation mode (needed change-emulation command)
|
||||
- The HP-GL/2 filter did not scale the plot properly in
|
||||
scale mode 2.
|
||||
- Added PPD files for 9-pin and 24-pin OKIDATA printers.
|
||||
- The httpSeparate() function didn't handle passwords
|
||||
that started with a number.
|
||||
- ippDelete() could free the character set string
|
||||
multiple times in name-with-language and
|
||||
text-with-language attributes.
|
||||
- The scheduler would access freed memory right after
|
||||
freeing it (for debug messages); these parts of the
|
||||
code have been reordered to avoid this situation
|
||||
which was causing sporatic errors and crashes.
|
||||
- The ppdClose() function didn't free all of the strings
|
||||
in the ppd_file_t structure.
|
||||
- The LoadAllJobs() function in the scheduler did not
|
||||
close the spool directory.
|
||||
- Changed all sprintf's that use string formats to
|
||||
snprintf's, even if the destination buffer is
|
||||
larger than the source string(s); this protects
|
||||
against buffer overflows caused outside of CUPS...
|
||||
- Changed all strcpy's to strncpy's between local and
|
||||
global variables, even if the destination buffer is
|
||||
larger than the source string; this protects
|
||||
against buffer overflows caused outside of CUPS...
|
||||
- The CUPS certificate functions didn't use the
|
||||
CUPS_SERVERROOT environment variable when set.
|
||||
- The directory services code was copying instead of
|
||||
comparing the remote printer info, resulting in
|
||||
unnecessary updates of the printer attributes for
|
||||
remote printers.
|
||||
- Added new mime.types rules to allow automatic raw
|
||||
printing of PCL and ESC/P files; PJL headers are
|
||||
parsed to differentiate between PostScript and
|
||||
PCL job files. This should eliminate a lot of
|
||||
the reports of SAMBA printing problems due to
|
||||
the missing "-oraw" or "-l" options.
|
||||
- The mimeLoadType() function didn't handle the
|
||||
3-argument contains() function.
|
||||
- The LoadPPDs() function in the scheduler didn't
|
||||
properly set the alloc_ppds variable or handle a PPD
|
||||
database containing 0 printers.
|
||||
- The scheduler FindAvailablePrinter() function didn't
|
||||
use the same queuing logic as the CheckJobs()
|
||||
function. This caused classes to stall if a remote
|
||||
printer was always busy.
|
||||
- Jobs are now assigned to printers in a class
|
||||
round-robin style. This should prevent the first
|
||||
server in the class from bearing the brunt of the
|
||||
jobs.
|
||||
- The scheduler's LoadAllJobs() function didn't always
|
||||
restore remote printers for queued jobs on startup.
|
||||
- The serial backend didn't support the higher baud
|
||||
rates with the old termios interface. It now supports
|
||||
57600 and 115200 baud.
|
||||
- The serial backend now supports different types of
|
||||
flow control; previously it ignored the flow=XYZ
|
||||
option in the device URI.
|
||||
- The serial backend now supports DTR/DSR flow control,
|
||||
which is popular on dot-matrix printers (access with
|
||||
"flow=dtrdsr" in the device URI)
|
||||
- Added new job-originating-host-name attribute for
|
||||
jobs. The new attribute provides the hostname or
|
||||
IP address of the machine that submitted the job.
|
||||
- The set-job-attributes code no longer allows read-only
|
||||
job attributes to be changed.
|
||||
- Expanded the click area for the navigation bar in the
|
||||
web interface.
|
||||
- Updated the lp and cancel commands to support all of
|
||||
the Solaris print options (some are simply ignored
|
||||
since they do not map)
|
||||
- Updated the scheduler to limit the number of file
|
||||
descriptors to the maximum select() set size. This
|
||||
was causing problems on Solaris systems where the
|
||||
max FD count was increased beyond 1024.
|
||||
- The scheduler's LoadDevices() function was getting
|
||||
interrupted by the SIGCHLD signal handler; now ignore
|
||||
child signals while loading devices.
|
||||
- Added quota and allow/deny user support for printers
|
||||
and classes.
|
||||
- Removed black/CMY adjustment code from the PS and
|
||||
image file RIPs; it was interfering with some CUPS
|
||||
driver dithering code.
|
||||
- The lpc program stopped listing the queue statuses
|
||||
after the first active printer.
|
||||
- The cups-lpd program used an output format that the
|
||||
Solaris printing system did not understand.
|
||||
- Updated the lpq program to use the Solaris format
|
||||
except under Tru64 UNIX.
|
||||
- Some DEC PPD files incorrectly use "Off" for the null
|
||||
value in UI constraints. Added "Off" to the list of
|
||||
accepted null values.
|
||||
- Changed the *BSD define constants to __*BSD__ in all
|
||||
of the backends.
|
||||
- Added support for "lpstat printername", which is an
|
||||
undocumented feature in Solaris.
|
||||
- The HP-GL/2 filter now only sets the plot size if it
|
||||
is set in the plot file.
|
||||
- The lpmove command wasn't sending the requesting
|
||||
user name, causing it to always fail.
|
||||
- Updated the cupsTempFile() code to use GetTempPath()
|
||||
under Windows.
|
||||
- The cups-lpd mini-daemon didn't limit the number of
|
||||
data files accepted, didn't use cupsTempFile(),
|
||||
didn't handle control file job information in any
|
||||
order, and didn't free job options after printing
|
||||
a file.
|
||||
- The scheduler copy_banner() function did not
|
||||
explicitly set the owner and permissions of the banner
|
||||
files, which could prevent the banner pages from
|
||||
printing on some systems.
|
||||
- The lpstat program wasn't listing remote classes.
|
||||
- The scheduler did not verify that the printer-uri
|
||||
attribute was specified in all requests that required
|
||||
it.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1.4
|
||||
|
||||
- Makefile and configure script fixes.
|
||||
- **** Changed the default Printcap setting **** to
|
||||
/etc/printcap. There are just too many people asking
|
||||
why application XYZ doesn't see their printers!
|
||||
- The web admin interface now displays an error if it
|
||||
can't get the list of printer drivers from cupsd.
|
||||
- The IPP backend was putting the copies option before
|
||||
the other job options were set. This caused the IPP
|
||||
request to contain attribute groups in the wrong
|
||||
order, which prevented remote printing.
|
||||
- Added checks in scheduler to free memory used for
|
||||
IPP requests and language information when closing
|
||||
a client connection.
|
||||
- Fixed the duplex option in the HP LaserJet driver. It
|
||||
should now work with all LaserJet printers (and
|
||||
compatibles)
|
||||
- The add-printer web interface didn't initialize the
|
||||
"old info" data pointer, which caused random crashes
|
||||
on many OS's.
|
||||
- Fixed many page sizes defined in the Level 1
|
||||
compatibility file "gs_statd.ps" to match reality.
|
||||
- Fixed another bug in the setpagedevice "code" in
|
||||
Ghostscript. It should now accept all standard
|
||||
Adobe attributes on all platforms.
|
||||
- Fixed pstoraster so that it reallocates memory for
|
||||
color depth changes as well as size/resolution
|
||||
changes. This removes an ordering constraint on
|
||||
the color, page size, and resolution options in
|
||||
PPD files.
|
||||
- The IPP backend didn't use the job's character set
|
||||
when the destination printer supported it. This
|
||||
caused problems when printing text files to other
|
||||
CUPS servers.
|
||||
- Updated the logic used to determine when to rebuild
|
||||
the PPD file database. The scheduler now checks the
|
||||
dates and the number of PPD files (was just checking
|
||||
the dates.)
|
||||
- Updated the ippSetCGIVars() function (used by the
|
||||
web interfaces) to only filter valid string values.
|
||||
- The PostScript filter was scaling 2-up pages
|
||||
incorrectly. This caused the edges of some pages to
|
||||
be clipped.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1.3
|
||||
|
||||
- Makefile fixes.
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
ENCRYPTION - CUPS v1.1.7 - 02/21/2001
|
||||
-------------------------------------
|
||||
|
||||
This file describes the encryption support provided by CUPS.
|
||||
|
||||
WARNING: CLIENTS CURRENTLY TRUST ALL CERTIFICATES FROM SERVERS.
|
||||
This makes the CUPS client applications vulnerable to "man in
|
||||
the middle" attacks, so we don't recommend using this to do
|
||||
remote administration over WANs at this time.
|
||||
|
||||
Future versions of CUPS will keep track of server certificates
|
||||
and provide a callback/confirmation interface for accepting new
|
||||
certificates and warning when a certificate has changed.
|
||||
|
||||
|
||||
LEGAL STUFF
|
||||
|
||||
BEFORE USING THE ENCRYPTION SUPPORT, PLEASE VERIFY THAT IT IS
|
||||
LEGAL TO DO SO IN YOUR COUNTRY. CUPS by itself doesn't include
|
||||
any encryption code, but it can link against the OpenSSL library
|
||||
which does.
|
||||
|
||||
|
||||
OVERVIEW OF ENCRYPTION SUPPORT IN CUPS
|
||||
|
||||
CUPS supports SSL/2.0, SSL/3.0, and TLS/1.0 encryption using
|
||||
keys as large as 128-bits. Encryption support is provided via
|
||||
the OpenSSL library and some new hooks in the CUPS code.
|
||||
|
||||
CUPS provides support for dedicated (https) and "upgrade" (TLS)
|
||||
encryption of sessions. The "HTTP Upgrade" method is described
|
||||
in RFC 2817; basically, the client can be secure or unsecure,
|
||||
and the client or server initiates an upgrade to a secure
|
||||
connection via some new HTTP fields and status codes. The HTTP
|
||||
Upgrade method is new and no browsers we know of support it yet.
|
||||
Stick with "https" for web browsers.
|
||||
|
||||
The current implementation is very basic. The CUPS client
|
||||
software (lp, lpr, etc.) uses encryption as requested by the
|
||||
user or server.
|
||||
|
||||
The user can specify the "-E" option with the printing commands
|
||||
to force encryption of the connection. Encryption can also be
|
||||
specified using the Encryption directive in the client.conf file
|
||||
or in the CUPS_ENCRYPTION environment variable:
|
||||
|
||||
Never
|
||||
|
||||
Never do encryption.
|
||||
|
||||
Always
|
||||
|
||||
Always do SSL/TLS encryption using the https scheme.
|
||||
|
||||
IfRequested
|
||||
|
||||
Upgrade to TLS encryption if the server asks for it.
|
||||
This is the default setting.
|
||||
|
||||
Required
|
||||
|
||||
Always upgrade to TLS encryption as soon as the
|
||||
connection is made. This is different than the "Always"
|
||||
mode above since the connection is initially unsecure
|
||||
and the client initiates the upgrade to TLS encryption.
|
||||
(same as using the "-E" option)
|
||||
|
||||
These keywords are also used in the cupsd.conf file to secure
|
||||
particular locations. To secure all traffic on the server, listen
|
||||
on port 443 (https port) instead of port 631 and change the "ipp"
|
||||
service listing (or add it if you don't have one) in /etc/services
|
||||
to 443. To provide both secure and normal methods, add a line
|
||||
reading:
|
||||
|
||||
SSLPort 443
|
||||
|
||||
to /etc/cups/cupsd.conf.
|
||||
|
||||
|
||||
BEFORE YOU BEGIN
|
||||
|
||||
You'll need the OpenSSL library from:
|
||||
|
||||
http://www.openssl.org
|
||||
|
||||
|
||||
CONFIGURING WITH ENCRYPTION SUPPORT
|
||||
|
||||
Once you have the OpenSSL library installed, you'll need to
|
||||
configure CUPS to use it with the "--enable-ssl" option:
|
||||
|
||||
./configure --enable-ssl
|
||||
|
||||
If the OpenSSL stuff is not in a standard location, make sure to
|
||||
define the CFLAGS, CXXFLAGS, and LDFLAGS environment variables
|
||||
with the appropriate compiler and linker options first.
|
||||
|
||||
|
||||
GENERATING A SERVER CERTIFICATE AND KEY
|
||||
|
||||
The following OpenSSL command will generate a server certificate
|
||||
and key that you can play with. Since the certificate is not
|
||||
properly signed it will generate all kinds of warnings in
|
||||
Netscape and MSIE:
|
||||
|
||||
openssl req -new -x509 -keyout /etc/cups/ssl/server.key \
|
||||
-out /etc/cups/ssl/server.crt -days 365 -nodes
|
||||
|
||||
chmod 600 /etc/cups/ssl/server.*
|
||||
|
||||
The "-nodes" option prevents the certificate and key from being
|
||||
encrypted. The cupsd process runs in the background, detached
|
||||
from any input source; if you encrypt these files then cupsd
|
||||
will not be able to load them!
|
||||
|
||||
Send all rants about non-encrypted certificate and key files to
|
||||
/dev/null. It makes sense to encrypt user files, but not for
|
||||
files used by system processes/daemons...
|
||||
|
||||
|
||||
REPORTING PROBLEMS
|
||||
|
||||
If you have problems, READ THE DOCUMENTATION FIRST! If the
|
||||
documentation does not solve your problems please send an email
|
||||
to "cups-support@cups.org". Include your operating system and
|
||||
version, compiler and version, and any errors or problems you've
|
||||
run into. The "/var/log/cups/error_log" file should also be sent,
|
||||
as it often helps to determine the cause of your problem.
|
||||
|
||||
If you are running a version of Linux, be sure to provide the
|
||||
Linux distribution you have, too.
|
||||
|
||||
Please note that the "cups-support@cups.org" email address goes
|
||||
to the CUPS developers; they are busy people, so your email may
|
||||
go unanswered for days or weeks. In general, only general build
|
||||
or distribution problems will actually get answered - for
|
||||
end-user support see the "README.txt" for a summary of the
|
||||
resources available.
|
||||
+157
@@ -0,0 +1,157 @@
|
||||
INSTALL - CUPS v1.1.7 - 05/01/2001
|
||||
----------------------------------
|
||||
|
||||
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 be found in
|
||||
"CHANGES.txt".
|
||||
|
||||
|
||||
BEFORE YOU BEGIN
|
||||
|
||||
You'll need ANSI-compliant C and C++ compilers, plus a make
|
||||
program and Bourne shell. The GNU compiler tools work well -
|
||||
we've tested the current CUPS code against GCC 2.95.x with
|
||||
excellent results.
|
||||
|
||||
The makefiles used by the project should work with all versions
|
||||
of make. We've tested them with GNU make as well as the make
|
||||
programs shipped by Compaq, HP, SGI, and Sun. FreeBSD users
|
||||
should use GNU make (gmake).
|
||||
|
||||
Besides these tools you'll want the following libraries:
|
||||
|
||||
- JPEG 6b or higher
|
||||
- PNG 1.0.6 or higher
|
||||
- TIFF 3.4 or higher
|
||||
- ZLIB 1.1.3 or higher
|
||||
|
||||
CUPS will compile and run without these, however you'll miss out on
|
||||
many of the features provided by CUPS.
|
||||
|
||||
|
||||
CONFIGURATION
|
||||
|
||||
CUPS uses GNU autoconf, so you should find the usual "configure"
|
||||
script in the main CUPS source directory. To configure CUPS for
|
||||
your system, type:
|
||||
|
||||
./configure ENTER
|
||||
|
||||
The default installation will put the CUPS software in the
|
||||
"/etc", "/usr", and "/var" directories on your system, which
|
||||
will overwrite any existing printing commands on your system.
|
||||
Use the "--prefix" option to install the CUPS software in
|
||||
another location:
|
||||
|
||||
./configure --prefix=/some/directory ENTER
|
||||
|
||||
If the PNG, JPEG, TIFF, and ZLIB libraries are not installed in
|
||||
a system default location (typically "/usr/include" and
|
||||
"/usr/lib") you'll need to set the CFLAGS, CXXFLAGS, and LDFLAGS
|
||||
environment variables prior to running configure:
|
||||
|
||||
setenv CFLAGS "-I/some/directory" ENTER
|
||||
setenv CXXFLAGS "-I/some/directory" ENTER
|
||||
setenv LDFLAGS "-L/some/directory" ENTER
|
||||
./configure ... ENTER
|
||||
|
||||
or:
|
||||
|
||||
CFLAGS="-I/some/directory"; export CFLAGS ENTER
|
||||
CXXFLAGS="-I/some/directory"; export CXXFLAGS ENTER
|
||||
LDFLAGS="-L/some/directory"; export LDFLAGS ENTER
|
||||
./configure ... ENTER
|
||||
|
||||
To enable support for encryption, you'll also want to add the
|
||||
"--enable-ssl" option:
|
||||
|
||||
./configure --enable-ssl
|
||||
|
||||
SSL and TLS support require the OpenSSL library, available at:
|
||||
|
||||
http://www.openssl.org
|
||||
|
||||
See the file "ENCRYPTION.txt" for information on using the
|
||||
encryption support in CUPS.
|
||||
|
||||
Once you have configured things, just type:
|
||||
|
||||
make ENTER
|
||||
|
||||
or if you have FreeBSD:
|
||||
|
||||
gmake ENTER
|
||||
|
||||
to build the software.
|
||||
|
||||
|
||||
INSTALLING THE SOFTWARE
|
||||
|
||||
Once you have built the software you need to install it. The
|
||||
"install" target provides a quick way to install the software on
|
||||
your local system:
|
||||
|
||||
make install ENTER
|
||||
|
||||
or for FreeBSD:
|
||||
|
||||
gmake install ENTER
|
||||
|
||||
You can also build binary packages that can be installed on other
|
||||
machines using the RPM spec file ("cups.spec") or EPM list file
|
||||
("cups.list"). The latter also supports building of binary RPMs,
|
||||
so it may be more convenient to use - we use EPM to build all of
|
||||
our binary distributions.
|
||||
|
||||
You can find the RPM software at:
|
||||
|
||||
http://www.rpm.org
|
||||
|
||||
The RPM software is at:
|
||||
|
||||
http://www.easysw.com/epm
|
||||
|
||||
|
||||
CREATING BINARY DISTRIBUTIONS WITH EPM
|
||||
|
||||
The top level makefile supports generation of many types of binary
|
||||
distributions using EPM. To build a binary distribution type:
|
||||
|
||||
make <format> ENTER
|
||||
|
||||
or
|
||||
|
||||
gmake <format> ENTER
|
||||
|
||||
for FreeBSD, where <format> is one of the following:
|
||||
|
||||
epm - Builds a portable shell script and tar file based
|
||||
distribution. This format will also backup your
|
||||
existing printing system if you decide to remove
|
||||
CUPS at some future time.
|
||||
rpm - Builds a RPM binary distribution.
|
||||
deb - Builds a Debian binary distribution.
|
||||
depot - Builds a HP-UX binary distribution.
|
||||
pkg - Builds a Solaris binary distribution.
|
||||
tardist - Builds an IRIX binary distribution.
|
||||
|
||||
|
||||
REPORTING PROBLEMS
|
||||
|
||||
If you have problems, READ THE DOCUMENTATION FIRST! If the
|
||||
documentation does not solve your problems please send an email
|
||||
to "cups-support@cups.org". Include your operating system and
|
||||
version, compiler and version, and any errors or problems you've
|
||||
run into. The "/var/log/cups/error_log" file should also be sent,
|
||||
as it often helps to determine the cause of your problem.
|
||||
|
||||
If you are running a version of Linux, be sure to provide the
|
||||
Linux distribution you have, too.
|
||||
|
||||
Please note that the "cups-support@cups.org" email address goes
|
||||
to the CUPS developers; they are busy people, so your email may
|
||||
go unanswered for days or weeks. In general, only general build
|
||||
or distribution problems will actually get answered - for
|
||||
end-user support see the "README.txt" for a summary of the
|
||||
resources available.
|
||||
+2
-2
@@ -7,11 +7,11 @@
|
||||
|
||||
<H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
|
||||
|
||||
<P ALIGN="CENTER">Copyright 1997-2000 by Easy Software Products<BR>
|
||||
<P ALIGN="CENTER">Copyright 1997-2001 by Easy Software Products<BR>
|
||||
44141 AIRPORT VIEW DR STE 204<BR>
|
||||
HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
|
||||
<BR>
|
||||
Voice: +1.301.373.9603<BR>
|
||||
Voice: +1.301.373.9600<BR>
|
||||
Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A><BR>
|
||||
WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>
|
||||
|
||||
|
||||
+11
-8
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Common makefile definitions for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -30,7 +30,6 @@ AR = @AR@
|
||||
AWK = @AWK@
|
||||
CC = @LIBTOOL@ @CC@
|
||||
CHMOD = @CHMOD@
|
||||
CHOWN = @CHOWN@
|
||||
CP = @CP@
|
||||
CXX = @LIBTOOL@ @CXX@
|
||||
DSO = @DSO@
|
||||
@@ -77,8 +76,9 @@ LIBZ = @LIBZ@
|
||||
#
|
||||
|
||||
ARFLAGS = crvs
|
||||
CFLAGS = @CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
|
||||
CXXFLAGS = @CXXFLAGS@ $(OPTIM) -I.. $(OPTIONS)
|
||||
CFLAGS = @CFLAGS@ -I.. $(OPTIONS)
|
||||
CXXFLAGS = @CXXFLAGS@ -I.. $(OPTIONS)
|
||||
DSOFLAGS = @DSOFLAGS@
|
||||
DSOLIBS = @DSOLIBS@
|
||||
IMGLIBS = @IMGLIBS@ -lm
|
||||
LDFLAGS = @LDFLAGS@ $(OPTIM)
|
||||
@@ -88,6 +88,7 @@ LIBS = $(LINKCUPS) $(NETLIBS) @LIBS@
|
||||
NETLIBS = @NETLIBS@
|
||||
OPTIM = @OPTIM@
|
||||
OPTIONS =
|
||||
SSLLIBS = @SSLLIBS@
|
||||
|
||||
#
|
||||
# Directories...
|
||||
@@ -118,6 +119,7 @@ srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
AMANDIR = @AMANDIR@
|
||||
BINDIR = @bindir@
|
||||
DATADIR = @CUPS_DATADIR@
|
||||
DOCDIR = @CUPS_DOCROOT@
|
||||
@@ -137,20 +139,21 @@ SERVERROOT = @CUPS_SERVERROOT@
|
||||
CAT1EXT = @CAT1EXT@
|
||||
CAT5EXT = @CAT5EXT@
|
||||
CAT8EXT = @CAT8EXT@
|
||||
MAN8EXT = @MAN8EXT@
|
||||
|
||||
#
|
||||
# Rules...
|
||||
#
|
||||
|
||||
.SILENT:
|
||||
.SUFFIXES: .a .c .cxx .h .man .o .0 .1 .5 .8 .z
|
||||
.SUFFIXES: .a .c .cxx .h .man .o .0 .1 .1m .5 .8 .z
|
||||
.c.o:
|
||||
echo Compiling $<...
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
$(CC) $(OPTIM) $(CFLAGS) -c $<
|
||||
.cxx.o:
|
||||
echo Compiling $<...
|
||||
$(CXX) $(CXXFLAGS) -c $<
|
||||
.man.0 .man.1 .man.5 .man.8:
|
||||
$(CXX) $(OPTIM) $(CXXFLAGS) -c $<
|
||||
.man.0 .man.1 .man.1m .man.5 .man.8:
|
||||
echo Formatting $<...
|
||||
$(RM) $@
|
||||
$(NROFF) -man $< >$@
|
||||
|
||||
+31
-8
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Top-level Makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -75,7 +75,7 @@ install:
|
||||
echo Installing in templates...
|
||||
(cd templates; $(MAKE) $(MFLAGS) install)
|
||||
echo Installing startup script...
|
||||
if test "x$INITDIR" != "x"; then \
|
||||
if test "x$(INITDIR)" != "x"; then \
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/init.d/cups; \
|
||||
$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
|
||||
@@ -83,23 +83,46 @@ install:
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
|
||||
ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/rc2.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/rc2.d/S99cups; \
|
||||
ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc2.d/S99cups; \
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \
|
||||
ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/rc5.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/rc5.d/S99cups; \
|
||||
ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc5.d/S99cups; \
|
||||
fi
|
||||
if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
|
||||
$(MKDIR) $(prefix)/$(INITDDIR); \
|
||||
$(RM) $(prefix)/$(INITDDIR)/cups; \
|
||||
$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \
|
||||
$(CHMOD) ugo+rx $(prefix)/$(INITDDIR)/cups; \
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Run the test suite...
|
||||
#
|
||||
|
||||
test: all
|
||||
echo Running CUPS test suite...
|
||||
cd test; ./run-stp-tests.sh
|
||||
|
||||
|
||||
#
|
||||
# Make software distributions using EPM (http://www.easysw.com/epm)...
|
||||
#
|
||||
|
||||
EPMFLAGS = -v \
|
||||
AMANDIR=$(AMANDIR) \
|
||||
BINDIR=$(BINDIR) DATADIR=$(DATADIR) \
|
||||
DOCDIR=$(DOCDIR) ESP_ROOT=$(ESP_ROOT) \
|
||||
INCLUDEDIR=$(INCLUDEDIR) LIBDIR=$(LIBDIR) \
|
||||
LOCALEDIR=$(LOCALEDIR) LOGDIR=$(LOGDIR) \
|
||||
MANDIR=$(MANDIR) PAMDIR=$(PAMDIR) \
|
||||
REQUESTS=$(REQUESTS) SBINDIR=$(SBINDIR) \
|
||||
SERVERBIN=$(SERVERBIN) SERVERROOT=$(SERVERROOT)
|
||||
DOCDIR=$(DOCDIR) INCLUDEDIR=$(INCLUDEDIR) \
|
||||
LIBDIR=$(LIBDIR) LOCALEDIR=$(LOCALEDIR) \
|
||||
LOGDIR=$(LOGDIR) MANDIR=$(MANDIR) \
|
||||
PAMDIR=$(PAMDIR) REQUESTS=$(REQUESTS) \
|
||||
SBINDIR=$(SBINDIR) SERVERBIN=$(SERVERBIN) \
|
||||
SERVERROOT=$(SERVERROOT)
|
||||
|
||||
epm:
|
||||
epm $(EPMFLAGS) cups
|
||||
|
||||
+138
-128
@@ -1,52 +1,59 @@
|
||||
README - CUPS v1.1.3 - 09/18/2000
|
||||
README - CUPS v1.1.7 - 05/01/2001
|
||||
---------------------------------
|
||||
|
||||
Looking for compile instructions? Read the file "INSTALL.txt"
|
||||
instead...
|
||||
|
||||
|
||||
INTRODUCTION
|
||||
|
||||
CUPS provides a portable printing layer for UNIX(r)-based operating
|
||||
systems. It has been developed by Easy Software Products to promote a
|
||||
standard printing solution for all UNIX vendors and users. CUPS
|
||||
provides the System V and Berkeley command-line interfaces.
|
||||
CUPS provides a portable printing layer for UNIX(r)-based
|
||||
operating systems. It has been developed by Easy Software
|
||||
Products to promote a standard printing solution for all UNIX
|
||||
vendors and users. CUPS provides the System V and Berkeley
|
||||
command-line interfaces.
|
||||
|
||||
CUPS uses the Internet Printing Protocol ("IPP") as the basis for
|
||||
managing print jobs and queues. The Line Printer Daemon ("LPD") Server
|
||||
Message Block ("SMB"), and AppSocket (a.k.a. JetDirect) protocols are
|
||||
also supported with reduced functionality. CUPS adds network printer
|
||||
browsing and PostScript Printer Description ("PPD") based printing
|
||||
options to support real-world printing under UNIX.
|
||||
CUPS uses the Internet Printing Protocol ("IPP") as the basis
|
||||
for managing print jobs and queues. The Line Printer Daemon
|
||||
("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a.
|
||||
JetDirect) protocols are also supported with reduced
|
||||
functionality. CUPS adds network printer browsing and
|
||||
PostScript Printer Description ("PPD") based printing options to
|
||||
support real-world printing under UNIX.
|
||||
|
||||
CUPS also includes a customized version of GNU Ghostscript (currently
|
||||
based off GNU Ghostscript 5.50) and an image file RIP that are used to
|
||||
support non-PostScript printers. Sample drivers for HP and EPSON
|
||||
printers are included that use these filters.
|
||||
CUPS also includes a customized version of GNU Ghostscript
|
||||
(currently based off GNU Ghostscript 5.50) and an image file RIP
|
||||
that are used to support non-PostScript printers. Sample
|
||||
drivers for HP and EPSON printers are included that use these
|
||||
filters.
|
||||
|
||||
Drivers for over 2300 printers are provided with our ESP Print Pro
|
||||
software, available at:
|
||||
Drivers for over 2300 printers are provided with our ESP Print
|
||||
Pro software, available at:
|
||||
|
||||
http://www.easysw.com/printpro
|
||||
|
||||
CUPS is licensed under the GNU General Public License and GNU Library
|
||||
General Public License. Please contact Easy Software Products for
|
||||
commercial support and "binary distribution" rights.
|
||||
CUPS is licensed under the GNU General Public License and GNU
|
||||
Library General Public License. Please contact Easy Software
|
||||
Products for commercial support and "binary distribution"
|
||||
rights.
|
||||
|
||||
|
||||
SYSTEM REQUIREMENTS
|
||||
|
||||
Binary distributions require a minimum of 10MB of free disk space. We
|
||||
do not recommend using CUPS on a workstation with less than 32MB of RAM
|
||||
or a PC with less than 16MB of RAM.
|
||||
Binary distributions require a minimum of 10MB of free disk
|
||||
space. We do not recommend using CUPS on a workstation with less
|
||||
than 32MB of RAM or a PC with less than 16MB of RAM.
|
||||
|
||||
If you are installing from source you'll need ANSI-compliant C and C++
|
||||
compilers and optionally one or more image file support libraries.
|
||||
Complete source installation instructions can be found in the CUPS
|
||||
System Administrator's Manual in the files "doc/sam.html" or
|
||||
"doc/sam.pdf".
|
||||
If you are installing from source you'll need ANSI-compliant C
|
||||
and C++ compilers and optionally one or more image file support
|
||||
libraries. Complete source installation instructions can be
|
||||
found in the file "INSTALL.txt".
|
||||
|
||||
|
||||
SOFTWARE REQUIREMENTS
|
||||
|
||||
The following operating system software is required to install one of
|
||||
the binary distributions from Easy Software Products:
|
||||
The following operating system software is required to install
|
||||
one of the binary distributions from Easy Software Products:
|
||||
|
||||
- Digital UNIX (aka OSF1 aka Compaq Tru64 UNIX) 4.0 or higher
|
||||
- HP-UX 10.20 or higher
|
||||
@@ -57,77 +64,104 @@ the binary distributions from Easy Software Products:
|
||||
|
||||
INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
|
||||
|
||||
We are currently distributing "portable" CUPS binary distributions in
|
||||
TAR format with installation and removal scripts generated by our ESP
|
||||
Package Manager (EPM) software, which is available from:
|
||||
We are currently distributing "portable" CUPS binary
|
||||
distributions in TAR format with installation and removal
|
||||
scripts generated by our ESP Package Manager (EPM) software,
|
||||
which is available from:
|
||||
|
||||
http://www.easysw.com/epm
|
||||
|
||||
WARNING: Installing CUPS will overwrite your existing printing system.
|
||||
Backup files are made by the installation script and restored by the
|
||||
removal script, so if you experience problems you should be able to
|
||||
remove the CUPS software to restore your previous configuration.
|
||||
However, Easy Software Products makes no warranty for this and will not
|
||||
be liable for any lost revenues, etc.
|
||||
WARNING: Installing CUPS will overwrite your existing printing
|
||||
system. Backup files are made by the installation script and
|
||||
restored by the removal script, so if you experience problems
|
||||
you should be able to remove the CUPS software to restore your
|
||||
previous configuration. However, Easy Software Products makes
|
||||
no warranty for this and will not be liable for any lost
|
||||
revenues, etc.
|
||||
|
||||
To install the CUPS software you will need to be logged in as root
|
||||
(doing an "su" is good enough). Once you are the root user, run the
|
||||
installation script with:
|
||||
To install the CUPS software you will need to be logged in as
|
||||
root (doing an "su" is good enough). Once you are the root
|
||||
user, run the installation script with:
|
||||
|
||||
./cups.install ENTER
|
||||
|
||||
After asking you a few yes/no questions the CUPS software will be
|
||||
installed and the scheduler will be started automatically.
|
||||
After asking you a few yes/no questions the CUPS software will
|
||||
be installed and the scheduler will be started automatically.
|
||||
|
||||
|
||||
INSTALLING HOST-SPECIFIC (RPM, DEBIAN, ETC.) DISTRIBUTIONS
|
||||
|
||||
The host-specific distributions use the operating system software
|
||||
installation tools. To install a host-specific distribution please
|
||||
consult the CUPS Software Administrators Manual or your operating
|
||||
system documentation.
|
||||
The host-specific distributions use the operating system
|
||||
software installation tools. To install a host-specific
|
||||
distribution please consult the CUPS Software Administrators
|
||||
Manual or your operating system documentation.
|
||||
|
||||
|
||||
READING THE DOCUMENTATION
|
||||
|
||||
Once you have installed the software you can access the documentation
|
||||
(and a bunch of other stuff) on-line at:
|
||||
Once you have installed the software you can access the
|
||||
documentation (and a bunch of other stuff) on-line at:
|
||||
|
||||
http://localhost:631
|
||||
|
||||
If you're having trouble getting that far, the documentation is located
|
||||
in the "/usr/share/doc/cups" directory in the binary distributions, and
|
||||
under the "doc" directory in the source archives.
|
||||
If you're having trouble getting that far, the documentation is
|
||||
located in the "/usr/share/doc/cups" directory in the binary
|
||||
distributions, and under the "doc" directory in the source
|
||||
archives.
|
||||
|
||||
Please read the documentation before asking questions.
|
||||
|
||||
|
||||
GETTING SUPPORT AND OTHER RESOURCES
|
||||
|
||||
If you have problems, READ THE DOCUMENTATION FIRST!
|
||||
|
||||
You can subscribe to the CUPS mailing list by sending a message
|
||||
containing "subscribe cups" to majordomo@cups.org. This list is
|
||||
provided to discuss problems, questions, and improvements to the
|
||||
CUPS software. New releases of CUPS are announced to this list
|
||||
as well.
|
||||
|
||||
Commercial support (with a guaranteed response time) is
|
||||
available from Easy Software Products. For more information
|
||||
see:
|
||||
|
||||
http://www.easysw.com/cups
|
||||
|
||||
See the CUPS web site at "http://www.cups.org" for other site
|
||||
links.
|
||||
|
||||
|
||||
SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
|
||||
|
||||
CUPS 1.1 includes a new web-based administration tool that allows you
|
||||
to manage printers, classes, and jobs on your server. To access the
|
||||
printer administration tools open the following URL in your browser:
|
||||
CUPS 1.1 includes a new web-based administration tool that
|
||||
allows you to manage printers, classes, and jobs on your
|
||||
server. To access the printer administration tools open the
|
||||
following URL in your browser:
|
||||
|
||||
http://localhost:631/admin
|
||||
|
||||
You will be asked for the administration password (root or any other
|
||||
user in the sys/system/root group on your system) and then shown a
|
||||
menu of available functions.
|
||||
You will be asked for the administration password (root or any
|
||||
other user in the sys/system/root group on your system) and then
|
||||
shown a menu of available functions.
|
||||
|
||||
DO NOT use the hostname for your machine - it will not work with the
|
||||
default CUPS configuration. To enable administration access on other
|
||||
addresses, consult the CUPS Software Administrators Manual.
|
||||
DO NOT use the hostname for your machine - it will not work with
|
||||
the default CUPS configuration. To enable administration access
|
||||
on other addresses, consult the CUPS Software Administrators
|
||||
Manual.
|
||||
|
||||
|
||||
SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
|
||||
|
||||
CUPS works best with PPD (PostScript Printer Description) files. In a
|
||||
pinch you can also use System V style printer interface scripts.
|
||||
CUPS works best with PPD (PostScript Printer Description)
|
||||
files. In a pinch you can also use System V style printer
|
||||
interface scripts.
|
||||
|
||||
Six sample PPD files are provided with this distribution that utilize
|
||||
the PostScript and image file RIPs and the sample EPSON and HP printer
|
||||
drivers. To add the sample DeskJet driver to the system for a printer
|
||||
connected to the parallel port, use one of the following commands:
|
||||
Six sample PPD files are provided with this distribution that
|
||||
utilize the PostScript and image file RIPs and the sample EPSON
|
||||
and HP printer drivers. To add the sample DeskJet driver to the
|
||||
system for a printer connected to the parallel port, use one of
|
||||
the following commands:
|
||||
|
||||
Digital UNIX:
|
||||
|
||||
@@ -163,91 +197,67 @@ Similarly, for the other sample drivers you can use:
|
||||
EPSON 9-pin Series epson9.ppd
|
||||
EPSON 24-pin Series epson24.ppd
|
||||
|
||||
These sample drivers provide basic printing capabilities, but generally
|
||||
do not exercise the full potential of the printers or CUPS. For
|
||||
commercial printer drivers check out our ESP Print Pro software at:
|
||||
These sample drivers provide basic printing capabilities, but
|
||||
generally do not exercise the full potential of the printers or
|
||||
CUPS. For commercial printer drivers check out our ESP Print
|
||||
Pro software at:
|
||||
|
||||
http://www.easysw.com/printpro
|
||||
|
||||
|
||||
PRINTING FILES
|
||||
|
||||
CUPS provides both the System V "lp" and Berkeley "lpr" commands for
|
||||
printing:
|
||||
CUPS provides both the System V "lp" and Berkeley "lpr" commands
|
||||
for printing:
|
||||
|
||||
lp 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 -omedia=A4 -oresolution=600dpi filename
|
||||
lpr -omedia=A4 -oresolution=600dpi filename
|
||||
|
||||
CUPS recognizes many types of images files as well as PDF, PostScript,
|
||||
HP-GL/2, and text files, so you can print those files directly rather
|
||||
than through an application.
|
||||
CUPS recognizes many types of images files as well as PDF,
|
||||
PostScript, HP-GL/2, and text files, so you can print those
|
||||
files directly rather than through an application.
|
||||
|
||||
If you have an application that generates output specifically for your
|
||||
printer then you need to use the "-oraw" or "-l" options:
|
||||
If you have an application that generates output specifically
|
||||
for your printer then you need to use the "-oraw" or "-l"
|
||||
options:
|
||||
|
||||
lp -oraw filename
|
||||
lpr -l filename
|
||||
|
||||
This will prevent the filters from misinterpreting your print file.
|
||||
|
||||
|
||||
REPORTING PROBLEMS
|
||||
|
||||
If you have problems, READ THE DOCUMENTATION FIRST! If the
|
||||
documentation does not solve your problems please send an email to
|
||||
cups-support@cups.org. Include your operating system and version,
|
||||
compiler and version, and any errors or problems you've run into. The
|
||||
/var/log/error_log file should also be sent, as it often helps to
|
||||
determine the cause of your problem.
|
||||
|
||||
If you are running a version of Linux, be sure to provide the Linux
|
||||
distribution you have, too.
|
||||
|
||||
Please note that the "cups-support@cups.org" email address goes to the
|
||||
CUPS developers; they are busy people, so your email may go unanswered
|
||||
for days or weeks. Commercial support (with a guaranteed response
|
||||
time) is available from Easy Software Products.
|
||||
|
||||
|
||||
OTHER RESOURCES
|
||||
|
||||
See the CUPS web site at "http://www.cups.org" for other site links.
|
||||
|
||||
You can subscribe to the CUPS mailing list by sending a message
|
||||
containing "subscribe cups" to majordomo@cups.org. This list is
|
||||
provided to discuss problems, questions, and improvements to the CUPS
|
||||
software. New releases of CUPS are announced to this list as well.
|
||||
This will prevent the filters from misinterpreting your print
|
||||
file.
|
||||
|
||||
|
||||
LEGAL STUFF
|
||||
|
||||
CUPS is Copyright 1993-2000 by Easy Software Products. CUPS, the CUPS
|
||||
logo, and the Common UNIX Printing System are the trademark property of
|
||||
Easy Software Products.
|
||||
CUPS is Copyright 1993-2001 by Easy Software Products. CUPS,
|
||||
the CUPS logo, and the Common UNIX Printing System are the
|
||||
trademark property of Easy Software Products.
|
||||
|
||||
The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
|
||||
|
||||
The PostScript RIP software (pstoraster) is based on the GNU
|
||||
Ghostscript 5.50 core, Copyright 1986-1998 by Aladdin Enterprises.
|
||||
Ghostscript 5.50 core, Copyright 1986-1998 by Aladdin
|
||||
Enterprises.
|
||||
|
||||
The PDF filter (pdftops) is based on the Xpdf 0.90 software, Copyright
|
||||
1996-1999 by Derek B. Noonburg.
|
||||
The PDF filter (pdftops) is based on the Xpdf 0.90 software,
|
||||
Copyright 1996-1999 by Derek B. Noonburg.
|
||||
|
||||
This software is based in part on the work of the Independent JPEG
|
||||
Group.
|
||||
This software is based in part on the work of the Independent
|
||||
JPEG Group.
|
||||
|
||||
CUPS is provided under the terms of the GNU General Public License and
|
||||
GNU Library General Public License. This program is distributed in the
|
||||
hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
|
||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
PURPOSE. See the "LICENSE.html", "LICENSE.txt", or "cups.license" files
|
||||
for more information.
|
||||
CUPS is provided under the terms of the GNU General Public
|
||||
License and GNU Library General Public License. This program is
|
||||
distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
or FITNESS FOR A PARTICULAR PURPOSE. See the "LICENSE.html",
|
||||
"LICENSE.txt", or "cups.license" files for more information.
|
||||
|
||||
For commercial licensing information, please contact:
|
||||
|
||||
@@ -256,11 +266,11 @@ For commercial licensing information, please contact:
|
||||
44141 Airport View Drive, Suite 204
|
||||
Hollywood, Maryland 20636-3111 USA
|
||||
|
||||
Voice: +1.301.373.9603
|
||||
Voice: +1.301.373.9600
|
||||
Email: cups-info@cups.org
|
||||
WWW: http://www.cups.org
|
||||
|
||||
Note that commercial licensors may also require a license from Artifex
|
||||
Software Inc. which handles commercial licensing of the Ghostscript
|
||||
software, and from Derek B. Noonburg who developed the Xpdf software
|
||||
used to print PDF files.
|
||||
Note that commercial licensors may also require a license from
|
||||
Artifex Software Inc. which handles commercial licensing of the
|
||||
Ghostscript software, and from Derek B. Noonburg who developed
|
||||
the Xpdf software used to print PDF files.
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Backend makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Backend test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+277
-277
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,7 +23,8 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* main() - Send a file to the printer or server.
|
||||
* main() - Send a file to the printer or server.
|
||||
* password_cb() - Disable the password prompt for cupsDoFileRequest().
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -41,6 +42,20 @@
|
||||
#include <signal.h>
|
||||
|
||||
|
||||
/*
|
||||
* Local functions...
|
||||
*/
|
||||
|
||||
const char *password_cb(const char *);
|
||||
|
||||
|
||||
/*
|
||||
* Local globals...
|
||||
*/
|
||||
|
||||
char *password = NULL;
|
||||
|
||||
|
||||
/*
|
||||
* 'main()' - Send a file to the printer or server.
|
||||
*
|
||||
@@ -53,6 +68,7 @@ int /* O - Exit status */
|
||||
main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
char *argv[]) /* I - Command-line arguments */
|
||||
{
|
||||
int i; /* Looping var */
|
||||
int num_options; /* Number of printer options */
|
||||
cups_option_t *options; /* Printer options */
|
||||
char method[255], /* Method in URI */
|
||||
@@ -61,21 +77,20 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
resource[1024], /* Resource info (printer name) */
|
||||
filename[1024]; /* File to print */
|
||||
int port; /* Port number (not used) */
|
||||
char password[255], /* Password info */
|
||||
uri[HTTP_MAX_URI];/* Updated URI without user/pass */
|
||||
http_status_t status; /* Status of HTTP job */
|
||||
char uri[HTTP_MAX_URI];/* Updated URI without user/pass */
|
||||
ipp_status_t ipp_status; /* Status of IPP request */
|
||||
FILE *fp; /* File to print */
|
||||
http_t *http; /* HTTP connection */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *job_id; /* job-id attribute */
|
||||
*response, /* IPP response */
|
||||
*supported; /* get-printer-attributes response */
|
||||
ipp_attribute_t *job_id_attr; /* job-id attribute */
|
||||
int job_id; /* job-id value */
|
||||
ipp_attribute_t *job_state; /* job-state attribute */
|
||||
ipp_attribute_t *copies_sup; /* copies-supported attribute */
|
||||
ipp_attribute_t *charset_sup; /* charset-supported attribute */
|
||||
ipp_attribute_t *format_sup; /* document-format-supported attribute */
|
||||
const char *charset; /* Character set to use */
|
||||
cups_lang_t *language; /* Default language */
|
||||
struct stat fileinfo; /* File statistics */
|
||||
size_t nbytes, /* Number of bytes written */
|
||||
tbytes; /* Total bytes written */
|
||||
char buffer[8192]; /* Output buffer */
|
||||
int copies; /* Number of copies remaining */
|
||||
const char *content_type; /* CONTENT_TYPE environment variable */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
@@ -84,6 +99,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
int version; /* IPP version */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
char *s;
|
||||
@@ -115,27 +140,27 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Copy stdin to a temporary file...
|
||||
*/
|
||||
|
||||
FILE *fp; /* Temporary file */
|
||||
int fd; /* Temporary file */
|
||||
char buffer[8192]; /* Buffer for copying */
|
||||
int bytes; /* Number of bytes read */
|
||||
|
||||
|
||||
if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
|
||||
if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
|
||||
{
|
||||
perror("ERROR: unable to create temporary file");
|
||||
return (1);
|
||||
}
|
||||
|
||||
while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
|
||||
if (fwrite(buffer, 1, bytes, fp) < bytes)
|
||||
if (write(fd, buffer, bytes) < bytes)
|
||||
{
|
||||
perror("ERROR: unable to write to temporary file");
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
unlink(filename);
|
||||
return (1);
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -143,24 +168,26 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
filename[sizeof(filename) - 1] = '\0';
|
||||
}
|
||||
|
||||
/*
|
||||
* Open the print file...
|
||||
*/
|
||||
|
||||
if ((fp = fopen(filename, "rb")) == NULL)
|
||||
{
|
||||
perror("ERROR: Unable to open print file");
|
||||
return (1);
|
||||
}
|
||||
else
|
||||
stat(filename, &fileinfo);
|
||||
|
||||
/*
|
||||
* Extract the hostname and printer name from the URI...
|
||||
*/
|
||||
|
||||
httpSeparate(argv[0], method, username, hostname, &port, resource);
|
||||
|
||||
/*
|
||||
* Set the authentication info, if any...
|
||||
*/
|
||||
|
||||
cupsSetPasswordCB(password_cb);
|
||||
|
||||
if (username[0])
|
||||
{
|
||||
if ((password = strchr(username, ':')) != NULL)
|
||||
*password++ = '\0';
|
||||
|
||||
cupsSetUser(username);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try connecting to the remote server...
|
||||
*/
|
||||
@@ -200,9 +227,12 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* don't support the copies attribute...
|
||||
*/
|
||||
|
||||
language = cupsLangDefault();
|
||||
copies_sup = NULL;
|
||||
version = 1;
|
||||
language = cupsLangDefault();
|
||||
charset_sup = NULL;
|
||||
copies_sup = NULL;
|
||||
format_sup = NULL;
|
||||
version = 1;
|
||||
supported = NULL;
|
||||
|
||||
do
|
||||
{
|
||||
@@ -225,143 +255,65 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
/*
|
||||
* Now fill in the HTTP request stuff...
|
||||
*/
|
||||
|
||||
httpClearFields(http);
|
||||
httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
|
||||
if (username[0])
|
||||
{
|
||||
httpEncode64(password, username);
|
||||
httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
|
||||
}
|
||||
|
||||
sprintf(buffer, "%u", ippLength(request));
|
||||
httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
|
||||
|
||||
/*
|
||||
* Do the request...
|
||||
*/
|
||||
|
||||
for (;;)
|
||||
if ((supported = cupsDoRequest(http, request, resource)) == NULL)
|
||||
ipp_status = cupsLastError();
|
||||
else
|
||||
ipp_status = supported->request.status.status_code;
|
||||
|
||||
if (ipp_status > IPP_OK_CONFLICT)
|
||||
{
|
||||
/*
|
||||
* POST the request, retrying as needed...
|
||||
*/
|
||||
if (supported)
|
||||
ippDelete(supported);
|
||||
|
||||
if (httpPost(http, resource))
|
||||
if (ipp_status == IPP_PRINTER_BUSY ||
|
||||
ipp_status == IPP_SERVICE_UNAVAILABLE)
|
||||
{
|
||||
fputs("INFO: Unable to POST get-printer-attributes request; retrying...\n", stderr);
|
||||
fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
|
||||
sleep(10);
|
||||
httpReconnect(http);
|
||||
continue;
|
||||
}
|
||||
|
||||
fputs("INFO: POST successful, sending IPP request...\n", stderr);
|
||||
|
||||
/*
|
||||
* Send the IPP request...
|
||||
*/
|
||||
|
||||
request->state = IPP_IDLE;
|
||||
|
||||
if (ippWrite(http, request) == IPP_ERROR)
|
||||
else if ((ipp_status == IPP_BAD_REQUEST ||
|
||||
ipp_status == IPP_VERSION_NOT_SUPPORTED) && version == 1)
|
||||
{
|
||||
fputs("ERROR: Unable to send IPP request!\n", stderr);
|
||||
status = HTTP_ERROR;
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* Switch to IPP/1.0...
|
||||
*/
|
||||
|
||||
fputs("INFO: IPP request sent, getting status...\n", stderr);
|
||||
|
||||
/*
|
||||
* Finally, check the status from the HTTP server...
|
||||
*/
|
||||
|
||||
while ((status = httpUpdate(http)) == HTTP_CONTINUE);
|
||||
|
||||
if (status == HTTP_OK)
|
||||
{
|
||||
response = ippNew();
|
||||
ippRead(http, response);
|
||||
|
||||
ipp_status = response->request.status.status_code;
|
||||
|
||||
if (ipp_status > IPP_OK_CONFLICT)
|
||||
{
|
||||
if (ipp_status == IPP_PRINTER_BUSY ||
|
||||
ipp_status == IPP_SERVICE_UNAVAILABLE)
|
||||
{
|
||||
fputs("INFO: Printer busy; will retry in 10 seconds...\n", stderr);
|
||||
sleep(10);
|
||||
}
|
||||
else if (ipp_status == IPP_BAD_REQUEST && version == 1)
|
||||
{
|
||||
/*
|
||||
* Switch to IPP/1.0...
|
||||
*/
|
||||
|
||||
fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n", stderr);
|
||||
version = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "ERROR: Printer will not accept print file (%x)!\n",
|
||||
ipp_status);
|
||||
fprintf(stderr, "ERROR: %s\n", ippErrorString(ipp_status));
|
||||
status = HTTP_ERROR;
|
||||
}
|
||||
}
|
||||
else if ((copies_sup = ippFindAttribute(response, "copies-supported",
|
||||
IPP_TAG_RANGE)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Has the "copies-supported" attribute - does it have an upper
|
||||
* bound > 1?
|
||||
*/
|
||||
|
||||
if (copies_sup->values[0].range.upper <= 1)
|
||||
copies_sup = NULL; /* No */
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
fputs("INFO: Printer does not support IPP/1.1, trying IPP/1.0...\n", stderr);
|
||||
version = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
response = NULL;
|
||||
|
||||
if (status == HTTP_ERROR)
|
||||
{
|
||||
fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
|
||||
errno);
|
||||
status = HTTP_OK;
|
||||
ipp_status = IPP_PRINTER_BUSY;
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "ERROR: Validate request was not accepted (%d)!\n",
|
||||
status);
|
||||
ipp_status = IPP_FORBIDDEN;
|
||||
}
|
||||
}
|
||||
|
||||
httpFlush(http);
|
||||
|
||||
break;
|
||||
fprintf(stderr, "ERROR: Printer will not accept print file (%s)!\n",
|
||||
ippErrorString(ipp_status));
|
||||
}
|
||||
|
||||
if (status != HTTP_OK)
|
||||
else if ((copies_sup = ippFindAttribute(supported, "copies-supported",
|
||||
IPP_TAG_RANGE)) != NULL)
|
||||
{
|
||||
if (fp != stdin)
|
||||
fclose(fp);
|
||||
/*
|
||||
* Has the "copies-supported" attribute - does it have an upper
|
||||
* bound > 1?
|
||||
*/
|
||||
|
||||
httpClose(http);
|
||||
|
||||
return (1);
|
||||
if (copies_sup->values[0].range.upper <= 1)
|
||||
copies_sup = NULL; /* No */
|
||||
}
|
||||
|
||||
charset_sup = ippFindAttribute(supported, "charset-supported",
|
||||
IPP_TAG_CHARSET);
|
||||
format_sup = ippFindAttribute(supported, "document-format-supported",
|
||||
IPP_TAG_MIMETYPE);
|
||||
|
||||
if (format_sup)
|
||||
{
|
||||
fprintf(stderr, "DEBUG: document-format-supported (%d values)\n",
|
||||
format_sup->num_values);
|
||||
for (i = 0; i < format_sup->num_values; i ++)
|
||||
fprintf(stderr, "DEBUG: [%d] = \"%s\"\n", i,
|
||||
format_sup->values[i].string.text);
|
||||
}
|
||||
else if (ipp_status > IPP_OK_CONFLICT)
|
||||
httpReconnect(http);
|
||||
}
|
||||
while (ipp_status > IPP_OK_CONFLICT);
|
||||
|
||||
@@ -392,6 +344,43 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
else
|
||||
copies = atoi(argv[4]);
|
||||
|
||||
/*
|
||||
* Figure out the character set to use...
|
||||
*/
|
||||
|
||||
charset = language ? cupsLangEncoding(language) : "us-ascii";
|
||||
|
||||
if (charset_sup)
|
||||
{
|
||||
/*
|
||||
* See if IPP server supports the requested character set...
|
||||
*/
|
||||
|
||||
for (i = 0; i < charset_sup->num_values; i ++)
|
||||
if (strcasecmp(charset, charset_sup->values[i].string.text) == 0)
|
||||
break;
|
||||
|
||||
/*
|
||||
* If not, choose us-ascii or utf-8...
|
||||
*/
|
||||
|
||||
if (i >= charset_sup->num_values)
|
||||
{
|
||||
/*
|
||||
* See if us-ascii is supported...
|
||||
*/
|
||||
|
||||
for (i = 0; i < charset_sup->num_values; i ++)
|
||||
if (strcasecmp("us-ascii", charset_sup->values[i].string.text) == 0)
|
||||
break;
|
||||
|
||||
if (i < charset_sup->num_values)
|
||||
charset = "us-ascii";
|
||||
else
|
||||
charset = "utf-8";
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Then issue the print-job request...
|
||||
*/
|
||||
@@ -408,7 +397,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, "utf-8");
|
||||
"attributes-charset", NULL, charset);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL,
|
||||
@@ -436,144 +425,57 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
options = NULL;
|
||||
num_options = cupsParseOptions(argv[5], 0, &options);
|
||||
|
||||
if ((content_type = getenv("CONTENT_TYPE")) != NULL &&
|
||||
strcasecmp(content_type, "application/vnd.cups-raw") == 0)
|
||||
num_options = cupsAddOption("raw", "", num_options, &options);
|
||||
if ((content_type = getenv("CONTENT_TYPE")) != NULL && format_sup != NULL)
|
||||
{
|
||||
for (i = 0; i < format_sup->num_values; i ++)
|
||||
if (strcasecmp(content_type, format_sup->values[i].string.text) == 0)
|
||||
break;
|
||||
|
||||
if (copies_sup)
|
||||
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
|
||||
if (i < format_sup->num_values)
|
||||
num_options = cupsAddOption("document-format", content_type,
|
||||
num_options, &options);
|
||||
}
|
||||
|
||||
cupsEncodeOptions(request, num_options, options);
|
||||
cupsFreeOptions(num_options, options);
|
||||
|
||||
/*
|
||||
* Now fill in the HTTP request stuff...
|
||||
*/
|
||||
|
||||
httpClearFields(http);
|
||||
httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
|
||||
if (username[0])
|
||||
{
|
||||
httpEncode64(password, username);
|
||||
httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
|
||||
}
|
||||
|
||||
sprintf(buffer, "%u", ippLength(request) + (size_t)fileinfo.st_size);
|
||||
httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
|
||||
if (copies_sup)
|
||||
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
|
||||
|
||||
/*
|
||||
* Do the request...
|
||||
*/
|
||||
|
||||
for (;;)
|
||||
if ((response = cupsDoFileRequest(http, request, resource, filename)) == NULL)
|
||||
ipp_status = cupsLastError();
|
||||
else
|
||||
ipp_status = response->request.status.status_code;
|
||||
|
||||
if (ipp_status > IPP_OK_CONFLICT)
|
||||
{
|
||||
/*
|
||||
* POST the request, retrying as needed...
|
||||
*/
|
||||
|
||||
httpReconnect(http);
|
||||
|
||||
if (httpPost(http, resource))
|
||||
if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
|
||||
ipp_status == IPP_PRINTER_BUSY)
|
||||
{
|
||||
fputs("INFO: Unable to POST print request; retrying...\n", stderr);
|
||||
fputs("INFO: Printer is busy; retrying print job...\n", stderr);
|
||||
sleep(10);
|
||||
continue;
|
||||
}
|
||||
|
||||
fputs("INFO: POST successful, sending IPP request...\n", stderr);
|
||||
|
||||
/*
|
||||
* Send the IPP request...
|
||||
*/
|
||||
|
||||
request->state = IPP_IDLE;
|
||||
|
||||
if (ippWrite(http, request) == IPP_ERROR)
|
||||
{
|
||||
fputs("ERROR: Unable to send IPP request!\n", stderr);
|
||||
status = HTTP_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
fputs("INFO: IPP request sent, sending print file...\n", stderr);
|
||||
|
||||
/*
|
||||
* Then send the file...
|
||||
*/
|
||||
|
||||
rewind(fp);
|
||||
|
||||
tbytes = 0;
|
||||
while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
|
||||
{
|
||||
tbytes += nbytes;
|
||||
fprintf(stderr, "INFO: Sending print file, %uk...\n", tbytes / 1024);
|
||||
|
||||
if (httpWrite(http, buffer, nbytes) < nbytes)
|
||||
{
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
status = HTTP_ERROR;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fputs("INFO: Print file sent; checking status...\n", stderr);
|
||||
|
||||
/*
|
||||
* Finally, check the status from the HTTP server...
|
||||
*/
|
||||
|
||||
while ((status = httpUpdate(http)) == HTTP_CONTINUE);
|
||||
|
||||
if (status == HTTP_OK)
|
||||
{
|
||||
response = ippNew();
|
||||
ippRead(http, response);
|
||||
|
||||
if ((ipp_status = response->request.status.status_code) > IPP_OK_CONFLICT)
|
||||
{
|
||||
if (ipp_status == IPP_SERVICE_UNAVAILABLE ||
|
||||
ipp_status == IPP_PRINTER_BUSY)
|
||||
{
|
||||
fputs("INFO: Printer is busy; retrying print job...\n", stderr);
|
||||
sleep(10);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "ERROR: Print file was not accepted (%04x)!\n",
|
||||
response->request.status.status_code);
|
||||
fprintf(stderr, "ERROR: %s\n", ippErrorString(ipp_status));
|
||||
}
|
||||
}
|
||||
else if ((job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) == NULL)
|
||||
fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
|
||||
else
|
||||
fprintf(stderr, "INFO: Print file accepted - job ID %d.\n",
|
||||
job_id->values[0].integer);
|
||||
}
|
||||
else
|
||||
{
|
||||
response = NULL;
|
||||
ipp_status = IPP_PRINTER_BUSY;
|
||||
|
||||
if (status == HTTP_ERROR)
|
||||
{
|
||||
fprintf(stderr, "WARNING: Did not receive the IPP response (%d)\n",
|
||||
errno);
|
||||
status = HTTP_OK;
|
||||
}
|
||||
else
|
||||
fprintf(stderr, "ERROR: Print request was not accepted (%d)!\n", status);
|
||||
}
|
||||
|
||||
httpFlush(http);
|
||||
|
||||
break;
|
||||
fprintf(stderr, "ERROR: Print file was not accepted (%s)!\n",
|
||||
ippErrorString(ipp_status));
|
||||
}
|
||||
else if ((job_id_attr = ippFindAttribute(response, "job-id",
|
||||
IPP_TAG_INTEGER)) == NULL)
|
||||
{
|
||||
fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
|
||||
job_id = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
job_id = job_id_attr->values[0].integer;
|
||||
fprintf(stderr, "INFO: Print file accepted - job ID %d.\n", job_id);
|
||||
}
|
||||
|
||||
if (request != NULL)
|
||||
ippDelete(request);
|
||||
if (response != NULL)
|
||||
if (response)
|
||||
ippDelete(response);
|
||||
|
||||
if (ipp_status <= IPP_OK_CONFLICT)
|
||||
@@ -584,6 +486,87 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
else if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
|
||||
ipp_status != IPP_PRINTER_BUSY)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Wait for the job to complete...
|
||||
*/
|
||||
|
||||
if (!job_id)
|
||||
continue;
|
||||
|
||||
fputs("INFO: Waiting for job to complete...\n", stderr);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
/*
|
||||
* Build an IPP_GET_JOB_ATTRIBUTES request...
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
request->request.op.version[1] = version;
|
||||
request->request.op.operation_id = IPP_GET_JOB_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, charset);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL,
|
||||
language != NULL ? language->language : "en");
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
|
||||
job_id);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", NULL, "job-state");
|
||||
|
||||
/*
|
||||
* Do the request...
|
||||
*/
|
||||
|
||||
if ((response = cupsDoRequest(http, request, resource)) == NULL)
|
||||
ipp_status = cupsLastError();
|
||||
else
|
||||
ipp_status = response->request.status.status_code;
|
||||
|
||||
if (ipp_status > IPP_OK_CONFLICT)
|
||||
{
|
||||
if (ipp_status != IPP_SERVICE_UNAVAILABLE &&
|
||||
ipp_status != IPP_PRINTER_BUSY)
|
||||
{
|
||||
if (response)
|
||||
ippDelete(response);
|
||||
|
||||
fprintf(stderr, "ERROR: Unable to get job %d attributes (%s)!\n",
|
||||
job_id, ippErrorString(ipp_status));
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if ((job_state = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Stop polling if the job is finished...
|
||||
*/
|
||||
|
||||
if (job_state->values[0].integer > IPP_JOB_PROCESSING)
|
||||
{
|
||||
ippDelete(response);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait 10 seconds before polling again...
|
||||
*/
|
||||
|
||||
if (response)
|
||||
ippDelete(response);
|
||||
|
||||
sleep(10);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -592,12 +575,13 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
httpClose(http);
|
||||
|
||||
if (supported)
|
||||
ippDelete(supported);
|
||||
|
||||
/*
|
||||
* Close and remove the temporary file if necessary...
|
||||
*/
|
||||
|
||||
fclose(fp);
|
||||
|
||||
if (argc < 7)
|
||||
unlink(filename);
|
||||
|
||||
@@ -605,7 +589,23 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Return the queue status...
|
||||
*/
|
||||
|
||||
return (status != HTTP_OK);
|
||||
if (ipp_status <= IPP_OK_CONFLICT)
|
||||
fputs("INFO: " CUPS_SVERSION " is ready to print.\n", stderr);
|
||||
|
||||
return (ipp_status > IPP_OK_CONFLICT);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'password_cb()' - Disable the password prompt for cupsDoFileRequest().
|
||||
*/
|
||||
|
||||
const char * /* O - Password */
|
||||
password_cb(const char *prompt) /* I - Prompt (not used) */
|
||||
{
|
||||
(void)prompt;
|
||||
|
||||
return (password);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+176
-39
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -26,6 +26,7 @@
|
||||
* main() - Send a file to the printer or server.
|
||||
* lpd_command() - Send an LPR command sequence and wait for a reply.
|
||||
* lpd_queue() - Queue a file using the Line Printer Daemon protocol.
|
||||
* lpd_write() - Write a buffer of data to an LPD server.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -36,6 +37,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
#include <cups/string.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
@@ -51,7 +53,20 @@
|
||||
# include <netdb.h>
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
extern int rresvport(int *port); /* Hello? No prototype for this... */
|
||||
|
||||
/*
|
||||
* The order for control and data files in LPD requests...
|
||||
*/
|
||||
|
||||
#define ORDER_CONTROL_DATA 0
|
||||
#define ORDER_DATA_CONTROL 1
|
||||
|
||||
|
||||
/*
|
||||
* It appears that rresvport() is never declared on most systems...
|
||||
*/
|
||||
|
||||
extern int rresvport(int *port);
|
||||
|
||||
|
||||
/*
|
||||
@@ -61,7 +76,8 @@ extern int rresvport(int *port); /* Hello? No prototype for this... */
|
||||
static int lpd_command(int lpd_fd, char *format, ...);
|
||||
static int lpd_queue(char *hostname, char *printer, char *filename,
|
||||
char *user, char *title, int copies, int banner,
|
||||
int format);
|
||||
int format, int order);
|
||||
static int lpd_write(int lpd_fd, char *buffer, int length);
|
||||
|
||||
|
||||
/*
|
||||
@@ -84,13 +100,25 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
name[255], /* Name of option */
|
||||
value[255], /* Value of option */
|
||||
*ptr, /* Pointer into name or value */
|
||||
filename[1024]; /* File to print */
|
||||
filename[1024], /* File to print */
|
||||
title[256]; /* Title string */
|
||||
int port; /* Port number (not used) */
|
||||
int status; /* Status of LPD job */
|
||||
int banner; /* Print banner page? */
|
||||
int format; /* Print format */
|
||||
int order; /* Order of control/data files */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
puts("network lpd \"Unknown\" \"LPD/LPR Host or Printer\"");
|
||||
@@ -115,27 +143,27 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Copy stdin to a temporary file...
|
||||
*/
|
||||
|
||||
FILE *fp; /* Temporary file */
|
||||
int fd; /* Temporary file */
|
||||
char buffer[8192]; /* Buffer for copying */
|
||||
int bytes; /* Number of bytes read */
|
||||
|
||||
|
||||
if ((fp = fopen(cupsTempFile(filename, sizeof(filename)), "w")) == NULL)
|
||||
if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
|
||||
{
|
||||
perror("ERROR: unable to create temporary file");
|
||||
return (1);
|
||||
}
|
||||
|
||||
while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
|
||||
if (fwrite(buffer, 1, bytes, fp) < bytes)
|
||||
if (write(fd, buffer, bytes) < bytes)
|
||||
{
|
||||
perror("ERROR: unable to write to temporary file");
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
unlink(filename);
|
||||
return (1);
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -155,6 +183,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
banner = 0;
|
||||
format = 'l';
|
||||
order = ORDER_CONTROL_DATA;
|
||||
|
||||
if ((options = strchr(resource, '?')) != NULL)
|
||||
{
|
||||
@@ -223,9 +252,33 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
else
|
||||
fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
|
||||
}
|
||||
else if (strcasecmp(name, "order") == 0 && value[0])
|
||||
{
|
||||
/*
|
||||
* Set control/data order...
|
||||
*/
|
||||
|
||||
if (strcasecmp(value, "control,data") == 0)
|
||||
order = ORDER_CONTROL_DATA;
|
||||
else if (strcasecmp(value, "data,control") == 0)
|
||||
order = ORDER_DATA_CONTROL;
|
||||
else
|
||||
fprintf(stderr, "ERROR: Unknown file order \"%s\"\n", value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Sanitize the document title...
|
||||
*/
|
||||
|
||||
strncpy(title, argv[3], sizeof(title) - 1);
|
||||
title[sizeof(title) - 1] = '\0';
|
||||
|
||||
for (ptr = title; *ptr; ptr ++)
|
||||
if (!isalnum(*ptr) && !isspace(*ptr))
|
||||
*ptr = '_';
|
||||
|
||||
/*
|
||||
* Queue the job...
|
||||
*/
|
||||
@@ -233,16 +286,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
if (argc > 6)
|
||||
{
|
||||
status = lpd_queue(hostname, resource + 1, filename,
|
||||
argv[2] /* user */, argv[3] /* title */,
|
||||
atoi(argv[4]) /* copies */, banner, format);
|
||||
argv[2] /* user */, title, atoi(argv[4]) /* copies */,
|
||||
banner, format, order);
|
||||
|
||||
if (!status)
|
||||
fprintf(stderr, "PAGE: 1 %d\n", atoi(argv[4]));
|
||||
}
|
||||
else
|
||||
status = lpd_queue(hostname, resource + 1, filename,
|
||||
argv[2] /* user */, argv[3] /* title */, 1,
|
||||
banner, format);
|
||||
argv[2] /* user */, title, 1, banner, format, order);
|
||||
|
||||
/*
|
||||
* Remove the temporary file if necessary...
|
||||
@@ -290,7 +342,7 @@ lpd_command(int fd, /* I - Socket connection to LPD host */
|
||||
|
||||
fprintf(stderr, "DEBUG: Sending command string (%d bytes)...\n", bytes);
|
||||
|
||||
if (send(fd, buf, bytes, 0) < bytes)
|
||||
if (lpd_write(fd, buf, bytes) < bytes)
|
||||
return (-1);
|
||||
|
||||
/*
|
||||
@@ -320,7 +372,8 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
char *title, /* I - Job title */
|
||||
int copies, /* I - Number of copies */
|
||||
int banner, /* I - Print LPD banner? */
|
||||
int format) /* I - Format specifier */
|
||||
int format, /* I - Format specifier */
|
||||
int order) /* I - Order of data/control files */
|
||||
{
|
||||
FILE *fp; /* Job file */
|
||||
char localhost[255]; /* Local host name */
|
||||
@@ -362,11 +415,31 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
|
||||
for (port = 732;;)
|
||||
{
|
||||
if ((fd = rresvport(&port)) < 0)
|
||||
if (getuid())
|
||||
{
|
||||
perror("ERROR: Unable to reserve port");
|
||||
sleep(30);
|
||||
continue;
|
||||
/*
|
||||
* We're running as a normal user, so just create a regular socket...
|
||||
*/
|
||||
|
||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
|
||||
{
|
||||
perror("ERROR: Unable to create socket");
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* We're running as root, so comply with RFC 1179 and reserve a
|
||||
* priviledged port between 721 and 732...
|
||||
*/
|
||||
|
||||
if ((fd = rresvport(&port)) < 0)
|
||||
{
|
||||
perror("ERROR: Unable to reserve port");
|
||||
sleep(30);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
|
||||
@@ -397,7 +470,7 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
break;
|
||||
}
|
||||
|
||||
fprintf(stderr, "INFO: Connected on port %d...\n", port);
|
||||
fprintf(stderr, "INFO: Connected from port %d...\n", port);
|
||||
|
||||
/*
|
||||
* Now that we are "connected" to the port, ignore SIGTERM so that we
|
||||
@@ -467,27 +540,36 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
|
||||
fprintf(stderr, "DEBUG: Control file is:\n%s", control);
|
||||
|
||||
lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
|
||||
localhost);
|
||||
|
||||
fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
|
||||
|
||||
if (send(fd, control, strlen(control) + 1, 0) < (strlen(control) + 1))
|
||||
if (order == ORDER_CONTROL_DATA)
|
||||
{
|
||||
perror("ERROR: Unable to write control file");
|
||||
status = 1;
|
||||
lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
|
||||
localhost);
|
||||
|
||||
fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
|
||||
|
||||
if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
|
||||
{
|
||||
status = errno;
|
||||
perror("ERROR: Unable to write control file");
|
||||
}
|
||||
else if (read(fd, &status, 1) < 1)
|
||||
status = errno;
|
||||
|
||||
if (status != 0)
|
||||
fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
|
||||
status);
|
||||
else
|
||||
fputs("INFO: Control file sent successfully\n", stderr);
|
||||
}
|
||||
else if (read(fd, &status, 1) < 1 || status != 0)
|
||||
fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
|
||||
status);
|
||||
else
|
||||
status = 0;
|
||||
|
||||
if (status == 0)
|
||||
{
|
||||
/*
|
||||
* Send the print file...
|
||||
*/
|
||||
|
||||
fputs("INFO: Control file sent successfully\n", stderr);
|
||||
|
||||
lpd_command(fd, "\003%u dfA%03.3d%s\n", (unsigned)filestats.st_size,
|
||||
getpid() % 1000, localhost);
|
||||
|
||||
@@ -498,9 +580,9 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
|
||||
{
|
||||
fprintf(stderr, "INFO: Spooling LPR job, %u%% complete...\n",
|
||||
(unsigned)(100 * tbytes / filestats.st_size));
|
||||
(unsigned)(100.0f * tbytes / filestats.st_size));
|
||||
|
||||
if (send(fd, buffer, nbytes, 0) < nbytes)
|
||||
if (lpd_write(fd, buffer, nbytes) < nbytes)
|
||||
{
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
@@ -509,17 +591,42 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
tbytes += nbytes;
|
||||
}
|
||||
|
||||
send(fd, "", 1, 0);
|
||||
|
||||
if (tbytes < filestats.st_size)
|
||||
status = 1;
|
||||
else if (recv(fd, &status, 1, 0) < 1 || status != 0)
|
||||
status = errno;
|
||||
else if (lpd_write(fd, "", 1) < 1)
|
||||
status = errno;
|
||||
else if (recv(fd, &status, 1, 0) < 1)
|
||||
status = errno;
|
||||
|
||||
if (status != 0)
|
||||
fprintf(stderr, "ERROR: Remote host did not accept data file (%d)\n",
|
||||
status);
|
||||
else
|
||||
fputs("INFO: Data file sent successfully\n", stderr);
|
||||
}
|
||||
|
||||
if (status == 0 && order == ORDER_DATA_CONTROL)
|
||||
{
|
||||
lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
|
||||
localhost);
|
||||
|
||||
fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
|
||||
|
||||
if (lpd_write(fd, control, strlen(control) + 1) < (strlen(control) + 1))
|
||||
{
|
||||
status = errno;
|
||||
perror("ERROR: Unable to write control file");
|
||||
}
|
||||
else if (read(fd, &status, 1) < 1)
|
||||
status = errno;
|
||||
|
||||
if (status != 0)
|
||||
fprintf(stderr, "ERROR: Remote host did not accept control file (%d)\n",
|
||||
status);
|
||||
else
|
||||
fputs("INFO: Control file sent successfully\n", stderr);
|
||||
}
|
||||
|
||||
/*
|
||||
* Close the socket connection and input file and return...
|
||||
*/
|
||||
@@ -531,6 +638,36 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'lpd_write()' - Write a buffer of data to an LPD server.
|
||||
*/
|
||||
|
||||
static int /* O - Number of bytes written or -1 on error */
|
||||
lpd_write(int lpd_fd, /* I - LPD socket */
|
||||
char *buffer, /* I - Buffer to write */
|
||||
int length) /* I - Number of bytes to write */
|
||||
{
|
||||
int bytes, /* Number of bytes written */
|
||||
total; /* Total number of bytes written */
|
||||
|
||||
|
||||
total = 0;
|
||||
while ((bytes = send(lpd_fd, buffer, length - total, 0)) >= 0)
|
||||
{
|
||||
total += bytes;
|
||||
buffer += bytes;
|
||||
|
||||
if (total == length)
|
||||
break;
|
||||
}
|
||||
|
||||
if (bytes < 0)
|
||||
return (-1);
|
||||
else
|
||||
return (length);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
|
||||
+46
-10
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Parallel port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -97,6 +97,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -269,14 +279,17 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
void
|
||||
list_devices(void)
|
||||
{
|
||||
#if defined(__hpux) || defined(__sgi) || defined(__sun)
|
||||
static char *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
|
||||
/* Funky hex numbering used for some devices */
|
||||
#endif /* __hpux || __sgi || __sun */
|
||||
|
||||
#ifdef __linux
|
||||
int i; /* Looping var */
|
||||
int fd; /* File descriptor */
|
||||
char device[255], /* Device filename */
|
||||
probefile[255]; /* Probe filename */
|
||||
probefile[255], /* Probe filename */
|
||||
basedevice[255]; /* Base device filename for ports */
|
||||
FILE *probe; /* /proc/parport/n/autoprobe file */
|
||||
char line[1024], /* Line from file */
|
||||
*delim, /* Delimiter in file */
|
||||
@@ -290,14 +303,30 @@ list_devices(void)
|
||||
* First open the device to make sure the driver module is loaded...
|
||||
*/
|
||||
|
||||
sprintf(device, "/dev/lp%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
if ((fd = open("/dev/parallel/0", O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
strcpy(basedevice, "/dev/parallel/");
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(device, "/dev/par%d", i);
|
||||
sprintf(device, "/dev/lp%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
strcpy(basedevice, "/dev/lp");
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(device, "/dev/par%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
strcpy(basedevice, "/dev/par");
|
||||
}
|
||||
else
|
||||
strcpy(basedevice, "/dev/unknown-parallel");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -351,11 +380,11 @@ list_devices(void)
|
||||
fclose(probe);
|
||||
|
||||
if (make[0])
|
||||
printf("direct parallel:/dev/lp%d \"%s %s\" \"Parallel Port #%d\"\n",
|
||||
i, make, model, i + 1);
|
||||
printf("direct parallel:%s%d \"%s %s\" \"Parallel Port #%d\"\n",
|
||||
basedevice, i, make, model, i + 1);
|
||||
else
|
||||
printf("direct parallel:/dev/lp%d \"%s\" \"Parallel Port #%d\"\n",
|
||||
i, model, i + 1);
|
||||
printf("direct parallel:%s%d \"%s\" \"Parallel Port #%d\"\n",
|
||||
basedevice, i, model, i + 1);
|
||||
}
|
||||
else if (fd >= 0)
|
||||
{
|
||||
@@ -563,7 +592,7 @@ list_devices(void)
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
}
|
||||
#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
int i; /* Looping var */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
@@ -577,6 +606,13 @@ list_devices(void)
|
||||
close(fd);
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
|
||||
sprintf(device, "/dev/lpa%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
+157
-6
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Serial port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -38,12 +38,19 @@
|
||||
#include <cups/string.h>
|
||||
#include <signal.h>
|
||||
|
||||
#ifdef __hpux
|
||||
# include <sys/modem.h>
|
||||
#endif /* __hpux */
|
||||
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
# include <io.h>
|
||||
#else
|
||||
# include <unistd.h>
|
||||
# include <fcntl.h>
|
||||
# include <termios.h>
|
||||
# ifdef HAVE_SYS_IOCTL_H
|
||||
# include <sys/ioctl.h>
|
||||
# endif /* HAVE_SYS_IOCTL_H */
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
#ifdef __sgi
|
||||
@@ -57,6 +64,14 @@
|
||||
# endif /* !INV_EPP_ECP_PLP */
|
||||
#endif /* __sgi */
|
||||
|
||||
#ifndef CRTSCTS
|
||||
# ifdef CNEW_RTSCTS
|
||||
# define CRTSCTS CNEW_RTSCTS
|
||||
# else
|
||||
# define CRTSCTS 0
|
||||
# endif /* CNEW_RTSCTS */
|
||||
#endif /* !CRTSCTS */
|
||||
|
||||
|
||||
/*
|
||||
* Local functions...
|
||||
@@ -92,6 +107,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
int wbytes; /* Number of bytes written */
|
||||
size_t nbytes, /* Number of bytes read */
|
||||
tbytes; /* Total number of bytes written */
|
||||
int dtrdsr; /* Do dtr/dsr flow control? */
|
||||
int bufsize; /* Size of output buffer for writes */
|
||||
char buffer[8192], /* Output buffer */
|
||||
*bufptr; /* Pointer into buffer */
|
||||
struct termios opts; /* Parallel port options */
|
||||
@@ -100,6 +117,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -186,6 +213,9 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
opts.c_lflag &= ~(ICANON | ECHO | ISIG); /* Raw mode */
|
||||
|
||||
bufsize = 480; /* 9600 baud / 10 bits/char / 2Hz */
|
||||
dtrdsr = 0; /* No dtr/dsr flow control */
|
||||
|
||||
if (options != NULL)
|
||||
while (*options)
|
||||
{
|
||||
@@ -225,6 +255,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Set the baud rate...
|
||||
*/
|
||||
|
||||
bufsize = atoi(value) / 20;
|
||||
|
||||
#if B19200 == 19200
|
||||
cfsetispeed(&opts, atoi(value));
|
||||
cfsetospeed(&opts, atoi(value));
|
||||
@@ -255,6 +287,18 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
cfsetispeed(&opts, B38400);
|
||||
cfsetospeed(&opts, B38400);
|
||||
break;
|
||||
#ifdef B57600
|
||||
case 57600 :
|
||||
cfsetispeed(&opts, B57600);
|
||||
cfsetospeed(&opts, B57600);
|
||||
break;
|
||||
#endif /* B57600 */
|
||||
#ifdef B115200
|
||||
case 115200 :
|
||||
cfsetispeed(&opts, B115200);
|
||||
cfsetospeed(&opts, B115200);
|
||||
break;
|
||||
#endif /* B115200 */
|
||||
default :
|
||||
fprintf(stderr, "WARNING: Unsupported baud rate %s!\n", value);
|
||||
break;
|
||||
@@ -301,6 +345,36 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
else if (strcasecmp(value, "none") == 0)
|
||||
opts.c_cflag &= ~PARENB;
|
||||
}
|
||||
else if (strcasecmp(name, "flow") == 0)
|
||||
{
|
||||
/*
|
||||
* Set flow control...
|
||||
*/
|
||||
|
||||
if (strcasecmp(value, "none") == 0)
|
||||
{
|
||||
opts.c_iflag &= ~(IXON | IXOFF | IXANY);
|
||||
opts.c_cflag &= ~CRTSCTS;
|
||||
}
|
||||
else if (strcasecmp(value, "soft") == 0)
|
||||
{
|
||||
opts.c_iflag |= IXON | IXOFF | IXANY;
|
||||
opts.c_cflag &= ~CRTSCTS;
|
||||
}
|
||||
else if (strcasecmp(value, "hard") == 0 ||
|
||||
strcasecmp(value, "rtscts") == 0)
|
||||
{
|
||||
opts.c_iflag &= ~(IXON | IXOFF | IXANY);
|
||||
opts.c_cflag |= CRTSCTS;
|
||||
}
|
||||
else if (strcasecmp(value, "dtrdsr") == 0)
|
||||
{
|
||||
opts.c_iflag &= ~(IXON | IXOFF | IXANY);
|
||||
opts.c_cflag &= ~CRTSCTS;
|
||||
|
||||
dtrdsr = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tcsetattr(fd, TCSANOW, &opts);
|
||||
@@ -327,6 +401,9 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Finally, send the print file...
|
||||
*/
|
||||
|
||||
if (bufsize > sizeof(buffer))
|
||||
bufsize = sizeof(buffer);
|
||||
|
||||
while (copies > 0)
|
||||
{
|
||||
copies --;
|
||||
@@ -337,8 +414,38 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
rewind(fp);
|
||||
}
|
||||
|
||||
if (dtrdsr)
|
||||
{
|
||||
/*
|
||||
* Check the port and sleep until DSR is set...
|
||||
*/
|
||||
|
||||
int status;
|
||||
|
||||
|
||||
if (!ioctl(fd, TIOCMGET, &status))
|
||||
if (!(status & TIOCM_DSR))
|
||||
{
|
||||
/*
|
||||
* Wait for DSR to go high...
|
||||
*/
|
||||
|
||||
fputs("DEBUG: DSR is low; waiting for device...\n", stderr);
|
||||
|
||||
do
|
||||
{
|
||||
sleep(1);
|
||||
if (ioctl(fd, TIOCMGET, &status))
|
||||
break;
|
||||
}
|
||||
while (!(status & TIOCM_DSR));
|
||||
|
||||
fputs("DEBUG: DSR is high; writing to device...\n", stderr);
|
||||
}
|
||||
}
|
||||
|
||||
tbytes = 0;
|
||||
while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
|
||||
while ((nbytes = fread(buffer, 1, bufsize, fp)) > 0)
|
||||
{
|
||||
/*
|
||||
* Write the print data to the printer...
|
||||
@@ -387,8 +494,10 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
void
|
||||
list_devices(void)
|
||||
{
|
||||
#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
static char *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
|
||||
/* Funky hex numbering used for some devices */
|
||||
#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
|
||||
|
||||
#ifdef __linux
|
||||
int i; /* Looping var */
|
||||
@@ -433,7 +542,7 @@ list_devices(void)
|
||||
*/
|
||||
|
||||
for (n = 0; n < 6; n ++)
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
|
||||
n + 5 + 8 * inv->inv_controller, inv->inv_controller, n + 1);
|
||||
}
|
||||
else if (inv->inv_type == INV_EPC_SERIAL)
|
||||
@@ -448,7 +557,7 @@ list_devices(void)
|
||||
i = 41 + 4 * (int)inv->inv_controller;
|
||||
|
||||
for (n = 0; n < (int)inv->inv_state; n ++)
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
|
||||
n + i, n + 1, (int)inv->inv_controller);
|
||||
}
|
||||
else if (inv->inv_state > 1)
|
||||
@@ -458,7 +567,7 @@ list_devices(void)
|
||||
*/
|
||||
|
||||
for (n = 0; n < (int)inv->inv_state; n ++)
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"Onboard Serial Port %d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"Onboard Serial Port %d\"\n",
|
||||
n + (int)inv->inv_unit + 1, n + (int)inv->inv_unit + 1);
|
||||
}
|
||||
else
|
||||
@@ -517,8 +626,13 @@ list_devices(void)
|
||||
{
|
||||
sprintf(device, "/dev/cua/%c", 'a' + i);
|
||||
if (access(device, 0) == 0)
|
||||
#ifdef B115200
|
||||
printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
|
||||
device, i + 1);
|
||||
#else
|
||||
printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
|
||||
device, i + 1);
|
||||
#endif /* B115200 */
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -614,7 +728,7 @@ list_devices(void)
|
||||
printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
|
||||
device, i + 1);
|
||||
}
|
||||
#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
int i, j; /* Looping vars */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
@@ -696,6 +810,43 @@ list_devices(void)
|
||||
device, i + 1);
|
||||
}
|
||||
}
|
||||
#elif defined(__NetBSD__)
|
||||
int i, j; /* Looping vars */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
|
||||
|
||||
/*
|
||||
* Standard serial ports...
|
||||
*/
|
||||
|
||||
for (i = 0; i < 4; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/tty%02d", i);
|
||||
if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
|
||||
device, i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Cyclades-Z ports...
|
||||
*/
|
||||
|
||||
for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
|
||||
for (j = 0; j < 64; j ++)
|
||||
{
|
||||
sprintf(device, "/dev/ttyCZ%02d%02d", i, j);
|
||||
if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Prt #%d\"\n",
|
||||
device, i, j + 1);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
+70
-8
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* AppSocket backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -69,6 +69,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
FILE *fp; /* Print file */
|
||||
int copies; /* Number of copies to print */
|
||||
int port; /* Port number */
|
||||
int delay; /* Delay for retries... */
|
||||
int fd; /* AppSocket */
|
||||
int error; /* Error code (if any) */
|
||||
struct sockaddr_in addr; /* Socket address */
|
||||
@@ -85,6 +86,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
|
||||
@@ -137,7 +148,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
if ((hostaddr = gethostbyname(hostname)) == NULL)
|
||||
{
|
||||
fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s",
|
||||
fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s\n",
|
||||
hostname, strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
@@ -152,7 +163,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
while (copies > 0)
|
||||
{
|
||||
for (;;)
|
||||
for (delay = 5;;)
|
||||
{
|
||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
|
||||
{
|
||||
@@ -168,13 +179,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
if (error == ECONNREFUSED)
|
||||
{
|
||||
fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...\n",
|
||||
hostname);
|
||||
sleep(30);
|
||||
fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in %d seconds...\n",
|
||||
hostname, delay);
|
||||
sleep(delay);
|
||||
|
||||
if (delay < 30)
|
||||
delay += 5;
|
||||
}
|
||||
else
|
||||
{
|
||||
perror("ERROR: Unable to connect to printer");
|
||||
perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
|
||||
sleep(30);
|
||||
}
|
||||
}
|
||||
@@ -240,11 +254,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Check for possible data coming back from the printer...
|
||||
*/
|
||||
|
||||
timeout.tv_sec = 0;
|
||||
timeout.tv_sec = 0;
|
||||
timeout.tv_usec = 0;
|
||||
|
||||
FD_ZERO(&input);
|
||||
FD_SET(fd, &input);
|
||||
#ifdef __hpux
|
||||
if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
|
||||
#else
|
||||
if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
|
||||
#endif /* __hpux */
|
||||
{
|
||||
/*
|
||||
* Grab the data coming back and spit it out to stderr...
|
||||
@@ -258,6 +277,47 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
|
||||
}
|
||||
|
||||
/*
|
||||
* Shutdown the socket and wait for the other end to finish...
|
||||
*/
|
||||
|
||||
fputs("INFO: Print file sent, waiting for printer to finish...\n", stderr);
|
||||
|
||||
shutdown(fd, 1);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
/*
|
||||
* Wait a maximum of 90 seconds for backchannel data or a closed
|
||||
* connection...
|
||||
*/
|
||||
|
||||
timeout.tv_sec = 90;
|
||||
timeout.tv_usec = 0;
|
||||
|
||||
FD_ZERO(&input);
|
||||
FD_SET(fd, &input);
|
||||
|
||||
#ifdef __hpux
|
||||
if (select(fd + 1, (int *)&input, NULL, NULL, &timeout) > 0)
|
||||
#else
|
||||
if (select(fd + 1, &input, NULL, NULL, &timeout) > 0)
|
||||
#endif /* __hpux */
|
||||
{
|
||||
/*
|
||||
* Grab the data coming back and spit it out to stderr...
|
||||
*/
|
||||
|
||||
if ((nbytes = recv(fd, buffer, sizeof(buffer), 0)) > 0)
|
||||
fprintf(stderr, "INFO: Received %u bytes of back-channel data!\n",
|
||||
nbytes);
|
||||
else
|
||||
break;
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Close the socket connection...
|
||||
*/
|
||||
@@ -272,6 +332,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
if (fp != stdin)
|
||||
fclose(fp);
|
||||
|
||||
fputs("INFO: " CUPS_SVERSION " is ready to print.\n", stderr);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
+48
-4
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* USB port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -86,6 +86,16 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -276,6 +286,8 @@ list_devices(void)
|
||||
|
||||
if ((fd = open("/dev/usb/lp0", O_WRONLY)) >= 0)
|
||||
close(fd); /* 2.3.x and 2.4.x */
|
||||
else if ((fd = open("/dev/usb/usblp0", O_WRONLY)) >= 0)
|
||||
close(fd); /* Mandrake 7.x */
|
||||
else if ((fd = open("/dev/usblp0", O_WRONLY)) >= 0)
|
||||
close(fd); /* 2.2.x */
|
||||
|
||||
@@ -331,8 +343,17 @@ list_devices(void)
|
||||
* We were processing a printer device; send the info out...
|
||||
*/
|
||||
|
||||
printf("direct usb:/dev/usb/lp%d \"%s %s\" \"USB Printer #%d\"\n",
|
||||
i, make, model, i + 1);
|
||||
sprintf(device, "/dev/usb/lp%d", i);
|
||||
if (access(device, 0))
|
||||
{
|
||||
sprintf(device, "/dev/usb/usblp%d", i);
|
||||
|
||||
if (access(device, 0))
|
||||
sprintf(device, "/dev/usblp%d", i);
|
||||
}
|
||||
|
||||
printf("direct usb:%s \"%s %s\" \"USB Printer #%d\"\n",
|
||||
device, make, model, i + 1);
|
||||
|
||||
i ++;
|
||||
|
||||
@@ -358,6 +379,13 @@ list_devices(void)
|
||||
printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
|
||||
}
|
||||
|
||||
sprintf(device, "/dev/usb/usblp%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
|
||||
}
|
||||
|
||||
sprintf(device, "/dev/usblp%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
@@ -370,11 +398,27 @@ list_devices(void)
|
||||
#elif defined(__sun)
|
||||
#elif defined(__hpux)
|
||||
#elif defined(__osf)
|
||||
#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
|
||||
#elif defined(__FreeBSD__)
|
||||
int i; /* Looping var */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
|
||||
|
||||
for (i = 0; i < 3; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/unlpt%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct usb:%s \"Unknown\" \"USB Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
}
|
||||
#elif defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
int i; /* Looping var */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
|
||||
|
||||
for (i = 0; i < 3; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/ulpt%d", i);
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
|
||||
+26
-11
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpc" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -178,7 +178,7 @@ do_command(http_t *http, /* I - HTTP connection to server */
|
||||
strcmp(command, "?") == 0)
|
||||
show_help(params);
|
||||
else
|
||||
puts("?Invalid command");
|
||||
printf("%s is not implemented by the CUPS version of lpc.\n", command);
|
||||
}
|
||||
|
||||
|
||||
@@ -216,7 +216,8 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
ipp_t *request, /* IPP Request */
|
||||
*response, /* IPP Response */
|
||||
*jobs; /* IPP Get Jobs response */
|
||||
ipp_attribute_t *attr; /* Current attribute */
|
||||
ipp_attribute_t *attr, /* Current attribute */
|
||||
*jattr; /* Current job attribute */
|
||||
cups_lang_t *language; /* Default language */
|
||||
char *printer, /* Printer name */
|
||||
*device; /* Device URI */
|
||||
@@ -228,6 +229,13 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
int match; /* Non-zero if this job matches */
|
||||
char printer_uri[HTTP_MAX_URI];
|
||||
/* Printer URI */
|
||||
static const char *requested[] =
|
||||
{ /* Requested attributes */
|
||||
"printer-name",
|
||||
"device-uri",
|
||||
"printer-state",
|
||||
"printer-is-accepting-jobs"
|
||||
};
|
||||
|
||||
|
||||
DEBUG_printf(("show_status(%08x, %08x)\n", http, dests));
|
||||
@@ -250,11 +258,15 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
|
||||
language = cupsLangDefault();
|
||||
|
||||
attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", sizeof(requested) / sizeof(requested[0]),
|
||||
NULL, requested);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
@@ -412,13 +424,16 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
|
||||
snprintf(printer_uri, sizeof(printer_uri),
|
||||
"ipp://localhost/printers/%s", printer);
|
||||
attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, printer_uri);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, printer_uri);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", NULL, "job-id");
|
||||
|
||||
if ((jobs = cupsDoRequest(http, request, "/jobs/")) != NULL)
|
||||
{
|
||||
for (attr = jobs->attrs; attr != NULL; attr = attr->next)
|
||||
if (strcmp(attr->name, "job-id") == 0)
|
||||
for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
|
||||
if (jattr->name && strcmp(jattr->name, "job-id") == 0)
|
||||
jobcount ++;
|
||||
|
||||
ippDelete(jobs);
|
||||
|
||||
+30
-8
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpq" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <config.h>
|
||||
#include <cups/cups.h>
|
||||
#include <cups/language.h>
|
||||
#include <cups/debug.h>
|
||||
@@ -71,13 +72,18 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
longstatus; /* Show file details */
|
||||
int num_dests; /* Number of destinations */
|
||||
cups_dest_t *dests; /* Destinations */
|
||||
http_encryption_t encryption; /* Encryption? */
|
||||
|
||||
|
||||
/*
|
||||
* Connect to the scheduler...
|
||||
*/
|
||||
|
||||
http = httpConnect(cupsServer(), ippPort());
|
||||
if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
|
||||
{
|
||||
fputs("lpq: Unable to contact server!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check for command-line options...
|
||||
@@ -102,6 +108,18 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
{
|
||||
switch (argv[i][1])
|
||||
{
|
||||
case 'E' : /* Encrypt */
|
||||
#ifdef HAVE_LIBSSL
|
||||
encryption = HTTP_ENCRYPT_REQUIRED;
|
||||
|
||||
if (http)
|
||||
httpEncryption(http, encryption);
|
||||
#else
|
||||
fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
|
||||
argv[0]);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
break;
|
||||
|
||||
case 'P' : /* Printer */
|
||||
if (argv[i][2])
|
||||
dest = argv[i] + 2;
|
||||
@@ -115,6 +133,10 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
*instance = '\0';
|
||||
break;
|
||||
|
||||
case 'a' : /* All printers */
|
||||
dest = NULL;
|
||||
break;
|
||||
|
||||
case 'l' : /* Long status */
|
||||
longstatus = 1;
|
||||
break;
|
||||
@@ -365,7 +387,7 @@ show_jobs(http_t *http, /* I - HTTP connection to server */
|
||||
#ifdef __osf__
|
||||
puts("Rank Owner Pri Job Files Total Size");
|
||||
#else
|
||||
puts("Rank Owner Job Files Total Size");
|
||||
puts("Rank Owner Job File(s) Total Size");
|
||||
#endif /* __osf__ */
|
||||
|
||||
jobcount ++;
|
||||
@@ -378,7 +400,7 @@ show_jobs(http_t *http, /* I - HTTP connection to server */
|
||||
strcpy(rankstr, "active");
|
||||
else
|
||||
{
|
||||
sprintf(rankstr, "%d%s", rank, ranks[rank % 10]);
|
||||
snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
|
||||
rank ++;
|
||||
}
|
||||
|
||||
@@ -395,15 +417,15 @@ show_jobs(http_t *http, /* I - HTTP connection to server */
|
||||
namestr[sizeof(namestr) - 1] = '\0';
|
||||
}
|
||||
|
||||
printf("%s: %-31s [job %d localhost]\n", jobuser, rankstr, jobid);
|
||||
printf(" %-31.31s %d bytes\n", namestr, jobsize);
|
||||
printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
|
||||
printf(" %-40.40s%d bytes\n", namestr, jobsize);
|
||||
}
|
||||
else
|
||||
#ifdef __osf__
|
||||
printf("%-6s %-10.10s %-4d %-10d %-27.27s %d bytes\n", rankstr, jobuser,
|
||||
jobpriority, jobid, jobname, jobsize);
|
||||
#else
|
||||
printf("%-6s %-10.10s %-15d %-27.27s %d bytes\n", rankstr, jobuser,
|
||||
printf("%-7s %-8.8s%-8d%-32.32s%d bytes\n", rankstr, jobuser,
|
||||
jobid, jobname, jobsize);
|
||||
#endif /* __osf */
|
||||
|
||||
@@ -468,7 +490,7 @@ show_printer(http_t *http, /* I - HTTP connection to server */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
sprintf(uri, "ipp://localhost/printers/%s", dest);
|
||||
snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, uri);
|
||||
|
||||
|
||||
+80
-12
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpr" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -33,6 +33,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <config.h>
|
||||
#include <cups/cups.h>
|
||||
|
||||
|
||||
@@ -65,6 +67,7 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
{
|
||||
int i, j; /* Looping var */
|
||||
int job_id; /* Job ID */
|
||||
char ch; /* Option character */
|
||||
char *printer, /* Destination printer or class */
|
||||
*instance; /* Instance */
|
||||
const char *title; /* Job title */
|
||||
@@ -78,10 +81,10 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
cups_option_t *options; /* Options */
|
||||
int deletefile; /* Delete file after print? */
|
||||
char buffer[8192]; /* Copy buffer */
|
||||
FILE *temp; /* Temporary file pointer */
|
||||
#ifdef HAVE_SIGACTION
|
||||
int temp; /* Temporary file descriptor */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
struct sigaction action; /* Signal action */
|
||||
#endif /* HAVE_SIGACTION */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
deletefile = 0;
|
||||
@@ -95,12 +98,34 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
for (i = 1; i < argc; i ++)
|
||||
if (argv[i][0] == '-')
|
||||
switch (argv[i][1])
|
||||
switch (ch = argv[i][1])
|
||||
{
|
||||
case 'E' : /* Encrypt */
|
||||
#ifdef HAVE_LIBSSL
|
||||
cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
|
||||
#else
|
||||
fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
|
||||
argv[0]);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
break;
|
||||
|
||||
case '1' : /* TROFF font set 1 */
|
||||
case '2' : /* TROFF font set 2 */
|
||||
case '3' : /* TROFF font set 3 */
|
||||
case '4' : /* TROFF font set 4 */
|
||||
case 'i' : /* indent */
|
||||
case 'w' : /* width */
|
||||
if (argv[i][2] == '\0')
|
||||
{
|
||||
i ++;
|
||||
|
||||
if (i >= argc)
|
||||
{
|
||||
fprintf(stderr, "lpr: Expected value after -%c option!\n", ch);
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
case 'c' : /* CIFPLOT */
|
||||
case 'd' : /* DVI */
|
||||
case 'f' : /* FORTRAN */
|
||||
@@ -109,7 +134,7 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
case 't' : /* Troff */
|
||||
case 'v' : /* Raster image */
|
||||
fprintf(stderr, "Warning: \'%c\' format modifier not supported - output may not be correct!\n",
|
||||
argv[i][1]);
|
||||
ch);
|
||||
break;
|
||||
|
||||
case 'o' : /* Option */
|
||||
@@ -118,6 +143,12 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
if (i >= argc)
|
||||
{
|
||||
fputs("lpr: Expected option=value after -o option!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
num_options = cupsParseOptions(argv[i], num_options, &options);
|
||||
}
|
||||
break;
|
||||
@@ -141,6 +172,11 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
fputs("Warning: email notification is not supported!\n", stderr);
|
||||
break;
|
||||
|
||||
case 'q' : /* Queue file but don't print */
|
||||
num_options = cupsAddOption("job-hold-until", "indefinite",
|
||||
num_options, &options);
|
||||
break;
|
||||
|
||||
case 'r' : /* Remove file after printing */
|
||||
deletefile = 1;
|
||||
break;
|
||||
@@ -151,6 +187,12 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
if (i >= argc)
|
||||
{
|
||||
fputs("lpr: Expected destination after -P option!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
printer = argv[i];
|
||||
}
|
||||
|
||||
@@ -176,6 +218,12 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
if (i >= argc)
|
||||
{
|
||||
fputs("lpr: Expected copy count after -# option!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
num_copies = atoi(argv[i]);
|
||||
}
|
||||
|
||||
@@ -197,10 +245,32 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
if (i >= argc)
|
||||
{
|
||||
fprintf(stderr, "lpr: Expected name after -%c option!\n", ch);
|
||||
return (1);
|
||||
}
|
||||
|
||||
title = argv[i];
|
||||
}
|
||||
break;
|
||||
|
||||
case 'U' : /* User */
|
||||
if (argv[i][2] != '\0')
|
||||
cupsSetUser(argv[i] + 2);
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
if (i >= argc)
|
||||
{
|
||||
fputs("lpr: Expected username after -U option!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
cupsSetUser(argv[i]);
|
||||
}
|
||||
break;
|
||||
|
||||
default :
|
||||
fprintf(stderr, "lpr: Unknown option \'%c\'!\n", argv[i][1]);
|
||||
return (1);
|
||||
@@ -290,19 +360,17 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
# endif
|
||||
#endif /* !WIN32 */
|
||||
|
||||
temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "w");
|
||||
|
||||
if (temp == NULL)
|
||||
if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
|
||||
{
|
||||
fputs("lpr: unable to create temporary file.\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
while ((i = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
|
||||
fwrite(buffer, 1, i, temp);
|
||||
write(temp, buffer, i);
|
||||
|
||||
i = ftell(temp);
|
||||
fclose(temp);
|
||||
i = lseek(temp, 0, SEEK_CUR);
|
||||
close(temp);
|
||||
|
||||
if (i == 0)
|
||||
{
|
||||
|
||||
+32
-6
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lprm" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -58,17 +58,19 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
cups_lang_t *language; /* Language */
|
||||
int num_dests; /* Number of destinations */
|
||||
cups_dest_t *dests; /* Destinations */
|
||||
http_encryption_t encryption; /* Encryption? */
|
||||
|
||||
|
||||
/*
|
||||
* Setup to cancel individual print jobs...
|
||||
*/
|
||||
|
||||
op = IPP_CANCEL_JOB;
|
||||
job_id = 0;
|
||||
dest = NULL;
|
||||
response = NULL;
|
||||
http = NULL;
|
||||
op = IPP_CANCEL_JOB;
|
||||
job_id = 0;
|
||||
dest = NULL;
|
||||
response = NULL;
|
||||
http = NULL;
|
||||
encryption = cupsEncryption();
|
||||
|
||||
num_dests = cupsGetDests(&dests);
|
||||
|
||||
@@ -87,6 +89,8 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
return (1);
|
||||
}
|
||||
|
||||
httpEncryption(http, encryption);
|
||||
|
||||
/*
|
||||
* Process command-line arguments...
|
||||
*/
|
||||
@@ -95,6 +99,17 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
if (argv[i][0] == '-' && argv[i][1] != '\0')
|
||||
switch (argv[i][1])
|
||||
{
|
||||
case 'E' : /* Encrypt */
|
||||
#ifdef HAVE_LIBSSL
|
||||
encryption = HTTP_ENCRYPT_REQUIRED;
|
||||
|
||||
httpEncryption(http, encryption);
|
||||
#else
|
||||
fprintf(stderr, "%s: Sorry, no encryption support compiled in!\n",
|
||||
argv[0]);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
break;
|
||||
|
||||
case 'P' : /* Cancel jobs on a printer */
|
||||
if (argv[i][2])
|
||||
dest = argv[i] + 2;
|
||||
@@ -135,7 +150,10 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
op = IPP_PURGE_JOBS;
|
||||
}
|
||||
else
|
||||
{
|
||||
dest = argv[i];
|
||||
job_id = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Build an IPP request, which requires the following
|
||||
@@ -206,6 +224,14 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
break;
|
||||
}
|
||||
|
||||
if (response->request.status.status_code > IPP_OK_CONFLICT)
|
||||
{
|
||||
ippDelete(response);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
return (1);
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
else
|
||||
|
||||
+7
-5
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# CGI makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-1999 by Easy Software Products.
|
||||
# Copyright 1997-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -24,8 +24,9 @@
|
||||
|
||||
include ../Makedefs
|
||||
|
||||
TARGETS = admin.cgi classes.cgi jobs.cgi printers.cgi
|
||||
LIBOBJS = abort.o email.o html.o ipp-var.o template.o var.o
|
||||
CGIS = admin.cgi classes.cgi jobs.cgi printers.cgi
|
||||
TARGETS = libcgi.a $(CGIS)
|
||||
LIBOBJS = html.o ipp-var.o template.o var.o
|
||||
OBJS = $(LIBOBJS) admin.o classes.o jobs.o printers.o
|
||||
|
||||
|
||||
@@ -41,7 +42,7 @@ all: $(TARGETS)
|
||||
#
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) libcgi.a $(TARGETS)
|
||||
$(RM) $(OBJS) $(TARGETS)
|
||||
|
||||
|
||||
#
|
||||
@@ -52,7 +53,7 @@ install:
|
||||
-$(MKDIR) $(SERVERBIN)/cgi-bin
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin
|
||||
$(INSTALL_BIN) $(TARGETS) $(SERVERBIN)/cgi-bin
|
||||
$(INSTALL_BIN) $(CGIS) $(SERVERBIN)/cgi-bin
|
||||
|
||||
|
||||
#
|
||||
@@ -114,6 +115,7 @@ printers.o: cgi.h ipp-var.h ../cups/cups.h ../cups/ipp.h ../cups/language.h
|
||||
|
||||
$(OBJS): ../Makedefs
|
||||
|
||||
|
||||
#
|
||||
# End of "$Id$".
|
||||
#
|
||||
|
||||
+47
-21
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Administration CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -40,6 +40,7 @@
|
||||
|
||||
#include "ipp-var.h"
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
|
||||
/*
|
||||
@@ -494,6 +495,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
*uriptr; /* Pointer into URI */
|
||||
int maxrate; /* Maximum baud rate */
|
||||
char baudrate[255]; /* Baud rate string */
|
||||
char make[255]; /* Make string */
|
||||
const char *name, /* Pointer to class name */
|
||||
*ptr; /* Pointer to CGI variable */
|
||||
static int baudrates[] = /* Baud rates */
|
||||
@@ -544,8 +546,10 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
oldinfo = cupsDoRequest(http, request, "/");
|
||||
}
|
||||
else
|
||||
oldinfo = NULL;
|
||||
|
||||
if (cgiGetVariable("PRINTER_LOCATION") == NULL)
|
||||
if ((name = cgiGetVariable("PRINTER_NAME")) == NULL)
|
||||
{
|
||||
if (modify)
|
||||
{
|
||||
@@ -573,7 +577,6 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
return;
|
||||
}
|
||||
|
||||
name = cgiGetVariable("PRINTER_NAME");
|
||||
if (isdigit(*name))
|
||||
ptr = name;
|
||||
else
|
||||
@@ -644,7 +647,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
else if (strchr(var, '/') == NULL)
|
||||
{
|
||||
if (oldinfo &&
|
||||
(attr = ippFindAttribute(response, "device-uri", IPP_TAG_URI)) != NULL)
|
||||
(attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Set the current device URI for the form to the old one...
|
||||
@@ -691,27 +694,26 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
* Get the PPD file...
|
||||
*/
|
||||
|
||||
FILE *fp; /* PPD file */
|
||||
int fd; /* PPD file */
|
||||
char filename[1024]; /* PPD filename */
|
||||
ppd_file_t *ppd; /* PPD information */
|
||||
char buffer[1024]; /* Buffer */
|
||||
int bytes; /* Number of bytes */
|
||||
|
||||
|
||||
sprintf(uri, "/printers/%s.ppd", name);
|
||||
cupsTempFile(filename, sizeof(filename));
|
||||
snprintf(uri, sizeof(uri), "/printers/%s.ppd", name);
|
||||
|
||||
if (httpGet(http, uri))
|
||||
httpGet(http, uri);
|
||||
|
||||
while (httpUpdate(http) == HTTP_CONTINUE);
|
||||
|
||||
if ((fp = fopen(filename, "w")) != NULL)
|
||||
if ((fd = cupsTempFd(filename, sizeof(filename))) >= 0)
|
||||
{
|
||||
while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
|
||||
fwrite(buffer, 1, bytes, fp);
|
||||
write(fd, buffer, bytes);
|
||||
|
||||
fclose(fp);
|
||||
close(fd);
|
||||
|
||||
if ((ppd = ppdOpenFile(filename)) != NULL)
|
||||
{
|
||||
@@ -722,11 +724,11 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
ppdClose(ppd);
|
||||
}
|
||||
|
||||
unlink(filename);
|
||||
}
|
||||
else
|
||||
httpFlush(http);
|
||||
|
||||
unlink(filename);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -786,14 +788,26 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
* Let the user choose a model...
|
||||
*/
|
||||
|
||||
ippSetCGIVars(response, "ppd-make", var);
|
||||
strncpy(make, var, sizeof(make) - 1);
|
||||
make[sizeof(make) - 1] = '\0';
|
||||
|
||||
ippSetCGIVars(response, "ppd-make", make);
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "choose-model.tmpl",
|
||||
getenv("LANG"));
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
else
|
||||
{
|
||||
char message[1024];
|
||||
|
||||
|
||||
snprintf(message, sizeof(message), "Unable to get list of printer drivers: %s",
|
||||
ippErrorString(cupsLastError()));
|
||||
cgiSetVariable("ERROR", message);
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -837,7 +851,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
|
||||
NULL, cgiGetVariable("PPD_NAME"));
|
||||
|
||||
strcpy(uri, cgiGetVariable("DEVICE_URI"));
|
||||
strncpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri) - 1);
|
||||
uri[sizeof(uri) - 1] = '\0';
|
||||
if (strncmp(uri, "serial:", 7) == 0)
|
||||
{
|
||||
/*
|
||||
@@ -847,9 +862,10 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
if ((uriptr = strchr(uri, '?')) == NULL)
|
||||
uriptr = uri + strlen(uri);
|
||||
|
||||
sprintf(uriptr, "?baud=%s+bits=%s+parity=%s+flow=%s",
|
||||
cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
|
||||
cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
|
||||
snprintf(uriptr, sizeof(uri) - (uriptr - uri),
|
||||
"?baud=%s+bits=%s+parity=%s+flow=%s",
|
||||
cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
|
||||
cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
|
||||
}
|
||||
|
||||
ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri",
|
||||
@@ -909,6 +925,7 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
char tempfile[1024]; /* Temporary filename */
|
||||
FILE *in, /* Input file */
|
||||
*out; /* Output file */
|
||||
int outfd; /* Output file descriptor */
|
||||
char line[1024]; /* Line from PPD file */
|
||||
char keyword[1024], /* Keyword from Default line */
|
||||
*keyptr; /* Pointer into keyword... */
|
||||
@@ -1101,10 +1118,17 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
* Set default options...
|
||||
*/
|
||||
|
||||
cupsTempFile(tempfile, sizeof(tempfile));
|
||||
outfd = cupsTempFd(tempfile, sizeof(tempfile));
|
||||
in = fopen(filename, "rb");
|
||||
out = fdopen(outfd, "wb");
|
||||
|
||||
in = fopen(filename, "rb");
|
||||
out = fopen(tempfile, "wb");
|
||||
if (outfd < 0 || in == NULL || out == NULL)
|
||||
{
|
||||
cgiSetVariable("ERROR", strerror(errno));
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
|
||||
unlink(filename);
|
||||
return;
|
||||
}
|
||||
|
||||
while (get_line(line, sizeof(line), in) != NULL)
|
||||
{
|
||||
@@ -1116,7 +1140,8 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
* Get default option name...
|
||||
*/
|
||||
|
||||
strcpy(keyword, line + 8);
|
||||
strncpy(keyword, line + 8, sizeof(keyword) - 1);
|
||||
keyword[sizeof(keyword) - 1] = '\0';
|
||||
|
||||
for (keyptr = keyword; *keyptr; keyptr ++)
|
||||
if (*keyptr == ':' || isspace(*keyptr))
|
||||
@@ -1138,6 +1163,7 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
fclose(in);
|
||||
fclose(out);
|
||||
close(outfd);
|
||||
|
||||
/*
|
||||
* Build a CUPS_ADD_PRINTER request, which requires the following
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI support library definitions.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Class status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI HTML functions.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
|
||||
+62
-21
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP variable routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,6 +23,7 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* ippGetTemplateDir() - Get the templates directory...
|
||||
* ippSetServerVersion() - Set the server name and CUPS version...
|
||||
* ippSetCGIVars() - Set CGI variables from an IPP response.
|
||||
*/
|
||||
@@ -96,12 +97,15 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
resource[HTTP_MAX_URI],
|
||||
uri[HTTP_MAX_URI];
|
||||
int port; /* URI data */
|
||||
int ishttps; /* Using encryption? */
|
||||
const char *server; /* Name of server */
|
||||
struct tm *date; /* Date information */
|
||||
|
||||
|
||||
ippSetServerVersion();
|
||||
|
||||
server = getenv("SERVER_NAME");
|
||||
server = getenv("SERVER_NAME");
|
||||
ishttps = getenv("HTTPS") != NULL;
|
||||
|
||||
for (attr = response->attrs;
|
||||
attr && attr->group_tag == IPP_TAG_OPERATION;
|
||||
@@ -119,6 +123,10 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
filter != NULL && filter->group_tag != IPP_TAG_ZERO;
|
||||
filter = filter->next)
|
||||
if (filter->name && strcmp(filter->name, filter_name) == 0 &&
|
||||
(filter->value_tag == IPP_TAG_STRING ||
|
||||
(filter->value_tag >= IPP_TAG_TEXTLANG &&
|
||||
filter->value_tag <= IPP_TAG_MIMETYPE)) &&
|
||||
filter->values[0].string.text != NULL &&
|
||||
strcasecmp(filter->values[0].string.text, filter_value) == 0)
|
||||
break;
|
||||
|
||||
@@ -150,17 +158,33 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
|
||||
name[i] = '\0';
|
||||
|
||||
/*
|
||||
* Add "job_printer_name" variable if we have a "job_printer_uri"
|
||||
* attribute...
|
||||
*/
|
||||
|
||||
if (strcmp(name, "job_printer_uri") == 0)
|
||||
{
|
||||
if ((valptr = strrchr(attr->values[0].string.text, '/')) == NULL)
|
||||
valptr = "unknown";
|
||||
else
|
||||
valptr ++;
|
||||
|
||||
cgiSetArray("job_printer_name", element, valptr);
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy values...
|
||||
*/
|
||||
|
||||
value[0] = '\0';
|
||||
valptr = value;
|
||||
value[0] = '\0'; /* Initially an empty string */
|
||||
value[sizeof(value) - 1] = '\0'; /* In case string gets full */
|
||||
valptr = value; /* Start at the beginning */
|
||||
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if (i)
|
||||
strcat(valptr, ",");
|
||||
strncat(valptr, ",", sizeof(value) - (valptr - value) - 1);
|
||||
|
||||
valptr += strlen(valptr);
|
||||
|
||||
@@ -168,27 +192,38 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
sprintf(valptr, "%d", attr->values[i].integer);
|
||||
if (strncmp(name, "time_at_", 8) == 0)
|
||||
{
|
||||
date = localtime((time_t *)&(attr->values[i].integer));
|
||||
strftime(valptr, sizeof(value) - (valptr - value),
|
||||
CUPS_STRFTIME_FORMAT, date);
|
||||
}
|
||||
else
|
||||
snprintf(valptr, sizeof(value) - (valptr - value),
|
||||
"%d", attr->values[i].integer);
|
||||
break;
|
||||
|
||||
case IPP_TAG_BOOLEAN :
|
||||
sprintf(valptr, "%d", attr->values[i].boolean);
|
||||
snprintf(valptr, sizeof(value) - (valptr - value),
|
||||
"%d", attr->values[i].boolean);
|
||||
break;
|
||||
|
||||
case IPP_TAG_NOVALUE :
|
||||
strcat(valptr, "novalue");
|
||||
strncat(valptr, "novalue", sizeof(value) - (valptr - value) - 1);
|
||||
break;
|
||||
|
||||
case IPP_TAG_RANGE :
|
||||
sprintf(valptr, "%d-%d", attr->values[i].range.lower,
|
||||
attr->values[i].range.upper);
|
||||
snprintf(valptr, sizeof(value) - (valptr - value),
|
||||
"%d-%d", attr->values[i].range.lower,
|
||||
attr->values[i].range.upper);
|
||||
break;
|
||||
|
||||
case IPP_TAG_RESOLUTION :
|
||||
sprintf(valptr, "%dx%d%s", attr->values[i].resolution.xres,
|
||||
attr->values[i].resolution.yres,
|
||||
attr->values[i].resolution.units == IPP_RES_PER_INCH ?
|
||||
"dpi" : "dpc");
|
||||
snprintf(valptr, sizeof(value) - (valptr - value),
|
||||
"%dx%d%s", attr->values[i].resolution.xres,
|
||||
attr->values[i].resolution.yres,
|
||||
attr->values[i].resolution.units == IPP_RES_PER_INCH ?
|
||||
"dpi" : "dpc");
|
||||
break;
|
||||
|
||||
case IPP_TAG_URI :
|
||||
@@ -201,27 +236,32 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
strcmp(method, "http") == 0)
|
||||
{
|
||||
/*
|
||||
* Map localhost access to localhost...
|
||||
* Map localhost access to localhost and local port...
|
||||
*/
|
||||
|
||||
if (strcasecmp(hostname, server) == 0 &&
|
||||
(strcmp(getenv("REMOTE_HOST"), "127.0.0.1") == 0 ||
|
||||
strcmp(getenv("REMOTE_HOST"), "localhost") == 0 ||
|
||||
strcmp(getenv("REMOTE_HOST"), server) == 0))
|
||||
{
|
||||
strcpy(hostname, "localhost");
|
||||
port = atoi(getenv("SERVER_PORT"));
|
||||
}
|
||||
|
||||
/*
|
||||
* Rewrite URI with HTTP address...
|
||||
*/
|
||||
|
||||
if (username[0])
|
||||
snprintf(uri, sizeof(uri), "http://%s@%s:%d%s", username,
|
||||
hostname, port, resource);
|
||||
snprintf(uri, sizeof(uri), "%s://%s@%s:%d%s",
|
||||
ishttps ? "https" : "http",
|
||||
username, hostname, port, resource);
|
||||
else
|
||||
snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
|
||||
resource);
|
||||
snprintf(uri, sizeof(uri), "%s://%s:%d%s",
|
||||
ishttps ? "https" : "http",
|
||||
hostname, port, resource);
|
||||
|
||||
strcat(valptr, uri);
|
||||
strncat(valptr, uri, sizeof(value) - (valptr - value) - 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -232,7 +272,8 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
case IPP_TAG_KEYWORD :
|
||||
case IPP_TAG_CHARSET :
|
||||
case IPP_TAG_LANGUAGE :
|
||||
strcat(valptr, attr->values[i].string.text);
|
||||
strncat(valptr, attr->values[i].string.text,
|
||||
sizeof(value) - (valptr - value) - 1);
|
||||
break;
|
||||
|
||||
default :
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP variable definitions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Job status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Printer status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+65
-21
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI template function.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
@@ -110,14 +110,14 @@ cgiCopyTemplateLang(FILE *out, /* I - Output file */
|
||||
* See if we have a template file for this language...
|
||||
*/
|
||||
|
||||
sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
|
||||
snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
|
||||
if (access(filename, 0))
|
||||
{
|
||||
locale[2] = '\0';
|
||||
|
||||
sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
|
||||
snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
|
||||
if (access(filename, 0))
|
||||
sprintf(filename, "%s/%s", directory, tmpl);
|
||||
snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -160,7 +160,8 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*s; /* String pointer */
|
||||
const char *value; /* Value of variable */
|
||||
const char *innerval; /* Inner value */
|
||||
char outval[1024], /* Output string */
|
||||
const char *outptr; /* Output string pointer */
|
||||
char outval[1024], /* Formatted output string */
|
||||
compare[1024]; /* Comparison string */
|
||||
int result; /* Result of comparison */
|
||||
|
||||
@@ -179,7 +180,7 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*/
|
||||
|
||||
for (s = name; (ch = getc(in)) != EOF;)
|
||||
if (strchr("}]<>=!", ch))
|
||||
if (strchr("}]<>=! \t\n", ch))
|
||||
break;
|
||||
else if (s > name && ch == '?')
|
||||
break;
|
||||
@@ -188,6 +189,17 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
|
||||
*s = '\0';
|
||||
|
||||
if (s == name && isspace(ch))
|
||||
{
|
||||
if (out)
|
||||
{
|
||||
putc('{', out);
|
||||
putc(ch, out);
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* See if it has a value...
|
||||
*/
|
||||
@@ -203,14 +215,20 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*nameptr++ = '\0';
|
||||
|
||||
if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL)
|
||||
strcpy(outval, value);
|
||||
outptr = value;
|
||||
else
|
||||
{
|
||||
outval[0] = '\0';
|
||||
outptr = outval;
|
||||
}
|
||||
}
|
||||
if ((value = cgiGetArray(name + 1, element)) != NULL)
|
||||
strcpy(outval, value);
|
||||
outptr = value;
|
||||
else
|
||||
{
|
||||
outval[0] = '\0';
|
||||
outptr = outval;
|
||||
}
|
||||
}
|
||||
else if (name[0] == '#')
|
||||
{
|
||||
@@ -222,6 +240,8 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
sprintf(outval, "%d", cgiGetSize(name + 1));
|
||||
else
|
||||
sprintf(outval, "%d", element + 1);
|
||||
|
||||
outptr = outval;
|
||||
}
|
||||
else if (name[0] == '[')
|
||||
{
|
||||
@@ -264,14 +284,20 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
{
|
||||
*nameptr++ = '\0';
|
||||
if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
|
||||
sprintf(outval, "{%s}", name);
|
||||
{
|
||||
snprintf(outval, sizeof(outval), "{%s}", name);
|
||||
outptr = outval;
|
||||
}
|
||||
else
|
||||
strcpy(outval, value);
|
||||
outptr = value;
|
||||
}
|
||||
else if ((value = cgiGetArray(name, element)) == NULL)
|
||||
sprintf(outval, "{%s}", name);
|
||||
{
|
||||
snprintf(outval, sizeof(outval), "{%s}", name);
|
||||
outptr = outval;
|
||||
}
|
||||
else
|
||||
strcpy(outval, value);
|
||||
outptr = value;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -285,7 +311,7 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*/
|
||||
|
||||
if (out)
|
||||
cgi_puts(outval, out);
|
||||
cgi_puts(outptr, out);
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -319,6 +345,8 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
for (s = compare; (ch = getc(in)) != EOF;)
|
||||
if (ch == '?')
|
||||
break;
|
||||
else if (s >= (compare + sizeof(compare) - 1))
|
||||
continue;
|
||||
else if (ch == '#')
|
||||
{
|
||||
sprintf(s, "%d", element + 1);
|
||||
@@ -345,19 +373,28 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
|
||||
*s = '\0';
|
||||
else
|
||||
strcpy(s, innerval);
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
}
|
||||
else if (innername[0] == '?')
|
||||
{
|
||||
if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
|
||||
*s = '\0';
|
||||
else
|
||||
strcpy(s, innerval);
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
}
|
||||
else if ((innerval = cgiGetArray(innername, element)) == NULL)
|
||||
sprintf(s, "{%s}", innername);
|
||||
snprintf(s, sizeof(s), "{%s}", innername);
|
||||
else
|
||||
strcpy(s, innerval);
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
|
||||
s += strlen(s);
|
||||
}
|
||||
@@ -378,16 +415,16 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
switch (op)
|
||||
{
|
||||
case '<' :
|
||||
result = strcasecmp(outval, compare) < 0;
|
||||
result = strcasecmp(outptr, compare) < 0;
|
||||
break;
|
||||
case '>' :
|
||||
result = strcasecmp(outval, compare) > 0;
|
||||
result = strcasecmp(outptr, compare) > 0;
|
||||
break;
|
||||
case '=' :
|
||||
result = strcasecmp(outval, compare) == 0;
|
||||
result = strcasecmp(outptr, compare) == 0;
|
||||
break;
|
||||
case '!' :
|
||||
result = strcasecmp(outval, compare) != 0;
|
||||
result = strcasecmp(outptr, compare) != 0;
|
||||
break;
|
||||
default :
|
||||
result = 1;
|
||||
@@ -423,6 +460,13 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
}
|
||||
else if (out)
|
||||
putc(ch, out);
|
||||
|
||||
/*
|
||||
* Flush any pending output...
|
||||
*/
|
||||
|
||||
if (out)
|
||||
fflush(out);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+44
-28
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI form variable and array functions.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
@@ -39,6 +39,8 @@
|
||||
|
||||
/*#define DEBUG*/
|
||||
#include "cgi.h"
|
||||
#include <errno.h>
|
||||
#include <syslog.h>
|
||||
|
||||
|
||||
/*
|
||||
@@ -473,7 +475,7 @@ cgi_initialize_post(void)
|
||||
*/
|
||||
|
||||
content_length = getenv("CONTENT_LENGTH");
|
||||
if (content_length == NULL || atoi(content_length) == 0)
|
||||
if (content_length == NULL || atoi(content_length) <= 0)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
@@ -483,16 +485,20 @@ cgi_initialize_post(void)
|
||||
length = atoi(content_length);
|
||||
data = malloc(length + 1);
|
||||
|
||||
if (data == NULL)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
* Read the data into the buffer...
|
||||
*/
|
||||
|
||||
for (tbytes = 0; tbytes < length; tbytes += nbytes)
|
||||
if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
|
||||
{
|
||||
free(data);
|
||||
return (0);
|
||||
}
|
||||
if (errno != EAGAIN)
|
||||
{
|
||||
free(data);
|
||||
return (0);
|
||||
}
|
||||
|
||||
data[length] = '\0';
|
||||
|
||||
@@ -543,11 +549,11 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
* Get the variable name...
|
||||
*/
|
||||
|
||||
for (s = name; *data != '\0'; data ++, s ++)
|
||||
for (s = name; *data != '\0'; data ++)
|
||||
if (*data == '=')
|
||||
break;
|
||||
else
|
||||
*s = *data;
|
||||
else if (*data >= ' ' && s < (name + sizeof(name) - 1))
|
||||
*s++ = *data;
|
||||
|
||||
*s = '\0';
|
||||
if (*data == '=')
|
||||
@@ -559,38 +565,44 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
* Read the variable value...
|
||||
*/
|
||||
|
||||
for (s = value, done = 0; !done && *data != '\0'; data ++, s ++)
|
||||
for (s = value, done = 0; !done && *data != '\0'; data ++)
|
||||
switch (*data)
|
||||
{
|
||||
case '&' : /* End of data... */
|
||||
done = 1;
|
||||
s --;
|
||||
break;
|
||||
|
||||
case '+' : /* Escaped space character */
|
||||
*s = ' ';
|
||||
if (s < (value + sizeof(value) - 1))
|
||||
*s++ = ' ';
|
||||
break;
|
||||
|
||||
case '%' : /* Escaped control character */
|
||||
/*
|
||||
* Read the hex code from stdin...
|
||||
* Read the hex code...
|
||||
*/
|
||||
|
||||
data ++;
|
||||
ch = *data - '0';
|
||||
if (ch > 9)
|
||||
ch -= 7;
|
||||
*s = ch << 4;
|
||||
if (s < (value + sizeof(value) - 1))
|
||||
{
|
||||
data ++;
|
||||
ch = *data - '0';
|
||||
if (ch > 9)
|
||||
ch -= 7;
|
||||
*s = ch << 4;
|
||||
|
||||
data ++;
|
||||
ch = *data - '0';
|
||||
if (ch > 9)
|
||||
ch -= 7;
|
||||
*s |= ch;
|
||||
data ++;
|
||||
ch = *data - '0';
|
||||
if (ch > 9)
|
||||
ch -= 7;
|
||||
*s++ |= ch;
|
||||
}
|
||||
else
|
||||
data += 2;
|
||||
break;
|
||||
|
||||
default : /* Other characters come straight through */
|
||||
*s = *data;
|
||||
if (*data >= ' ' && s < (value + sizeof(value) - 1))
|
||||
*s++ = *data;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -600,7 +612,9 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
* Remove trailing whitespace...
|
||||
*/
|
||||
|
||||
s --;
|
||||
if (s > value)
|
||||
s --;
|
||||
|
||||
while (s >= value && *s == ' ')
|
||||
*s-- = '\0';
|
||||
|
||||
@@ -611,7 +625,8 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
if ((s = strrchr(name, '-')) != NULL && isdigit(s[1]))
|
||||
{
|
||||
*s++ = '\0';
|
||||
cgiSetArray(name, atoi(s) - 1, value);
|
||||
if (value[0])
|
||||
cgiSetArray(name, atoi(s) - 1, value);
|
||||
}
|
||||
else if (cgiGetVariable(name) != NULL)
|
||||
cgiSetArray(name, cgiGetSize(name), value);
|
||||
@@ -644,9 +659,10 @@ cgi_sort_variables(void)
|
||||
(int (*)(const void *, const void *))cgi_compare_variables);
|
||||
|
||||
#ifdef DEBUG
|
||||
puts("New variable list is:");
|
||||
puts("Sorted variable list is:");
|
||||
for (i = 0; i < form_count; i ++)
|
||||
printf("%s = %s\n", form_vars[i].name, form_vars[i].value);
|
||||
printf("%d: %s (%d) = \"%s\" ...\n", i, form_vars[i].name,
|
||||
form_vars[i].nvalues, form_vars[i].values[0]);
|
||||
#endif /* DEBUG */
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Configuration file makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: classes.conf 1152 2000-06-22 18:25:29Z mike $"
|
||||
# "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $"
|
||||
#
|
||||
# Sample class configuration file for the Common UNIX Printing System
|
||||
# (CUPS) scheduler.
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -85,5 +85,5 @@
|
||||
#</Class>
|
||||
|
||||
#
|
||||
# End of "$Id: classes.conf 1152 2000-06-22 18:25:29Z mike $".
|
||||
# End of "$Id: classes.conf 1605 2001-03-02 22:34:21Z andy $".
|
||||
#
|
||||
|
||||
+23
-8
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: client.conf 969 2000-03-10 16:56:46Z mike $"
|
||||
# "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $"
|
||||
#
|
||||
# Sample client configuration file for the Common UNIX Printing System
|
||||
# (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -27,24 +27,39 @@
|
||||
# #
|
||||
# This is the CUPS client configuration file. This file is used to #
|
||||
# define client-specific parameters, such as the default server or #
|
||||
# default printer. #
|
||||
# default encryption settings. #
|
||||
# #
|
||||
########################################################################
|
||||
|
||||
#
|
||||
# ServerName: the hostname of your server. By default CUPS will use the
|
||||
# hostname of the system.
|
||||
# hostname of the system or the value of the CUPS_SERVER environment
|
||||
# variable.
|
||||
#
|
||||
|
||||
#ServerName myhost.domain.com
|
||||
|
||||
#
|
||||
# DefaultPrinter: the default printer (or class) that clients should use.
|
||||
# Encryption: whether or not to use encryption; this depends on having
|
||||
# the OpenSSL library linked into the CUPS library.
|
||||
#
|
||||
# Possible values:
|
||||
#
|
||||
# Always - Always use encryption (SSL)
|
||||
# Never - Never use encryption
|
||||
# Required - Use TLS encryption upgrade
|
||||
# IfRequested - Use encryption if the server requests it
|
||||
#
|
||||
# The default value is "IfRequested". This parameter can also be set
|
||||
# using the CUPS_ENCRYPTION environment variable.
|
||||
#
|
||||
|
||||
#DefaultPrinter myprinter
|
||||
#DefaultPrinter myprinter@host
|
||||
#Encryption Always
|
||||
#Encryption Never
|
||||
#Encryption Required
|
||||
#Encryption IfRequested
|
||||
|
||||
|
||||
#
|
||||
# End of "$Id: client.conf 969 2000-03-10 16:56:46Z mike $".
|
||||
# End of "$Id: client.conf 1605 2001-03-02 22:34:21Z andy $".
|
||||
#
|
||||
|
||||
+93
-20
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: cupsd.conf 1344 2000-09-06 18:32:40Z mike $"
|
||||
# "$Id: cupsd.conf 1631 2001-03-14 13:45:35Z mike $"
|
||||
#
|
||||
# Sample configuration file for the Common UNIX Printing System (CUPS)
|
||||
# scheduler.
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -71,6 +71,17 @@
|
||||
|
||||
#AccessLog /var/log/cups/access_log
|
||||
|
||||
#
|
||||
# Classification: the classification level of the server. If set, this
|
||||
# classification is displayed on all pages, and raw printing is disabled.
|
||||
# The default is the empty string.
|
||||
|
||||
#Classification classified
|
||||
#Classification confidential
|
||||
#Classification secret
|
||||
#Classification topsecret
|
||||
#Classification unclassified
|
||||
|
||||
#
|
||||
# DataDir: the root directory for the CUPS data files.
|
||||
# By default /usr/share/cups.
|
||||
@@ -98,7 +109,7 @@
|
||||
# By default the compiled in directory.
|
||||
#
|
||||
|
||||
#DocumentRoot /usr/share/cups/doc
|
||||
#DocumentRoot /usr/share/doc/cups
|
||||
|
||||
#
|
||||
# ErrorLog: the error log file; if this does not start with a leading /
|
||||
@@ -122,7 +133,8 @@
|
||||
# LogLevel: controls the number of messages logged to the ErrorLog
|
||||
# file and can be one of the following:
|
||||
#
|
||||
# debug Log everything.
|
||||
# debug2 Log everything.
|
||||
# debug Log almost everything.
|
||||
# info Log all requests and state changes.
|
||||
# warn Log errors and warnings.
|
||||
# error Log only errors.
|
||||
@@ -164,7 +176,21 @@ LogLevel info
|
||||
#PreserveJobFiles No
|
||||
|
||||
#
|
||||
# Printcap: the name of the printcap file. Default is no filename.
|
||||
# AutoPurgeJobs: automatically purge jobs when not needed for quotas.
|
||||
# Default is No.
|
||||
#
|
||||
|
||||
#AutoPurgeJobs No
|
||||
|
||||
#
|
||||
# MaxJobs: maximum number of jobs to keep in memory (active and completed.)
|
||||
# Default is 0 (no limit.)
|
||||
#
|
||||
|
||||
#MaxJobs 0
|
||||
|
||||
#
|
||||
# Printcap: the name of the printcap file. Default is /etc/printcap.
|
||||
# Leave blank to disable printcap file generation.
|
||||
#
|
||||
|
||||
@@ -199,6 +225,25 @@ LogLevel info
|
||||
#ServerRoot /etc/cups
|
||||
|
||||
|
||||
########
|
||||
######## Encryption Support
|
||||
########
|
||||
|
||||
#
|
||||
# ServerCertificate: the file to read containing the server's certificate.
|
||||
# Defaults to "/etc/cups/ssl/server.crt".
|
||||
#
|
||||
|
||||
#ServerCertificate /etc/cups/ssl/server.crt
|
||||
|
||||
#
|
||||
# ServerKey: the file to read containing the server's key.
|
||||
# Defaults to "/etc/cups/ssl/server.key".
|
||||
#
|
||||
|
||||
#ServerKey /etc/cups/ssl/server.key
|
||||
|
||||
|
||||
########
|
||||
######## Filter Options
|
||||
########
|
||||
@@ -263,8 +308,13 @@ LogLevel info
|
||||
# Listen 1.2.3.4
|
||||
# Listen 1.2.3.4:631
|
||||
#
|
||||
# NOTE: Unfortunately, most web browsers don't support TLS or HTTP Upgrades
|
||||
# for encryption. If you want to support web-based encryption you'll
|
||||
# probably need to listen on port 443 (the "https" port...)
|
||||
#
|
||||
|
||||
#Port 80
|
||||
#Port 443
|
||||
Port 631
|
||||
|
||||
#
|
||||
@@ -314,12 +364,30 @@ Port 631
|
||||
########
|
||||
|
||||
#
|
||||
# Browsing: whether or not to broadcast printer information to
|
||||
# other CUPS servers. Enabled by default.
|
||||
# Browsing: whether or not to broadcast and/or listen for CUPS printer
|
||||
# information on the network. Enabled by default.
|
||||
#
|
||||
|
||||
#Browsing On
|
||||
|
||||
#
|
||||
# BrowseAddress: specifies a broadcast address to be used. By
|
||||
# default browsing information is not sent!
|
||||
#
|
||||
# Note: HP-UX does not properly handle broadcast unless you have a
|
||||
# Class A, B, C, or D netmask (i.e. no CIDR support).
|
||||
#
|
||||
# Note: Using the "global" broadcast address (255.255.255.255) will
|
||||
# activate a Linux demand-dial link with the default configuration.
|
||||
# If you have a LAN as well as the dial-up link, use the LAN's
|
||||
# broadcast address.
|
||||
#
|
||||
|
||||
#BrowseAddress x.y.z.255
|
||||
#BrowseAddress x.y.255.255
|
||||
#BrowseAddress x.255.255.255
|
||||
#BrowseAddress 255.255.255.255
|
||||
|
||||
#
|
||||
# BrowseShortNames: whether or not to use "short" names for remote printers
|
||||
# when possible (e.g. "printer" instead of "printer@host".) Enabled by
|
||||
@@ -328,18 +396,6 @@ Port 631
|
||||
|
||||
#BrowseShortNames Yes
|
||||
|
||||
#
|
||||
# BrowseAddress: specifies a broadcast address to be used. By
|
||||
# default browsing information is broadcast to all active interfaces.
|
||||
#
|
||||
# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless
|
||||
# you have a Class A, B, C, or D netmask (i.e. no CIDR support).
|
||||
#
|
||||
|
||||
#BrowseAddress x.y.z.255
|
||||
#BrowseAddress x.y.255.255
|
||||
#BrowseAddress x.255.255.255
|
||||
|
||||
#
|
||||
# BrowseAllow: specifies an address mask to allow for incoming browser
|
||||
# packets. The default is to allow packets from all addresses.
|
||||
@@ -496,8 +552,23 @@ Port 631
|
||||
# The host and domain address require that you enable hostname lookups
|
||||
# with "HostNameLookups On" above.
|
||||
#
|
||||
# Encryption: whether or not to use encryption; this depends on having
|
||||
# the OpenSSL library linked into the CUPS library and scheduler.
|
||||
#
|
||||
# Possible values:
|
||||
#
|
||||
# Always - Always use encryption (SSL)
|
||||
# Never - Never use encryption
|
||||
# Required - Use TLS encryption upgrade
|
||||
# IfRequested - Use encryption if the server requests it
|
||||
#
|
||||
# The default value is "IfRequested".
|
||||
#
|
||||
|
||||
<Location />
|
||||
Order Deny,Allow
|
||||
Deny From All
|
||||
Allow From 127.0.0.1
|
||||
</Location>
|
||||
|
||||
#<Location /classes>
|
||||
@@ -559,8 +630,10 @@ AuthClass System
|
||||
Order Deny,Allow
|
||||
Deny From All
|
||||
Allow From 127.0.0.1
|
||||
|
||||
#Encryption Required
|
||||
</Location>
|
||||
|
||||
#
|
||||
# End of "$Id: cupsd.conf 1344 2000-09-06 18:32:40Z mike $".
|
||||
# End of "$Id: cupsd.conf 1631 2001-03-14 13:45:35Z mike $".
|
||||
#
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $"
|
||||
# "$Id: mime.convs 1605 2001-03-02 22:34:21Z andy $"
|
||||
#
|
||||
# MIME converts file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products.
|
||||
# Copyright 1997-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -74,5 +74,5 @@ application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster
|
||||
#*/* application/vnd.cups-raw 0 -
|
||||
|
||||
#
|
||||
# End of "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $".
|
||||
# End of "$Id: mime.convs 1605 2001-03-02 22:34:21Z andy $".
|
||||
#
|
||||
|
||||
+20
-10
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# "$Id: mime.types 1340 2000-09-06 13:53:00Z mike $"
|
||||
# "$Id: mime.types 1681 2001-04-19 15:42:39Z mike $"
|
||||
#
|
||||
# MIME types file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products.
|
||||
# Copyright 1997-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -60,7 +60,7 @@
|
||||
# accepts 8-bit characters in the range 128-255.
|
||||
#
|
||||
# String constants must be surrounded by "" if they contain whitespace.
|
||||
# To instead binary data into a string, use the <hex> notation.
|
||||
# To insert binary data into a string, use the <hex> notation.
|
||||
#
|
||||
|
||||
########################################################################
|
||||
@@ -71,9 +71,13 @@
|
||||
application/msword doc string(0,<D0CF11E0A1B11AE1>)
|
||||
application/pdf pdf string(0,%PDF)
|
||||
application/postscript ai eps ps string(0,%!) string(0,<04>%!)
|
||||
application/vnd.hp-HPGL hpgl string(0,<1b>%) string(0,<1b>&)\
|
||||
string(0,<1b>E) string(0,<201b>)\
|
||||
string(0,BP;) string(0,IN;) string(0,DF;)
|
||||
application/vnd.hp-HPGL hpgl string(0,<1B>&)\
|
||||
string(0,<1B>E<1B>%0B) string(0,<201B>)\
|
||||
string(0,BP;) string(0,IN;) string(0,DF;) \
|
||||
string(0,BPINPS;) \
|
||||
(string(0,<1B>%-12345X) + \
|
||||
(contains(9,512,"LANGUAGE=HPGL") \
|
||||
contains(9,512,"LANGUAGE = HPGL")))
|
||||
|
||||
########################################################################
|
||||
#
|
||||
@@ -97,7 +101,7 @@ image/x-sgi-rgb rgb sgi bw icon short(0,474)
|
||||
image/x-xbitmap xbm
|
||||
image/x-xpixmap xpm ascii(0,1024) + string(3,"XPM")
|
||||
image/x-xwindowdump xwd
|
||||
image/x-sun-raster ras
|
||||
image/x-sun-raster ras string(0,<59a66a95>)
|
||||
|
||||
#image/fpx fpx
|
||||
image/x-alias pix short(8,8) short(8,24)
|
||||
@@ -125,9 +129,15 @@ text/plain txt printable(0,1024)
|
||||
#
|
||||
|
||||
application/vnd.cups-form string(0,"<CUPSFORM>")
|
||||
application/vnd.cups-postscript string(0,<1B>%-12345X)
|
||||
application/vnd.cups-postscript string(0,<1B>%-12345X) + \
|
||||
(contains(9,512,"LANGUAGE=POSTSCRIPT") \
|
||||
contains(9,512,"LANGUAGE = POSTSCRIPT"))
|
||||
application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR")
|
||||
application/vnd.cups-raw
|
||||
application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \
|
||||
string(0,<1B>@) \
|
||||
(string(0,<1B>%-12345X) + \
|
||||
(contains(9,512,"LANGUAGE=PCL") \
|
||||
contains(9,512,"LANGUAGE = PCL")))
|
||||
|
||||
########################################################################
|
||||
#
|
||||
@@ -141,5 +151,5 @@ application/vnd.cups-raw
|
||||
#application/octet-stream
|
||||
|
||||
#
|
||||
# End of "$Id: mime.types 1340 2000-09-06 13:53:00Z mike $".
|
||||
# End of "$Id: mime.types 1681 2001-04-19 15:42:39Z mike $".
|
||||
#
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: printers.conf 1152 2000-06-22 18:25:29Z mike $"
|
||||
# "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $"
|
||||
#
|
||||
# Sample printer configuration file for the Common UNIX Printing System
|
||||
# (CUPS) scheduler.
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -92,5 +92,5 @@
|
||||
#</Printer>
|
||||
|
||||
#
|
||||
# End of "$Id: printers.conf 1152 2000-06-22 18:25:29Z mike $".
|
||||
# End of "$Id: printers.conf 1605 2001-03-02 22:34:21Z andy $".
|
||||
#
|
||||
|
||||
+20
-3
@@ -5,7 +5,7 @@
|
||||
*
|
||||
* @configure_input@
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -19,7 +19,7 @@
|
||||
* 44141 Airport View Drive, Suite 204
|
||||
* Hollywood, Maryland 20636-3111 USA
|
||||
*
|
||||
* Voice: (301) 373-9603
|
||||
* Voice: (301) 373-9600
|
||||
* EMail: cups-info@cups.org
|
||||
* WWW: http://www.cups.org
|
||||
*/
|
||||
@@ -28,7 +28,7 @@
|
||||
* Version of software...
|
||||
*/
|
||||
|
||||
#define CUPS_SVERSION "CUPS v1.1.3"
|
||||
#define CUPS_SVERSION "CUPS v1.1.7"
|
||||
|
||||
/*
|
||||
* Where are files stored?
|
||||
@@ -43,6 +43,11 @@
|
||||
#define CUPS_DATADIR "/usr/share/cups"
|
||||
#define CUPS_FONTPATH "/usr/share/cups/fonts"
|
||||
|
||||
/*
|
||||
* What is the format string for strftime?
|
||||
*/
|
||||
|
||||
#define CUPS_STRFTIME_FORMAT NULL
|
||||
|
||||
/*
|
||||
* Do we have various image libraries?
|
||||
@@ -130,6 +135,18 @@
|
||||
#undef HAVE_MALLINFO
|
||||
#undef HAVE_MALLOC_H
|
||||
|
||||
/*
|
||||
* Do we have the OpenSSL library?
|
||||
*/
|
||||
|
||||
#undef HAVE_LIBSSL
|
||||
|
||||
/*
|
||||
* Do we have <sys/ioctl.h>?
|
||||
*/
|
||||
|
||||
#undef HAVE_SYS_IOCTL_H
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
|
||||
+199
-88
@@ -3,7 +3,7 @@ dnl "$Id$"
|
||||
dnl
|
||||
dnl Configuration script for the Common UNIX Printing System (CUPS).
|
||||
dnl
|
||||
dnl Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
dnl Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
dnl
|
||||
dnl These coded instructions, statements, and computer programs are the
|
||||
dnl property of Easy Software Products and are protected by Federal
|
||||
@@ -42,11 +42,14 @@ AC_SUBST(OPTIM)
|
||||
PICFLAG=1
|
||||
CFLAGS="${CFLAGS:=}"
|
||||
CXXFLAGS="${CXXFLAGS:=}"
|
||||
DSOFLAGS="${DSOFLAGS:=}"
|
||||
AC_SUBST(DSOFLAGS)
|
||||
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
|
||||
OPTIM="-g "
|
||||
OPTIM="-g"
|
||||
fi])
|
||||
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=yes]])
|
||||
AC_ARG_ENABLE(ssl, [ --enable-ssl turn on SSL/TLS support [default=no]])
|
||||
AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=LIBTOOL_PATH
|
||||
turn on building with libtool (UNSUPPORTED!) [default=no]],[if eval "test x$enable_libtool_unsupported != xno"; then
|
||||
LIBTOOL="$enable_libtool_unsupported"
|
||||
@@ -63,34 +66,40 @@ if test "$enable_shared" != "no"; then
|
||||
SunOS* | UNIX_S*)
|
||||
LIBCUPS="libcups.so.2"
|
||||
LIBCUPSIMAGE="libcupsimage.so.2"
|
||||
DSO="\$(CC) -Wl,-h,\$@ -G \$(OPTIM) -o"
|
||||
DSO="\$(CC)"
|
||||
DSOFLAGS="$DSOFLAGS -Wl,-h,\$@ -G \$(OPTIM)"
|
||||
;;
|
||||
HP-UX*)
|
||||
LIBCUPS="libcups.sl.2"
|
||||
LIBCUPSIMAGE="libcupsimage.sl.2"
|
||||
DSO="ld -b -z +h \$@ -o"
|
||||
DSO="ld"
|
||||
DSOFLAGS="$DSOFLAGS -b -z +h \$@"
|
||||
;;
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
LIBCUPS="libcups.so.2"
|
||||
LIBCUPSIMAGE="libcupsimage.so.2"
|
||||
DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
|
||||
DSO="\$(CC)"
|
||||
DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
|
||||
;;
|
||||
OSF1* | Linux*)
|
||||
LIBCUPS="libcups.so.2"
|
||||
LIBCUPSIMAGE="libcupsimage.so.2"
|
||||
DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
|
||||
DSO="\$(CC)"
|
||||
DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
|
||||
;;
|
||||
IRIX*)
|
||||
LIBCUPS="libcups.so.2"
|
||||
LIBCUPSIMAGE="libcupsimage.so.2"
|
||||
DSO="\$(CC) -soname \$@ -shared \$(OPTIM) -o"
|
||||
DSO="\$(CC)"
|
||||
DSOFLAGS="$DSOFLAGS -soname \$@ -shared \$(OPTIM)"
|
||||
;;
|
||||
*)
|
||||
echo "Warning: shared libraries may not be supported. Trying -shared"
|
||||
echo " option with compiler."
|
||||
LIBCUPS="libcups.so.2"
|
||||
LIBCUPSIMAGE="libcupsimage.so.2"
|
||||
DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
|
||||
DSO="\$(CC)"
|
||||
DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
@@ -106,6 +115,7 @@ if test "$LIBTOOL" != ""; then
|
||||
LINKCUPS="../cups/\$(LIBCUPS)"
|
||||
LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
|
||||
DSO=":"
|
||||
DSOFLAGS=""
|
||||
else
|
||||
LINKCUPS="-L../cups -lcups"
|
||||
LINKCUPSIMAGE="-L../filter -lcupsimage"
|
||||
@@ -115,6 +125,8 @@ AC_ARG_ENABLE(pam, [ --enable-pam turn on PAM support [default=yes]])
|
||||
|
||||
AC_ARG_WITH(fontpath, [ --with-fontpath set font path for pstoraster],fontpath="$withval",fontpath="")
|
||||
|
||||
AC_ARG_WITH(docdir, [ --with-docdir set path for documentation],docdir="$withval",docdir="")
|
||||
|
||||
dnl Checks for programs...
|
||||
AC_PROG_AWK
|
||||
AC_PROG_CC
|
||||
@@ -189,6 +201,40 @@ else
|
||||
echo "Not using -lnsl since you are running IRIX."
|
||||
fi)
|
||||
|
||||
dnl Encryption support...
|
||||
|
||||
SSLLIBS=""
|
||||
AC_SUBST(SSLLIBS)
|
||||
|
||||
if test "$enable_ssl" = "yes"; then
|
||||
dnl Save the current libraries so the crypto stuff isn't always
|
||||
dnl included...
|
||||
SAVELIBS="$LIBS"
|
||||
|
||||
dnl Some ELF systems can't resolve all the symbols in libcrypto
|
||||
dnl if libcrypto was linked against RSAREF, and fail to link the
|
||||
dnl test program correctly, even though a correct installation
|
||||
dnl of OpenSSL exists. So we test the linking three times in
|
||||
dnl case the RSAREF libraries are needed.
|
||||
|
||||
for libcrypto in \
|
||||
"-lcrypto" \
|
||||
"-lcrypto -lrsaref" \
|
||||
"-lcrypto -lRSAglue -lrsaref"
|
||||
do
|
||||
AC_CHECK_LIB(ssl,SSL_new,
|
||||
[SSLLIBS="-lssl $libcrypto"
|
||||
AC_DEFINE(HAVE_LIBSSL)],,
|
||||
$libcrypto
|
||||
)
|
||||
if test "x${SSLLIBS}" != "x"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
LIBS="$SAVELIBS"
|
||||
fi
|
||||
|
||||
dnl Save the current libraries since we don't want the image libraries
|
||||
dnl included with every program...
|
||||
SAVELIBS="$LIBS"
|
||||
@@ -236,13 +282,34 @@ AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
|
||||
AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
|
||||
AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H))
|
||||
AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
|
||||
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
|
||||
|
||||
dnl Checks for string functions.
|
||||
AC_CHECK_FUNCS(strdup)
|
||||
AC_CHECK_FUNCS(strcasecmp)
|
||||
AC_CHECK_FUNCS(strncasecmp)
|
||||
AC_CHECK_FUNCS(snprintf)
|
||||
AC_CHECK_FUNCS(vsnprintf)
|
||||
if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
|
||||
echo Forcing snprintf emulation for HP-UX.
|
||||
else
|
||||
AC_CHECK_FUNCS(snprintf)
|
||||
AC_CHECK_FUNCS(vsnprintf)
|
||||
fi
|
||||
|
||||
dnl Check OS version and use appropriate format string for strftime...
|
||||
AC_MSG_CHECKING(for correct format string to use with strftime)
|
||||
|
||||
case "$uname" in
|
||||
IRIX* | SunOS*)
|
||||
# IRIX and SunOS
|
||||
AC_MSG_RESULT(NULL)
|
||||
AC_DEFINE(CUPS_STRFTIME_FORMAT, NULL)
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
AC_MSG_RESULT("%c")
|
||||
AC_DEFINE(CUPS_STRFTIME_FORMAT, "%c")
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Checks for vsyslog function.
|
||||
AC_CHECK_FUNCS(vsyslog)
|
||||
@@ -260,8 +327,10 @@ AC_CHECK_FUNCS(wait3)
|
||||
|
||||
dnl Update compiler options...
|
||||
if test -n "$GCC"; then
|
||||
CXX="$CC"
|
||||
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-O2 -g3"
|
||||
OPTIM="-O2"
|
||||
fi
|
||||
if test $PICFLAG = 1; then
|
||||
OPTIM="-fPIC $OPTIM"
|
||||
@@ -271,7 +340,7 @@ else
|
||||
case $uname in
|
||||
IRIX*)
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-O2 -g3"
|
||||
OPTIM="-O2"
|
||||
fi
|
||||
if test $uversion -ge 62; then
|
||||
OPTIM="$OPTIM -n32 -mips3"
|
||||
@@ -280,15 +349,20 @@ else
|
||||
;;
|
||||
HP-UX*)
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="+O2 -g3"
|
||||
OPTIM="+O2"
|
||||
fi
|
||||
CFLAGS="-Ae $CFLAGS"
|
||||
OPTIM="+DAportable $OPTIM"
|
||||
if test $PICFLAG = 1; then
|
||||
OPTIM="+z $OPTIM"
|
||||
fi
|
||||
OPTIM="-Ae $OPTIM"
|
||||
;;
|
||||
SunOS*)
|
||||
# Solaris
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-O -g3"
|
||||
OPTIM="-xO4"
|
||||
fi
|
||||
OPTIM="$OPTIM -xarch=generic"
|
||||
if test $PICFLAG = 1; then
|
||||
OPTIM="-KPIC $OPTIM"
|
||||
fi
|
||||
@@ -310,28 +384,32 @@ if test "$DSO" != ":"; then
|
||||
# rather than to the executables. This makes things smaller if you
|
||||
# are using any static libraries, and it also allows us to distribute
|
||||
# a single DSO rather than a bunch...
|
||||
DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
|
||||
DSOLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
|
||||
IMGLIBS=""
|
||||
|
||||
# The *BSD, HP-UX, and Solaris run-time linkers need help when
|
||||
# deciding where to find a DSO. Add linker options to tell them
|
||||
# where to find the DSO (usually in /usr/lib... duh!)
|
||||
case $uname in
|
||||
HP-UX*)
|
||||
LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
|
||||
;;
|
||||
SunOS*)
|
||||
# Solaris
|
||||
LDFLAGS="$LDFLAGS -R$libdir"
|
||||
;;
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
LDFLAGS="$LDFLAGS -Wl,-R$libdir"
|
||||
;;
|
||||
HP-UX*)
|
||||
# HP-UX
|
||||
DSOFLAGS="+b $libdir +fb $DSOFLAGS"
|
||||
LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
|
||||
;;
|
||||
SunOS*)
|
||||
# Solaris
|
||||
DSOFLAGS="-R$libdir $DSOFLAGS"
|
||||
LDFLAGS="$LDFLAGS -R$libdir"
|
||||
;;
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
|
||||
LDFLAGS="$LDFLAGS -Wl,-R$libdir"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
DSOLIBS=""
|
||||
IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
|
||||
IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"
|
||||
fi
|
||||
|
||||
AC_SUBST(DSO)
|
||||
@@ -362,14 +440,13 @@ if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
|
||||
sharedstatedir="/usr/com"
|
||||
fi
|
||||
|
||||
dnl Fix "infodir" variable if it hasn't been specified...
|
||||
if test "$infodir" = "\${prefix}/info" -a "$prefix" = "/"; then
|
||||
infodir="/usr/info"
|
||||
fi
|
||||
|
||||
dnl Fix "datadir" variable if it hasn't been specified...
|
||||
if test "$datadir" = "\${prefix}/share" -a "$prefix" = "/"; then
|
||||
datadir="/usr/share"
|
||||
if test "$datadir" = "\${prefix}/share"; then
|
||||
if test "$prefix" = "/"; then
|
||||
datadir="/usr/share"
|
||||
else
|
||||
datadir="$prefix/share"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Fix "includedir" variable if it hasn't been specified...
|
||||
@@ -402,13 +479,29 @@ fi
|
||||
|
||||
dnl Fix "mandir" variable...
|
||||
if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
|
||||
if test "$uname" = "IRIX"; then
|
||||
mandir="/usr/share/catman"
|
||||
else
|
||||
mandir="/usr/man"
|
||||
fi
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
mandir="/usr/share/man"
|
||||
AMANDIR="/usr/share/man"
|
||||
;;
|
||||
IRIX*)
|
||||
# SGI IRIX
|
||||
mandir="/usr/share/catman/u_man"
|
||||
AMANDIR="/usr/share/catman/a_man"
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
mandir="/usr/man"
|
||||
AMANDIR="/usr/man"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AMANDIR="$mandir"
|
||||
fi
|
||||
|
||||
AC_SUBST(AMANDIR)
|
||||
|
||||
dnl Fix "fontpath" variable...
|
||||
if test "x$fontpath" = "x"; then
|
||||
fontpath="$datadir/cups/fonts"
|
||||
@@ -421,80 +514,92 @@ case "$uname" in
|
||||
CAT1EXT=0
|
||||
CAT5EXT=0
|
||||
CAT8EXT=0
|
||||
MAN8EXT=8
|
||||
;;
|
||||
IRIX*)
|
||||
# SGI IRIX
|
||||
CAT1EXT=z
|
||||
CAT5EXT=z
|
||||
CAT8EXT=z
|
||||
MAN8EXT=1m
|
||||
;;
|
||||
SunOS* | HP-UX*)
|
||||
# Solaris and HP-UX
|
||||
CAT1EXT=1
|
||||
CAT5EXT=5
|
||||
CAT8EXT=1m
|
||||
MAN8EXT=1m
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
CAT1EXT=1
|
||||
CAT5EXT=5
|
||||
CAT8EXT=8
|
||||
MAN8EXT=8
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(CAT1EXT)
|
||||
AC_SUBST(CAT5EXT)
|
||||
AC_SUBST(CAT8EXT)
|
||||
AC_SUBST(MAN8EXT)
|
||||
|
||||
dnl Setup init.d locations...
|
||||
if test $prefix = "/"; then
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
INITDIR=""
|
||||
INITDDIR=""
|
||||
;;
|
||||
case "$uname" in
|
||||
FreeBSD* | OpenBSD*)
|
||||
# FreeBSD and OpenBSD
|
||||
INITDIR=""
|
||||
INITDDIR=""
|
||||
;;
|
||||
|
||||
Linux*)
|
||||
# Linux seems to choose an init.d directory at random...
|
||||
if test -d /sbin/init.d; then
|
||||
# SuSE
|
||||
INITDIR="/sbin/init.d"
|
||||
INITDDIR=".."
|
||||
NetBSD*)
|
||||
# NetBSD
|
||||
INITDIR=""
|
||||
INITDDIR="/etc/rc.d"
|
||||
;;
|
||||
|
||||
Linux*)
|
||||
# Linux seems to choose an init.d directory at random...
|
||||
if test -d /sbin/init.d; then
|
||||
# SuSE
|
||||
INITDIR="/sbin/init.d"
|
||||
INITDDIR=".."
|
||||
else
|
||||
if test -d /etc/rc.d; then
|
||||
# RedHat
|
||||
INITDIR="/etc/rc.d"
|
||||
INITDDIR="../init.d"
|
||||
else
|
||||
if test -d /etc/rc.d; then
|
||||
# RedHat
|
||||
INITDIR="/etc/rc.d"
|
||||
INITDDIR="../init.d"
|
||||
else
|
||||
# Others
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
fi
|
||||
# Others
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
fi
|
||||
;;
|
||||
fi
|
||||
;;
|
||||
|
||||
OSF1* | HP-UX*)
|
||||
INITDIR="/sbin"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
OSF1* | HP-UX*)
|
||||
INITDIR="/sbin"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
|
||||
*)
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
*)
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
|
||||
esac
|
||||
else
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
fi
|
||||
esac
|
||||
|
||||
AC_SUBST(INITDIR)
|
||||
AC_SUBST(INITDDIR)
|
||||
|
||||
dnl Setup default locations...
|
||||
CUPS_SERVERROOT='${prefix}/etc/cups'
|
||||
CUPS_LOGDIR='${prefix}/var/log/cups'
|
||||
CUPS_REQUESTS='${prefix}/var/spool/cups'
|
||||
CUPS_SERVERROOT='${sysconfdir}/cups'
|
||||
CUPS_LOGDIR='${localstatedir}/log/cups'
|
||||
CUPS_REQUESTS='${localstatedir}/spool/cups'
|
||||
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
|
||||
|
||||
dnl See what directory to put server executables...
|
||||
case "$uname" in
|
||||
@@ -521,8 +626,8 @@ AC_SUBST(CUPS_REQUESTS)
|
||||
dnl Set the CUPS_LOCALE directory...
|
||||
case "$uname" in
|
||||
Linux* | FreeBSD* | NetBSD* | OpenBSD*)
|
||||
CUPS_LOCALEDIR='${exec_prefix}/share/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/share/locale")
|
||||
CUPS_LOCALEDIR='${datadir}/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
|
||||
;;
|
||||
|
||||
OSF1*)
|
||||
@@ -540,13 +645,19 @@ esac
|
||||
AC_SUBST(CUPS_LOCALEDIR)
|
||||
|
||||
dnl Set the CUPS_DATADIR directory...
|
||||
CUPS_DATADIR='${exec_prefix}/share/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$exec_prefix/share/cups")
|
||||
CUPS_DATADIR='${datadir}/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
|
||||
AC_SUBST(CUPS_DATADIR)
|
||||
|
||||
dnl Set the CUPS_DOCROOT directory...
|
||||
CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
|
||||
if test x$docdir = x; then
|
||||
CUPS_DOCROOT='${datadir}/doc/cups'
|
||||
docdir="$datadir/doc/cups"
|
||||
else
|
||||
CUPS_DOCROOT="$docdir"
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
|
||||
AC_SUBST(CUPS_DOCROOT)
|
||||
|
||||
dnl Set the CUPS_FONTPATH directory...
|
||||
|
||||
-99
@@ -15,105 +15,6 @@ Package=<4>
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "cupsd"=.\scheduler\cupsd.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name cups
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "hpgltops"=.\filter\hpgltops.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name cups
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "image"=.\filter\image.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "pstops"=.\filter\pstops.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "testmime"=.\cups\testmime.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name cups
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "testppd"=.\cups\testppd.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name cups
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "texttops"=.\filter\texttops.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name cups
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
|
||||
+45
-236
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: cups.list 1368 2000-09-14 18:04:10Z mike $"
|
||||
# "$Id: cups.list 1682 2001-04-19 16:35:35Z mike $"
|
||||
#
|
||||
# ESP Package Manager (EPM) file list for the Common UNIX Printing
|
||||
# System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -23,14 +23,16 @@
|
||||
# WWW: http://www.cups.org
|
||||
#
|
||||
|
||||
# Product information
|
||||
%product Common UNIX Printing System
|
||||
%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
|
||||
%copyright 1993-2001 by Easy Software Products, All Rights Reserved.
|
||||
%vendor Easy Software Products
|
||||
%license LICENSE.txt
|
||||
%readme README.txt
|
||||
%version 1.1.3
|
||||
%version 1.1.7
|
||||
%incompat printpro
|
||||
|
||||
# Server programs
|
||||
%system all
|
||||
# Server files
|
||||
f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
|
||||
@@ -162,153 +164,26 @@ f 0444 root sys $DATADIR/data/psglyphs data/psglyphs
|
||||
f 0444 root sys $DATADIR/data/testprint.ps data/testprint.ps
|
||||
|
||||
d 0555 root sys $DATADIR/fonts -
|
||||
f 0444 root sys $DATADIR/fonts/AvantGarde-Book fonts/AvantGarde-Book
|
||||
f 0444 root sys $DATADIR/fonts/AvantGarde-BookOblique fonts/AvantGarde-BookOblique
|
||||
f 0444 root sys $DATADIR/fonts/AvantGarde-Demi fonts/AvantGarde-Demi
|
||||
f 0444 root sys $DATADIR/fonts/AvantGarde-DemiOblique fonts/AvantGarde-DemiOblique
|
||||
f 0444 root sys $DATADIR/fonts/Bookman-Demi fonts/Bookman-Demi
|
||||
f 0444 root sys $DATADIR/fonts/Bookman-DemiItalic fonts/Bookman-DemiItalic
|
||||
f 0444 root sys $DATADIR/fonts/Bookman-Light fonts/Bookman-Light
|
||||
f 0444 root sys $DATADIR/fonts/Bookman-LightItalic fonts/Bookman-LightItalic
|
||||
f 0444 root sys $DATADIR/fonts/Charter-Bold fonts/Charter-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Charter-BoldItalic fonts/Charter-BoldItalic
|
||||
f 0444 root sys $DATADIR/fonts/Charter-Italic fonts/Charter-Italic
|
||||
f 0444 root sys $DATADIR/fonts/Charter-Roman fonts/Charter-Roman
|
||||
f 0444 root sys $DATADIR/fonts/Courier fonts/Courier
|
||||
f 0444 root sys $DATADIR/fonts/Courier-Bold fonts/Courier-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Courier-BoldOblique fonts/Courier-BoldOblique
|
||||
f 0444 root sys $DATADIR/fonts/Courier-Oblique fonts/Courier-Oblique
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica fonts/Helvetica
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Bold fonts/Helvetica-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-BoldOblique fonts/Helvetica-BoldOblique
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Narrow fonts/Helvetica-Narrow
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Narrow-Bold fonts/Helvetica-Narrow-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Narrow-BoldOblique fonts/Helvetica-Narrow-BoldOblique
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Narrow-Oblique fonts/Helvetica-Narrow-Oblique
|
||||
f 0444 root sys $DATADIR/fonts/Helvetica-Oblique fonts/Helvetica-Oblique
|
||||
f 0444 root sys $DATADIR/fonts/NewCenturySchlbk-Bold fonts/NewCenturySchlbk-Bold
|
||||
f 0444 root sys $DATADIR/fonts/NewCenturySchlbk-BoldItalic fonts/NewCenturySchlbk-BoldItalic
|
||||
f 0444 root sys $DATADIR/fonts/NewCenturySchlbk-Italic fonts/NewCenturySchlbk-Italic
|
||||
f 0444 root sys $DATADIR/fonts/NewCenturySchlbk-Roman fonts/NewCenturySchlbk-Roman
|
||||
f 0444 root sys $DATADIR/fonts/Palatino-Bold fonts/Palatino-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Palatino-BoldItalic fonts/Palatino-BoldItalic
|
||||
f 0444 root sys $DATADIR/fonts/Palatino-Italic fonts/Palatino-Italic
|
||||
f 0444 root sys $DATADIR/fonts/Palatino-Roman fonts/Palatino-Roman
|
||||
f 0444 root sys $DATADIR/fonts/Symbol fonts/Symbol
|
||||
f 0444 root sys $DATADIR/fonts/Times-Bold fonts/Times-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Times-BoldItalic fonts/Times-BoldItalic
|
||||
f 0444 root sys $DATADIR/fonts/Times-Italic fonts/Times-Italic
|
||||
f 0444 root sys $DATADIR/fonts/Times-Roman fonts/Times-Roman
|
||||
f 0444 root sys $DATADIR/fonts/Utopia-Bold fonts/Utopia-Bold
|
||||
f 0444 root sys $DATADIR/fonts/Utopia-BoldItalic fonts/Utopia-BoldItalic
|
||||
f 0444 root sys $DATADIR/fonts/Utopia-Italic fonts/Utopia-Italic
|
||||
f 0444 root sys $DATADIR/fonts/Utopia-Regular fonts/Utopia-Regular
|
||||
f 0444 root sys $DATADIR/fonts/ZapfChancery-MediumItalic fonts/ZapfChancery-MediumItalic
|
||||
f 0444 root sys $DATADIR/fonts/ZapfDingbats fonts/ZapfDingbats
|
||||
f 0444 root sys $DATADIR/fonts fonts/*
|
||||
|
||||
d 0555 root sys $DATADIR/pstoraster -
|
||||
f 0444 root sys $DATADIR/pstoraster/Fontmap pstoraster/Fontmap
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_btokn.ps pstoraster/gs_btokn.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_ccfnt.ps pstoraster/gs_ccfnt.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_cff.ps pstoraster/gs_cff.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_cidfn.ps pstoraster/gs_cidfn.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_cmap.ps pstoraster/gs_cmap.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_cmdl.ps pstoraster/gs_cmdl.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_dbt_e.ps pstoraster/gs_dbt_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_diskf.ps pstoraster/gs_diskf.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_dpnxt.ps pstoraster/gs_dpnxt.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_dps.ps pstoraster/gs_dps.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_dps1.ps pstoraster/gs_dps1.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_dps2.ps pstoraster/gs_dps2.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_epsf.ps pstoraster/gs_epsf.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_fform.ps pstoraster/gs_fform.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_fonts.ps pstoraster/gs_fonts.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_init.ps pstoraster/gs_init.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_iso_e.ps pstoraster/gs_iso_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_kanji.ps pstoraster/gs_kanji.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_ksb_e.ps pstoraster/gs_ksb_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_lev2.ps pstoraster/gs_lev2.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_ll3.ps pstoraster/gs_ll3.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_mex_e.ps pstoraster/gs_mex_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_mro_e.ps pstoraster/gs_mro_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_pfile.ps pstoraster/gs_pfile.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_res.ps pstoraster/gs_res.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_setpd.ps pstoraster/gs_setpd.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_statd.ps pstoraster/gs_statd.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_std_e.ps pstoraster/gs_std_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_sym_e.ps pstoraster/gs_sym_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_ttf.ps pstoraster/gs_ttf.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_typ32.ps pstoraster/gs_typ32.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_typ42.ps pstoraster/gs_typ42.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_type1.ps pstoraster/gs_type1.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_wan_e.ps pstoraster/gs_wan_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_wl1_e.ps pstoraster/gs_wl1_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_wl2_e.ps pstoraster/gs_wl2_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster/gs_wl5_e.ps pstoraster/gs_wl5_e.ps
|
||||
f 0444 root sys $DATADIR/pstoraster pstoraster/gs*.ps
|
||||
|
||||
d 0555 root sys $DATADIR/model -
|
||||
f 0444 root sys $DATADIR/model/deskjet.ppd ppd/deskjet.ppd
|
||||
f 0444 root sys $DATADIR/model/laserjet.ppd ppd/laserjet.ppd
|
||||
f 0444 root sys $DATADIR/model/epson9.ppd ppd/epson9.ppd
|
||||
f 0444 root sys $DATADIR/model/epson24.ppd ppd/epson24.ppd
|
||||
f 0444 root sys $DATADIR/model/stcolor.ppd ppd/stcolor.ppd
|
||||
f 0444 root sys $DATADIR/model/stphoto.ppd ppd/stphoto.ppd
|
||||
f 0444 root sys $DATADIR/model ppd/*.ppd
|
||||
|
||||
d 0555 root sys $DATADIR/templates -
|
||||
f 0444 root sys $DATADIR/templates/add-class.tmpl templates/add-class.tmpl
|
||||
f 0444 root sys $DATADIR/templates/add-printer.tmpl templates/add-printer.tmpl
|
||||
f 0444 root sys $DATADIR/templates/admin-op.tmpl templates/admin-op.tmpl
|
||||
f 0444 root sys $DATADIR/templates/admin.tmpl templates/admin.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-device.tmpl templates/choose-device.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-make.tmpl templates/choose-make.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-members.tmpl templates/choose-members.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-model.tmpl templates/choose-model.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-serial.tmpl templates/choose-serial.tmpl
|
||||
f 0444 root sys $DATADIR/templates/choose-uri.tmpl templates/choose-uri.tmpl
|
||||
f 0444 root sys $DATADIR/templates/class-added.tmpl templates/class-added.tmpl
|
||||
f 0444 root sys $DATADIR/templates/class-confirm.tmpl templates/class-confirm.tmpl
|
||||
f 0444 root sys $DATADIR/templates/class-deleted.tmpl templates/class-deleted.tmpl
|
||||
f 0444 root sys $DATADIR/templates/class-modified.tmpl templates/class-modified.tmpl
|
||||
f 0444 root sys $DATADIR/templates/classes.tmpl templates/classes.tmpl
|
||||
f 0444 root sys $DATADIR/templates/config-printer.tmpl templates/config-printer.tmpl
|
||||
f 0444 root sys $DATADIR/templates/config-printer2.tmpl templates/config-printer2.tmpl
|
||||
f 0444 root sys $DATADIR/templates/error.tmpl templates/error.tmpl
|
||||
f 0444 root sys $DATADIR/templates/header.tmpl templates/header.tmpl
|
||||
f 0444 root sys $DATADIR/templates/job-cancel.tmpl templates/job-cancel.tmpl
|
||||
f 0444 root sys $DATADIR/templates/job-hold.tmpl templates/job-hold.tmpl
|
||||
f 0444 root sys $DATADIR/templates/job-release.tmpl templates/job-release.tmpl
|
||||
f 0444 root sys $DATADIR/templates/job-restart.tmpl templates/job-restart.tmpl
|
||||
f 0444 root sys $DATADIR/templates/jobs.tmpl templates/jobs.tmpl
|
||||
f 0444 root sys $DATADIR/templates/modify-class.tmpl templates/modify-class.tmpl
|
||||
f 0444 root sys $DATADIR/templates/modify-printer.tmpl templates/modify-printer.tmpl
|
||||
f 0444 root sys $DATADIR/templates/option-boolean.tmpl templates/option-boolean.tmpl
|
||||
f 0444 root sys $DATADIR/templates/option-header.tmpl templates/option-header.tmpl
|
||||
f 0444 root sys $DATADIR/templates/option-pickmany.tmpl templates/option-pickmany.tmpl
|
||||
f 0444 root sys $DATADIR/templates/option-pickone.tmpl templates/option-pickone.tmpl
|
||||
f 0444 root sys $DATADIR/templates/option-trailer.tmpl templates/option-trailer.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-accept.tmpl templates/printer-accept.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-added.tmpl templates/printer-added.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-configured.tmpl templates/printer-configured.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-confirm.tmpl templates/printer-confirm.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-deleted.tmpl templates/printer-deleted.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-modified.tmpl templates/printer-modified.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-reject.tmpl templates/printer-reject.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-start.tmpl templates/printer-start.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printer-stop.tmpl templates/printer-stop.tmpl
|
||||
f 0444 root sys $DATADIR/templates/printers.tmpl templates/printers.tmpl
|
||||
f 0444 root sys $DATADIR/templates/test-page.tmpl templates/test-page.tmpl
|
||||
f 0444 root sys $DATADIR/templates/trailer.tmpl templates/trailer.tmpl
|
||||
f 0444 root sys $DATADIR/templates templates/*.tmpl
|
||||
|
||||
# Config files
|
||||
d 0555 root sys $SERVERROOT -
|
||||
d 0711 root sys $SERVERROOT/certs -
|
||||
d 0755 root sys $SERVERROOT/interfaces -
|
||||
d 0755 root sys $SERVERROOT/ppd -
|
||||
c 0644 root sys $SERVERROOT/classes.conf conf/classes.conf
|
||||
c 0644 root sys $SERVERROOT/cupsd.conf conf/cupsd.conf
|
||||
c 0644 root sys $SERVERROOT conf/*.conf
|
||||
f 0644 root sys $SERVERROOT/mime.convs conf/mime.convs
|
||||
f 0644 root sys $SERVERROOT/mime.types conf/mime.types
|
||||
c 0644 root sys $SERVERROOT/printers.conf conf/printers.conf
|
||||
|
||||
%system linux
|
||||
d 0555 root sys $PAMDIR -
|
||||
@@ -335,110 +210,44 @@ f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
|
||||
# Documentation files
|
||||
d 0555 root sys $DOCDIR -
|
||||
f 0444 root sys $DOCDIR/cups.css doc/cups.css
|
||||
f 0444 root sys $DOCDIR/documentation.html doc/documentation.html
|
||||
f 0444 root sys $DOCDIR/index.html doc/index.html
|
||||
|
||||
f 0444 root sys $DOCDIR doc/*.html
|
||||
f 0444 root sys $DOCDIR doc/*.pdf
|
||||
d 0555 root sys $DOCDIR/images -
|
||||
|
||||
f 0444 root sys $DOCDIR/images/classes.gif doc/images/classes.gif
|
||||
f 0444 root sys $DOCDIR/images/printer-idle.gif doc/images/printer-idle.gif
|
||||
f 0444 root sys $DOCDIR/images/printer-processing.gif doc/images/printer-processing.gif
|
||||
f 0444 root sys $DOCDIR/images/printer-stopped.gif doc/images/printer-stopped.gif
|
||||
|
||||
f 0444 root sys $DOCDIR/images/accept-jobs.gif doc/images/accept-jobs.gif
|
||||
f 0444 root sys $DOCDIR/images/add-class.gif doc/images/add-class.gif
|
||||
f 0444 root sys $DOCDIR/images/add-printer.gif doc/images/add-printer.gif
|
||||
f 0444 root sys $DOCDIR/images/cancel-job.gif doc/images/cancel-job.gif
|
||||
f 0444 root sys $DOCDIR/images/cancel-jobs.gif doc/images/cancel-jobs.gif
|
||||
f 0444 root sys $DOCDIR/images/cancel.gif doc/images/cancel.gif
|
||||
f 0444 root sys $DOCDIR/images/continue.gif doc/images/continue.gif
|
||||
f 0444 root sys $DOCDIR/images/config-printer.gif doc/images/config-printer.gif
|
||||
f 0444 root sys $DOCDIR/images/cups-block-diagram.gif doc/images/cups-block-diagram.gif
|
||||
f 0444 root sys $DOCDIR/images/delete-class.gif doc/images/delete-class.gif
|
||||
f 0444 root sys $DOCDIR/images/delete-printer.gif doc/images/delete-printer.gif
|
||||
f 0444 root sys $DOCDIR/images/hold-job.gif doc/images/hold-job.gif
|
||||
f 0444 root sys $DOCDIR/images/left.gif doc/images/left.gif
|
||||
f 0444 root sys $DOCDIR/images/logo.gif doc/images/logo.gif
|
||||
f 0444 root sys $DOCDIR/images/manage-classes.gif doc/images/manage-classes.gif
|
||||
f 0444 root sys $DOCDIR/images/manage-jobs.gif doc/images/manage-jobs.gif
|
||||
f 0444 root sys $DOCDIR/images/manage-printers.gif doc/images/manage-printers.gif
|
||||
f 0444 root sys $DOCDIR/images/modify-class.gif doc/images/modify-class.gif
|
||||
f 0444 root sys $DOCDIR/images/modify-printer.gif doc/images/modify-printer.gif
|
||||
f 0444 root sys $DOCDIR/images/navbar.gif doc/images/navbar.gif
|
||||
f 0444 root sys $DOCDIR/images/print-test-page.gif doc/images/print-test-page.gif
|
||||
f 0444 root sys $DOCDIR/images/reject-jobs.gif doc/images/reject-jobs.gif
|
||||
f 0444 root sys $DOCDIR/images/release-job.gif doc/images/release-job.gif
|
||||
f 0444 root sys $DOCDIR/images/restart-job.gif doc/images/restart-job.gif
|
||||
f 0444 root sys $DOCDIR/images/right.gif doc/images/right.gif
|
||||
f 0444 root sys $DOCDIR/images/show-active.gif doc/images/show-active.gif
|
||||
f 0444 root sys $DOCDIR/images/show-completed.gif doc/images/show-completed.gif
|
||||
f 0444 root sys $DOCDIR/images/start-class.gif doc/images/start-class.gif
|
||||
f 0444 root sys $DOCDIR/images/start-printer.gif doc/images/start-printer.gif
|
||||
f 0444 root sys $DOCDIR/images/stop-class.gif doc/images/stop-class.gif
|
||||
f 0444 root sys $DOCDIR/images/stop-printer.gif doc/images/stop-printer.gif
|
||||
|
||||
f 0444 root sys $DOCDIR/cmp.html doc/cmp.html
|
||||
f 0444 root sys $DOCDIR/cmp.pdf doc/cmp.pdf
|
||||
f 0444 root sys $DOCDIR/cupsdoc.css doc/cupsdoc.css
|
||||
f 0444 root sys $DOCDIR/idd.html doc/idd.html
|
||||
f 0444 root sys $DOCDIR/idd.pdf doc/idd.pdf
|
||||
f 0444 root sys $DOCDIR/ipp.html doc/ipp.html
|
||||
f 0444 root sys $DOCDIR/ipp.pdf doc/ipp.pdf
|
||||
f 0444 root sys $DOCDIR/overview.html doc/overview.html
|
||||
f 0444 root sys $DOCDIR/overview.pdf doc/overview.pdf
|
||||
f 0444 root sys $DOCDIR/sam.html doc/sam.html
|
||||
f 0444 root sys $DOCDIR/sam.pdf doc/sam.pdf
|
||||
f 0444 root sys $DOCDIR/sdd.html doc/sdd.html
|
||||
f 0444 root sys $DOCDIR/sdd.pdf doc/sdd.pdf
|
||||
f 0444 root sys $DOCDIR/spm.html doc/spm.html
|
||||
f 0444 root sys $DOCDIR/spm.pdf doc/spm.pdf
|
||||
f 0444 root sys $DOCDIR/sps.html doc/sps.html
|
||||
f 0444 root sys $DOCDIR/sps.pdf doc/sps.pdf
|
||||
f 0444 root sys $DOCDIR/ssr.html doc/ssr.html
|
||||
f 0444 root sys $DOCDIR/ssr.pdf doc/ssr.pdf
|
||||
f 0444 root sys $DOCDIR/sum.html doc/sum.html
|
||||
f 0444 root sys $DOCDIR/sum.pdf doc/sum.pdf
|
||||
f 0444 root sys $DOCDIR/svd.html doc/svd.html
|
||||
f 0444 root sys $DOCDIR/svd.pdf doc/svd.pdf
|
||||
f 0444 root sys $DOCDIR/images/cups-bar.gif doc/images/cups-bar.gif
|
||||
f 0444 root sys $DOCDIR/images/cups-large.gif doc/images/cups-large.gif
|
||||
f 0444 root sys $DOCDIR/images/cups-medium.gif doc/images/cups-medium.gif
|
||||
f 0444 root sys $DOCDIR/images/cups-small.gif doc/images/cups-small.gif
|
||||
|
||||
f 0444 root sys $DOCDIR/images doc/images/*.gif
|
||||
|
||||
# Man pages
|
||||
%system irix
|
||||
d 0555 root sys $MANDIR/a_man -
|
||||
d 0555 root sys $MANDIR/a_man/cat1 -
|
||||
d 0555 root sys $MANDIR/u_man -
|
||||
d 0555 root sys $MANDIR/u_man/cat1 -
|
||||
d 0555 root sys $MANDIR/u_man/cat5 -
|
||||
d 0555 root sys $AMANDIR -
|
||||
d 0555 root sys $AMANDIR/cat1 -
|
||||
d 0555 root sys $MANDIR -
|
||||
d 0555 root sys $MANDIR/cat1 -
|
||||
d 0555 root sys $MANDIR/cat5 -
|
||||
|
||||
f 0444 root sys $MANDIR/a_man/cat1/accept.z man/accept.z
|
||||
l 0444 root sys $MANDIR/a_man/cat1/reject.z accept.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/backend.z man/backend.z
|
||||
f 0444 root sys $MANDIR/u_man/cat5/classes.conf.z man/classes.conf.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/cups-lpd.z man/cups-lpd.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/cups-polld.z man/cups-polld.z
|
||||
f 0444 root sys $MANDIR/u_man/cat5/cupsd.conf.z man/cupsd.conf.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/cupsd.z man/cupsd.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/enable.z man/enable.z
|
||||
l 0444 root sys $MANDIR/a_man/cat1/disable.z enable.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/filter.z man/filter.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/lpadmin.z man/lpadmin.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/lpc.z man/lpc.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/lpinfo.z man/lpinfo.z
|
||||
f 0444 root sys $MANDIR/a_man/cat1/lpmove.z man/lpmove.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lpoptions.z man/lpoptions.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lpq.z man/lpq.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lprm.z man/lprm.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lpr.z man/lpr.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lpstat.z man/lpstat.z
|
||||
f 0444 root sys $MANDIR/u_man/cat1/lp.z man/lp.z
|
||||
l 0444 root sys $MANDIR/u_man/cat1/cancel.z lp.z
|
||||
f 0444 root sys $MANDIR/u_man/cat5/mime.convs.z man/mime.convs.z
|
||||
f 0444 root sys $MANDIR/u_man/cat5/mime.types.z man/mime.types.z
|
||||
f 0444 root sys $MANDIR/u_man/cat5/printers.conf.z man/printers.conf.z
|
||||
f 0444 root sys $AMANDIR/cat1/accept.z man/accept.z
|
||||
l 0444 root sys $AMANDIR/cat1/reject.z accept.z
|
||||
f 0444 root sys $MANDIR/cat1/backend.z man/backend.z
|
||||
f 0444 root sys $MANDIR/cat5/classes.conf.z man/classes.conf.z
|
||||
f 0444 root sys $AMANDIR/cat1/cups-lpd.z man/cups-lpd.z
|
||||
f 0444 root sys $AMANDIR/cat1/cups-polld.z man/cups-polld.z
|
||||
f 0444 root sys $MANDIR/cat5/cupsd.conf.z man/cupsd.conf.z
|
||||
f 0444 root sys $AMANDIR/cat1/cupsd.z man/cupsd.z
|
||||
f 0444 root sys $AMANDIR/cat1/enable.z man/enable.z
|
||||
l 0444 root sys $AMANDIR/cat1/disable.z enable.z
|
||||
f 0444 root sys $MANDIR/cat1/filter.z man/filter.z
|
||||
f 0444 root sys $AMANDIR/cat1/lpadmin.z man/lpadmin.z
|
||||
f 0444 root sys $AMANDIR/cat1/lpc.z man/lpc.z
|
||||
f 0444 root sys $AMANDIR/cat1/lpinfo.z man/lpinfo.z
|
||||
f 0444 root sys $AMANDIR/cat1/lpmove.z man/lpmove.z
|
||||
f 0444 root sys $MANDIR/cat1/lpoptions.z man/lpoptions.z
|
||||
f 0444 root sys $MANDIR/cat1/lpq.z man/lpq.z
|
||||
f 0444 root sys $MANDIR/cat1/lprm.z man/lprm.z
|
||||
f 0444 root sys $MANDIR/cat1/lpr.z man/lpr.z
|
||||
f 0444 root sys $MANDIR/cat1/lpstat.z man/lpstat.z
|
||||
f 0444 root sys $MANDIR/cat1/lp.z man/lp.z
|
||||
l 0444 root sys $MANDIR/cat1/cancel.z lp.z
|
||||
f 0444 root sys $MANDIR/cat5/mime.convs.z man/mime.convs.z
|
||||
f 0444 root sys $MANDIR/cat5/mime.types.z man/mime.types.z
|
||||
f 0444 root sys $MANDIR/cat5/printers.conf.z man/printers.conf.z
|
||||
|
||||
%system solaris hpux
|
||||
d 0555 root sys $MANDIR/man1 -
|
||||
@@ -507,5 +316,5 @@ f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
|
||||
i 0555 root sys cups cups.sh
|
||||
|
||||
#
|
||||
# End of "$Id: cups.list 1368 2000-09-14 18:04:10Z mike $".
|
||||
# End of "$Id: cups.list 1682 2001-04-19 16:35:35Z mike $".
|
||||
#
|
||||
|
||||
+51
-22
@@ -4,13 +4,7 @@
|
||||
#
|
||||
# Startup/shutdown script for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Linux chkconfig stuff:
|
||||
#
|
||||
# chkconfig: 0235 99 00
|
||||
# description: Startup/shutdown script for the Common UNIX \
|
||||
# Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -29,34 +23,66 @@
|
||||
# WWW: http://www.cups.org
|
||||
#
|
||||
|
||||
# See what program to use for configuration stuff...
|
||||
#### OS-Dependent Information
|
||||
|
||||
#
|
||||
# Linux chkconfig stuff:
|
||||
#
|
||||
# chkconfig: 0235 99 00
|
||||
# description: Startup/shutdown script for the Common UNIX \
|
||||
# Printing System (CUPS).
|
||||
#
|
||||
|
||||
#
|
||||
# NetBSD 1.5+ rcorder script lines. The format of the following two
|
||||
# lines is very strict -- please don't add additional spaces!
|
||||
#
|
||||
# PROVIDE: cups
|
||||
# REQUIRE: DAEMON
|
||||
#
|
||||
|
||||
|
||||
#### OS-Dependent Configuration
|
||||
case "`uname`" in
|
||||
IRIX*)
|
||||
IS_ON=/sbin/chkconfig
|
||||
;;
|
||||
|
||||
NetBSD*)
|
||||
IS_ON=:
|
||||
;;
|
||||
|
||||
*)
|
||||
IS_ON=/bin/true
|
||||
;;
|
||||
esac
|
||||
|
||||
#### OS-Independent Stuff
|
||||
|
||||
#
|
||||
# The verbose flag controls the printing of the names of
|
||||
# daemons as they are started.
|
||||
# daemons as they are started. Currently always echos for
|
||||
# all but IRIX, which can configure verbose bootup messages.
|
||||
#
|
||||
|
||||
if $IS_ON verbose; then
|
||||
ECHO=echo
|
||||
else
|
||||
ECHO=:
|
||||
fi
|
||||
|
||||
# See if the CUPS server is running...
|
||||
#
|
||||
# See if the CUPS server (cupsd) is running...
|
||||
#
|
||||
|
||||
case "`uname`" in
|
||||
IRIX* | HP-UX | SunOS)
|
||||
IRIX* | HP-UX* | SunOS*)
|
||||
pid=`ps -e | awk '{print $1,$4}' | grep cupsd | awk '{print $1}'`
|
||||
;;
|
||||
OSF1)
|
||||
OSF1*)
|
||||
pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
|
||||
;;
|
||||
Linux)
|
||||
Linux* | NetBSD*)
|
||||
pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
|
||||
;;
|
||||
*)
|
||||
@@ -64,24 +90,23 @@ case "`uname`" in
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Start or stop the CUPS server based upon the first argument to the script.
|
||||
#
|
||||
|
||||
case $1 in
|
||||
start | restart | reload)
|
||||
if test "$pid" != ""; then
|
||||
if $IS_ON cups; then
|
||||
if $IS_ON cups; then
|
||||
if test "$pid" != ""; then
|
||||
kill -HUP $pid
|
||||
$ECHO "cups: scheduler restarted."
|
||||
else
|
||||
kill $pid
|
||||
$ECHO "cups: scheduler stopped."
|
||||
fi
|
||||
else
|
||||
if $IS_ON cups; then
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
@sbindir@/cupsd
|
||||
$ECHO "cups: scheduler started."
|
||||
fi
|
||||
$ECHO "cups: scheduler ${1}ed."
|
||||
else
|
||||
$ECHO "cups: scheduler stopped."
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -106,6 +131,10 @@ case $1 in
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Exit with no errors.
|
||||
#
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
|
||||
+21
-16
@@ -1,11 +1,11 @@
|
||||
#
|
||||
# "$Id: cups.spec 1339 2000-09-06 12:38:12Z mike $"
|
||||
# "$Id: cups.spec 1615 2001-03-06 18:37:49Z mike $"
|
||||
#
|
||||
# RPM "spec" file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Original version by Jason McMullan <jmcc@ontv.com>.
|
||||
#
|
||||
# Copyright 1999-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1999-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
Summary: Common Unix Printing System
|
||||
Name: cups
|
||||
Version: 1.1.3
|
||||
Version: 1.1.7
|
||||
Release: 0
|
||||
Copyright: GPL
|
||||
Group: System Environment/Daemons
|
||||
@@ -36,7 +36,7 @@ Packager: Michael Sweet <mike@easysw.com>
|
||||
Vendor: Easy Software Products
|
||||
# use buildroot so as not to disturb the version already installed
|
||||
BuildRoot: /var/tmp/%{name}-root
|
||||
Conflicts: lpr
|
||||
Conflicts: lpr, LPRng
|
||||
|
||||
%package devel
|
||||
Summary: Common Unix Printing System - development environment
|
||||
@@ -73,6 +73,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc5.d
|
||||
|
||||
make prefix=$RPM_BUILD_ROOT \
|
||||
exec_prefix=$RPM_BUILD_ROOT/usr \
|
||||
AMANDIR=$RPM_BUILD_ROOT/usr/man \
|
||||
BINDIR=$RPM_BUILD_ROOT/usr/bin \
|
||||
DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
|
||||
DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
|
||||
@@ -93,15 +94,17 @@ if test -x /sbin/chkconfig; then
|
||||
/sbin/chkconfig cups on
|
||||
fi
|
||||
|
||||
if test -f /sbin/init.d/cups; then
|
||||
/sbin/init.d/cups start
|
||||
fi
|
||||
if test -f /etc/rc.d/init.d/cups; then
|
||||
/etc/rc.d/init.d/cups start
|
||||
fi
|
||||
if test -f /etc/init.d/cups; then
|
||||
/etc/init.d/cups start
|
||||
fi
|
||||
# these lines automatically start cupsd after installation; commented out
|
||||
# by request...
|
||||
#if test -f /sbin/init.d/cups; then
|
||||
# /sbin/init.d/cups start
|
||||
#fi
|
||||
#if test -f /etc/rc.d/init.d/cups; then
|
||||
# /etc/rc.d/init.d/cups start
|
||||
#fi
|
||||
#if test -f /etc/init.d/cups; then
|
||||
# /etc/init.d/cups start
|
||||
#fi
|
||||
|
||||
%preun
|
||||
if test -f /sbin/init.d/cups; then
|
||||
@@ -124,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir /etc/cups
|
||||
%config /etc/cups/*.conf
|
||||
%config(noreplace) /etc/cups/*.conf
|
||||
%dir /etc/cups/certs
|
||||
%dir /etc/cups/interfaces
|
||||
/etc/cups/mime.types
|
||||
@@ -159,10 +162,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/usr/sbin/*
|
||||
%dir /usr/share/cups
|
||||
/usr/share/cups/*
|
||||
%dir /usr/share/doc/cups
|
||||
/usr/share/doc/cups/*
|
||||
%dir /usr/share/locale
|
||||
/usr/share/locale/*
|
||||
%attr(0700,lp,root) %dir /var/spool/cups
|
||||
%attr(1700,lp,root) %dir/var/spool/cups/tmp
|
||||
%attr(1700,lp,root) %dir /var/spool/cups/tmp
|
||||
|
||||
%files devel
|
||||
%dir /usr/include/cups
|
||||
@@ -170,5 +175,5 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/usr/lib/*.a
|
||||
|
||||
#
|
||||
# End of "$Id: cups.spec 1339 2000-09-06 12:38:12Z mike $".
|
||||
# End of "$Id: cups.spec 1615 2001-03-06 18:37:49Z mike $".
|
||||
#
|
||||
|
||||
+12
-8
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Support library Makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -28,8 +28,9 @@ include ../Makedefs
|
||||
# Object files...
|
||||
#
|
||||
|
||||
LIBOBJS = dest.o emit.o http.o ipp.o language.o mark.o md5.o md5passwd.o \
|
||||
options.o page.o ppd.o snprintf.o string.o usersys.o util.o
|
||||
LIBOBJS = dest.o emit.o encode.o http.o ipp.o language.o mark.o md5.o \
|
||||
md5passwd.o options.o page.o ppd.o snprintf.o string.o \
|
||||
tempfile.o usersys.o util.o
|
||||
OBJS = $(LIBOBJS) testhttp.o testppd.o
|
||||
|
||||
|
||||
@@ -76,8 +77,8 @@ install: all
|
||||
$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
|
||||
if test $(LIBCUPS) != "libcups.a" -a $(LIBCUPS) != "libcups.la"; then \
|
||||
$(INSTALL_LIB) libcups.a $(LIBDIR); \
|
||||
$(RM) `basename $(LIBDIR)/$(LIBCUPS) .2`; \
|
||||
$(LN) $(LIBCUPS) `basename $(LIBDIR)/$(LIBCUPS) .2`; \
|
||||
$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
||||
$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
||||
fi
|
||||
|
||||
|
||||
@@ -87,7 +88,7 @@ install: all
|
||||
|
||||
libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
|
||||
echo Linking $@...
|
||||
$(DSO) $@ $(LIBOBJS)
|
||||
$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS)
|
||||
$(RM) `basename $@ .2`
|
||||
$(LN) $@ `basename $@ .2`
|
||||
|
||||
@@ -98,7 +99,8 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
|
||||
|
||||
libcups.la: $(LIBOBJS) ../Makedefs
|
||||
echo Linking $@...
|
||||
$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
|
||||
$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
|
||||
-version-info 2:3 $(SSLLIBS)
|
||||
|
||||
|
||||
#
|
||||
@@ -123,6 +125,7 @@ cups_C.h: ../locale/C/cups_C
|
||||
|
||||
dest.o: cups.h http.h ipp.h language.h string.h
|
||||
emit.o: ppd.h
|
||||
encode.o: cups.h ipp.h string.h
|
||||
http.o: http.h ipp.h md5.h string.h
|
||||
ipp.o: http.h ipp.h string.h language.h
|
||||
language.o: cups_C.h language.h string.h
|
||||
@@ -133,6 +136,7 @@ page.o: ppd.h
|
||||
ppd.o: language.h ppd.h
|
||||
snprintf.o: string.h
|
||||
string.o: string.h
|
||||
tempfile.o: cups.h string.h
|
||||
usersys.o: cups.h
|
||||
util.o: cups.h http.h ipp.h
|
||||
|
||||
@@ -143,7 +147,7 @@ util.o: cups.h http.h ipp.h
|
||||
|
||||
testhttp: testhttp.o libcups.a
|
||||
echo Linking $@...
|
||||
$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)
|
||||
$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS)
|
||||
|
||||
testhttp.o: http.h
|
||||
|
||||
|
||||
+18
-10
@@ -85,11 +85,11 @@ LIB32=link.exe -lib
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\emit.c
|
||||
SOURCE=.\dest.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\filter.c
|
||||
SOURCE=.\emit.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -109,7 +109,11 @@ SOURCE=.\mark.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mime.c
|
||||
SOURCE=.\md5.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\md5passwd.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -125,10 +129,6 @@ SOURCE=.\ppd.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\raster.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\snprintf.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -137,7 +137,7 @@ SOURCE=.\string.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\type.c
|
||||
SOURCE=.\usersys.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -153,6 +153,14 @@ SOURCE=.\cups.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\cups_C.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\debug.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\http.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -165,7 +173,7 @@ SOURCE=.\language.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mime.h
|
||||
SOURCE=.\md5.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -173,7 +181,7 @@ SOURCE=.\ppd.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\raster.h
|
||||
SOURCE=.\string.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
+23
-2
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* API definitions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -94,7 +94,22 @@ typedef struct /**** Destination ****/
|
||||
cups_option_t *options; /* Options */
|
||||
} cups_dest_t;
|
||||
|
||||
|
||||
typedef struct /**** Job ****/
|
||||
{
|
||||
int id; /* The job ID */
|
||||
char *dest, /* Printer or class name */
|
||||
*title, /* Title/job name */
|
||||
*user, /* User the submitted the job */
|
||||
*format; /* Document format */
|
||||
ipp_jstate_t state; /* Job state */
|
||||
int size, /* Size in kilobytes */
|
||||
priority; /* Priority (1-100) */
|
||||
time_t completed_time, /* Time the job was completed */
|
||||
creation_time, /* Time the job was created */
|
||||
processing_time; /* Time the job was processed */
|
||||
} cups_job_t;
|
||||
|
||||
|
||||
/*
|
||||
* Functions...
|
||||
*/
|
||||
@@ -103,8 +118,12 @@ extern int cupsCancelJob(const char *printer, int job);
|
||||
#define cupsDoRequest(http,request,resource) cupsDoFileRequest((http),(request),(resource),NULL)
|
||||
extern ipp_t *cupsDoFileRequest(http_t *http, ipp_t *request,
|
||||
const char *resource, const char *filename);
|
||||
extern http_encryption_t cupsEncryption(void);
|
||||
extern void cupsFreeJobs(int num_jobs, cups_job_t *jobs);
|
||||
extern int cupsGetClasses(char ***classes);
|
||||
extern const char *cupsGetDefault(void);
|
||||
extern int cupsGetJobs(cups_job_t **jobs, const char *dest,
|
||||
int myjobs, int completed);
|
||||
extern const char *cupsGetPPD(const char *printer);
|
||||
extern int cupsGetPrinters(char ***printers);
|
||||
extern ipp_status_t cupsLastError(void);
|
||||
@@ -115,6 +134,7 @@ extern int cupsPrintFiles(const char *printer, int num_files,
|
||||
const char **files, const char *title,
|
||||
int num_options, cups_option_t *options);
|
||||
extern char *cupsTempFile(char *filename, int len);
|
||||
extern int cupsTempFd(char *filename, int len);
|
||||
|
||||
extern int cupsAddDest(const char *name, const char *instance,
|
||||
int num_dests, cups_dest_t **dests);
|
||||
@@ -138,6 +158,7 @@ extern int cupsMarkOptions(ppd_file_t *ppd, int num_options,
|
||||
|
||||
extern const char *cupsGetPassword(const char *prompt);
|
||||
extern const char *cupsServer(void);
|
||||
extern void cupsSetEncryption(http_encryption_t e);
|
||||
extern void cupsSetPasswordCB(const char *(*cb)(const char *));
|
||||
extern void cupsSetServer(const char *server);
|
||||
extern void cupsSetUser(const char *user);
|
||||
|
||||
+2
-1
@@ -18,7 +18,7 @@
|
||||
"Cyan",
|
||||
"Magenta",
|
||||
"Yellow",
|
||||
"Copyright 1993-2000 by Easy Software Products, All Rights Reserved.",
|
||||
"Copyright 1993-2001 by Easy Software Products, All Rights Reserved.",
|
||||
"General",
|
||||
"Printer",
|
||||
"Image",
|
||||
@@ -124,6 +124,7 @@
|
||||
"The request is too large for this server to process.",
|
||||
"The request URI is too large for this server to process.",
|
||||
"The request format is not understood by this server.",
|
||||
"426 An upgrade to a secure connection is required. If you are seeing this message in a web browser then it does not support HTTP encryption upgrades.",
|
||||
"500 The server has detected an unrecoverable error and cannot process your request.",
|
||||
"The requested method is not implemented by this server.",
|
||||
"The proxy server received an invalid response from an upstream server.",
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Debugging macros for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+51
-9
@@ -4,7 +4,7 @@
|
||||
* User-defined destination (and option) support for the Common UNIX
|
||||
* Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -210,6 +210,9 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */
|
||||
cups_dest_t *dest; /* Destination pointer */
|
||||
const char *home; /* HOME environment variable */
|
||||
char filename[1024]; /* Local ~/.lpoptions file */
|
||||
const char *defprinter; /* Default printer */
|
||||
char name[1024], /* Copy of printer name */
|
||||
*instance; /* Pointer to instance name */
|
||||
|
||||
|
||||
/*
|
||||
@@ -253,8 +256,25 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */
|
||||
* Grab the default destination...
|
||||
*/
|
||||
|
||||
if ((dest = cupsGetDest(cupsGetDefault(), NULL, num_dests, *dests)) != NULL)
|
||||
dest->is_default = 1;
|
||||
if ((defprinter = cupsGetDefault()) != NULL)
|
||||
{
|
||||
/*
|
||||
* Grab printer and instance name...
|
||||
*/
|
||||
|
||||
strncpy(name, defprinter, sizeof(name) - 1);
|
||||
name[sizeof(name) - 1] = '\0';
|
||||
|
||||
if ((instance = strchr(name, '/')) != NULL)
|
||||
*instance++ = '\0';
|
||||
|
||||
/*
|
||||
* Lookup the printer and instance and make it the default...
|
||||
*/
|
||||
|
||||
if ((dest = cupsGetDest(name, instance, num_dests, *dests)) != NULL)
|
||||
dest->is_default = 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Load the /etc/cups/lpoptions and ~/.lpoptions files...
|
||||
@@ -302,17 +322,24 @@ cupsSetDests(int num_dests, /* I - Number of destinations */
|
||||
* Figure out which file to write to...
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
if ((home = getenv("CUPS_SERVERROOT")) == NULL)
|
||||
home = CUPS_SERVERROOT;
|
||||
|
||||
snprintf(filename, sizeof(filename), "%s/lpoptions", home);
|
||||
#else
|
||||
if (getuid() == 0)
|
||||
{
|
||||
if ((home = getenv("CUPS_SERVERROOT")) != NULL)
|
||||
snprintf(filename, sizeof(filename), "%s/lpoptions", home);
|
||||
else
|
||||
strcpy(filename, CUPS_SERVERROOT "/lpoptions");
|
||||
if ((home = getenv("CUPS_SERVERROOT")) == NULL)
|
||||
home = CUPS_SERVERROOT;
|
||||
|
||||
snprintf(filename, sizeof(filename), "%s/lpoptions", home);
|
||||
}
|
||||
else if ((home = getenv("HOME")) != NULL)
|
||||
snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
|
||||
else
|
||||
return;
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Try to open the file...
|
||||
@@ -338,7 +365,12 @@ cupsSetDests(int num_dests, /* I - Number of destinations */
|
||||
|
||||
for (j = dest->num_options, option = dest->options; j > 0; j --, option ++)
|
||||
if (option->value[0])
|
||||
fprintf(fp, " %s=%s", option->name, option->value);
|
||||
{
|
||||
if (strchr(option->value, ' ') != NULL)
|
||||
fprintf(fp, " %s=\"%s\"", option->name, option->value);
|
||||
else
|
||||
fprintf(fp, " %s=%s", option->name, option->value);
|
||||
}
|
||||
else
|
||||
fprintf(fp, " %s", option->name);
|
||||
|
||||
@@ -369,8 +401,18 @@ cups_get_dests(const char *filename, /* I - File to read from */
|
||||
*lineptr, /* Pointer into line */
|
||||
*name, /* Name of destination/option */
|
||||
*instance; /* Instance of destination */
|
||||
const char *printer; /* PRINTER or LPDEST */
|
||||
|
||||
|
||||
/*
|
||||
* Check environment variables...
|
||||
*/
|
||||
|
||||
if ((printer = getenv("LPDEST")) == NULL)
|
||||
if ((printer = getenv("PRINTER")) != NULL)
|
||||
if (strcmp(printer, "lp") == 0)
|
||||
printer = NULL;
|
||||
|
||||
/*
|
||||
* Try to open the file...
|
||||
*/
|
||||
@@ -480,7 +522,7 @@ cups_get_dests(const char *filename, /* I - File to read from */
|
||||
* Set this as default if needed...
|
||||
*/
|
||||
|
||||
if (strncasecmp(line, "default", 7) == 0)
|
||||
if (strncasecmp(line, "default", 7) == 0 && printer == NULL)
|
||||
{
|
||||
for (i = 0; i < num_dests; i ++)
|
||||
(*dests)[i].is_default = 0;
|
||||
|
||||
+78
-3
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD code emission routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -28,6 +28,7 @@
|
||||
* ppdCollect() - Collect all marked options that reside in the specified
|
||||
* ppdEmit() - Emit code for marked options to a file.
|
||||
* ppdEmitFd() - Emit code for marked options to a file.
|
||||
* ppdEmitJCL() - Emit code for JCL options to a file.
|
||||
* ppd_sort() - Sort options by ordering numbers...
|
||||
*/
|
||||
|
||||
@@ -275,8 +276,9 @@ ppdEmitFd(ppd_file_t *ppd, /* I - PPD file record */
|
||||
* Send DSC comments with option...
|
||||
*/
|
||||
|
||||
sprintf(buf, "%%%%BeginFeature: %s %s\n",
|
||||
((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
|
||||
snprintf(buf, sizeof(buf), "%%%%BeginFeature: %s %s\n",
|
||||
((ppd_option_t *)choices[i]->option)->keyword,
|
||||
choices[i]->choice);
|
||||
|
||||
if (write(fd, buf, strlen(buf)) < 1)
|
||||
{
|
||||
@@ -313,6 +315,79 @@ ppdEmitFd(ppd_file_t *ppd, /* I - PPD file record */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppdEmitJCL()' - Emit code for JCL options to a file.
|
||||
*/
|
||||
|
||||
int /* O - 0 on success, -1 on failure */
|
||||
ppdEmitJCL(ppd_file_t *ppd, /* I - PPD file record */
|
||||
FILE *fp, /* I - File to write to */
|
||||
int job_id, /* I - Job ID */
|
||||
const char *user, /* I - Username */
|
||||
const char *title) /* I - Title */
|
||||
{
|
||||
const char *ptr; /* Pointer into JCL string */
|
||||
|
||||
|
||||
if (ppd == NULL || ppd->jcl_begin == NULL || ppd->jcl_ps == NULL)
|
||||
return (0);
|
||||
|
||||
if (strncmp(ppd->jcl_begin, "\033%-12345X@", 10) == 0)
|
||||
{
|
||||
/*
|
||||
* This printer uses HP PJL commands for output; filter the output
|
||||
* so that we only have a single "@PJL JOB" command in the header...
|
||||
*/
|
||||
|
||||
fputs("\033%-12345X", fp);
|
||||
for (ptr = ppd->jcl_begin + 9; *ptr;)
|
||||
if (strncmp(ptr, "@PJL JOB", 8) == 0)
|
||||
{
|
||||
/*
|
||||
* Skip job command...
|
||||
*/
|
||||
|
||||
for (;*ptr; ptr ++)
|
||||
if (*ptr == '\n')
|
||||
break;
|
||||
|
||||
if (*ptr)
|
||||
ptr ++;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Copy line...
|
||||
*/
|
||||
|
||||
for (;*ptr; ptr ++)
|
||||
{
|
||||
putc(*ptr, fp);
|
||||
if (*ptr == '\n')
|
||||
break;
|
||||
}
|
||||
|
||||
if (*ptr)
|
||||
ptr ++;
|
||||
}
|
||||
|
||||
/*
|
||||
* Send PJL JOB command before we enter PostScript mode...
|
||||
*/
|
||||
|
||||
fprintf(fp, "@PJL JOB NAME = \"%s\" DISPLAY = \"%d %s %s\"\n", title,
|
||||
job_id, user, title);
|
||||
}
|
||||
else
|
||||
fputs(ppd->jcl_begin, stdout);
|
||||
|
||||
ppdEmit(ppd, stdout, PPD_ORDER_JCL);
|
||||
fputs(ppd->jcl_ps, stdout);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppd_sort()' - Sort options by ordering numbers...
|
||||
*/
|
||||
|
||||
+311
@@ -0,0 +1,311 @@
|
||||
/*
|
||||
* "$Id$"
|
||||
*
|
||||
* Option encoding routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
* copyright law. Distribution and use rights are outlined in the file
|
||||
* "LICENSE.txt" which should have been included with this file. If this
|
||||
* file is missing or damaged please contact Easy Software Products
|
||||
* at:
|
||||
*
|
||||
* Attn: CUPS Licensing Information
|
||||
* Easy Software Products
|
||||
* 44141 Airport View Drive, Suite 204
|
||||
* Hollywood, Maryland 20636-3111 USA
|
||||
*
|
||||
* Voice: (301) 373-9603
|
||||
* EMail: cups-info@cups.org
|
||||
* WWW: http://www.cups.org
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* cupsEncodeOptions() - Encode printer options into IPP attributes.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Include necessary headers...
|
||||
*/
|
||||
|
||||
#include "cups.h"
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
|
||||
*/
|
||||
|
||||
void
|
||||
cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */
|
||||
int num_options, /* I - Number of options */
|
||||
cups_option_t *options) /* I - Options */
|
||||
{
|
||||
int i, j; /* Looping vars */
|
||||
int count; /* Number of values */
|
||||
int n; /* Attribute value */
|
||||
char *s, /* Pointer into option value */
|
||||
*val, /* Pointer to option value */
|
||||
*copy, /* Copy of option value */
|
||||
*sep; /* Option separator */
|
||||
ipp_attribute_t *attr; /* IPP job-id attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)\n", ipp, num_options, options));
|
||||
|
||||
if (ipp == NULL || num_options < 1 || options == NULL)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Handle the document format stuff first...
|
||||
*/
|
||||
|
||||
if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, val);
|
||||
else if (cupsGetOption("raw", num_options, options))
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/vnd.cups-raw");
|
||||
else
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/octet-stream");
|
||||
|
||||
/*
|
||||
* Then add all other options...
|
||||
*/
|
||||
|
||||
for (i = 0; i < num_options; i ++)
|
||||
{
|
||||
/*
|
||||
* Skip document format options - handled above...
|
||||
*/
|
||||
|
||||
if (strcasecmp(options[i].name, "raw") == 0 ||
|
||||
strcasecmp(options[i].name, "document-format") == 0 ||
|
||||
!options[i].name[0])
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Count the number of values...
|
||||
*/
|
||||
|
||||
for (count = 1, sep = options[i].value;
|
||||
(sep = strchr(sep + 1, ',')) != NULL;
|
||||
count ++);
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: option = \'%s\', count = %d\n",
|
||||
options[i].name, count));
|
||||
|
||||
if ((attr = _ipp_add_attr(ipp, count)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for attributes!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->group_tag = IPP_TAG_JOB;
|
||||
|
||||
if ((attr->name = strdup(options[i].name)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for name!");
|
||||
return;
|
||||
}
|
||||
|
||||
if (count > 1)
|
||||
{
|
||||
/*
|
||||
* Make a copy of the value we can fiddle with...
|
||||
*/
|
||||
|
||||
if ((copy = strdup(options[i].value)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for value copy!");
|
||||
return;
|
||||
}
|
||||
|
||||
val = copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Since we have a single value, use the value directly...
|
||||
*/
|
||||
|
||||
val = options[i].value;
|
||||
copy = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* See what the option value is; for compatibility with older interface
|
||||
* scripts, we have to support single-argument options as well as
|
||||
* option=value, option=low-high, option=MxN, and option=val1,val2,...,valN.
|
||||
*/
|
||||
|
||||
if (*val == '\0')
|
||||
{
|
||||
/*
|
||||
* Old-style System V boolean value...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
|
||||
if (strncasecmp(attr->name, "no", 2) == 0)
|
||||
{
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
|
||||
strcpy(attr->name, attr->name + 2);
|
||||
attr->values[0].boolean = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
|
||||
attr->values[0].boolean = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Scan the value string for values...
|
||||
*/
|
||||
|
||||
for (j = 0; *val != '\0'; val = sep, j ++)
|
||||
{
|
||||
/*
|
||||
* Find the end of this value and mark it if needed...
|
||||
*/
|
||||
|
||||
if ((sep = strchr(val, ',')) != NULL)
|
||||
*sep++ = '\0';
|
||||
else
|
||||
sep = val + strlen(val);
|
||||
|
||||
/*
|
||||
* See what kind of value it is...
|
||||
*/
|
||||
|
||||
if (strcasecmp(val, "true") == 0 ||
|
||||
strcasecmp(val, "on") == 0 ||
|
||||
strcasecmp(val, "yes") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - true...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
attr->values[j].boolean = 1;
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
|
||||
}
|
||||
else if (strcasecmp(val, "false") == 0 ||
|
||||
strcasecmp(val, "off") == 0 ||
|
||||
strcasecmp(val, "no") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - false...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
attr->values[j].boolean = 0;
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Number, range, resolution, or string...
|
||||
*/
|
||||
|
||||
n = strtol(val, &s, 0);
|
||||
|
||||
if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
|
||||
{
|
||||
/*
|
||||
* String value(s)...
|
||||
*/
|
||||
|
||||
if ((attr->values[j].string.text = strdup(val)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->value_tag = IPP_TAG_NAME;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
|
||||
}
|
||||
else if (*s == '-')
|
||||
{
|
||||
attr->value_tag = IPP_TAG_RANGE;
|
||||
attr->values[j].range.lower = n;
|
||||
attr->values[j].range.upper = strtol(s + 1, NULL, 0);
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
|
||||
n, attr->values[j].range.upper));
|
||||
}
|
||||
else if (*s == 'x')
|
||||
{
|
||||
attr->value_tag = IPP_TAG_RESOLUTION;
|
||||
attr->values[j].resolution.xres = n;
|
||||
attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
|
||||
|
||||
if (strcasecmp(s, "dpc") == 0)
|
||||
attr->values[j].resolution.units = IPP_RES_PER_CM;
|
||||
else if (strcasecmp(s, "dpi") == 0)
|
||||
attr->values[j].resolution.units = IPP_RES_PER_INCH;
|
||||
else
|
||||
{
|
||||
if ((attr->values[j].string.text = strdup(val)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->value_tag = IPP_TAG_NAME;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
|
||||
val));
|
||||
}
|
||||
else
|
||||
{
|
||||
attr->value_tag = IPP_TAG_INTEGER;
|
||||
attr->values[j].integer = n;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Adding integer option value %d...\n", n));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
+426
-49
@@ -3,9 +3,9 @@
|
||||
*
|
||||
* HTTP routines for the Common UNIX Printing System (CUPS) scheduler.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These statusd instructions, statements, and computer programs are the
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
* copyright law. Distribution and use rights are outlined in the file
|
||||
* "LICENSE.txt" which should have been included with this file. If this
|
||||
@@ -29,6 +29,7 @@
|
||||
* the server.
|
||||
* httpClose() - Close an HTTP connection...
|
||||
* httpConnect() - Connect to a HTTP server.
|
||||
* httpEncryption() - Set the required encryption on the link.
|
||||
* httpReconnect() - Reconnect to a HTTP server...
|
||||
* httpSeparate() - Separate a Universal Resource Identifier into its
|
||||
* components.
|
||||
@@ -56,6 +57,7 @@
|
||||
* http_field() - Return the field index for a field name.
|
||||
* http_send() - Send a request with all fields and the trailing
|
||||
* blank line.
|
||||
* http_upgrade() - Force upgrade to TLS encryption.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -78,6 +80,13 @@
|
||||
# include <signal.h>
|
||||
#endif /* !WIN32 && !__EMX__ */
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
# include <openssl/err.h>
|
||||
# include <openssl/rand.h>
|
||||
# include <openssl/ssl.h>
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
/*
|
||||
* Some operating systems have done away with the Fxxxx constants for
|
||||
* the fcntl() call; this works around that "feature"...
|
||||
@@ -95,6 +104,9 @@
|
||||
static http_field_t http_field(const char *name);
|
||||
static int http_send(http_t *http, http_state_t request,
|
||||
const char *uri);
|
||||
#ifdef HAVE_LIBSSL
|
||||
static int http_upgrade(http_t *http);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
/*
|
||||
@@ -166,6 +178,12 @@ static const char *months[12] =
|
||||
void
|
||||
httpInitialize(void)
|
||||
{
|
||||
#ifdef HAVE_LIBSSL
|
||||
struct timeval curtime; /* Current time in microseconds */
|
||||
int i; /* Looping var */
|
||||
unsigned char data[1024]; /* Seed data */
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
WSADATA winsockdata; /* WinSock data */
|
||||
static int initialized = 0;/* Has WinSock been initialized? */
|
||||
@@ -189,6 +207,24 @@ httpInitialize(void)
|
||||
#else
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_load_error_strings();
|
||||
SSL_library_init();
|
||||
|
||||
/*
|
||||
* Using the current time is a dubious random seed, but on some systems
|
||||
* it is the best we can do (on others, this seed isn't even used...)
|
||||
*/
|
||||
|
||||
gettimeofday(&curtime, NULL);
|
||||
srand(curtime.tv_sec + curtime.tv_usec);
|
||||
|
||||
for (i = 0; i < sizeof(data); i ++)
|
||||
data[i] = rand(); /* Yes, this is a poor source of random data... */
|
||||
|
||||
RAND_seed(&data, sizeof(data));
|
||||
#endif /* HAVE_LIBSSL */
|
||||
}
|
||||
|
||||
|
||||
@@ -234,9 +270,29 @@ httpCheck(http_t *http) /* I - HTTP connection */
|
||||
void
|
||||
httpClose(http_t *http) /* I - Connection to close */
|
||||
{
|
||||
if (http == NULL)
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_CTX *context; /* Context for encryption */
|
||||
SSL *conn; /* Connection for encryption */
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
if (!http)
|
||||
return;
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->tls)
|
||||
{
|
||||
conn = (SSL *)(http->tls);
|
||||
context = SSL_get_SSL_CTX(conn);
|
||||
|
||||
SSL_shutdown(conn);
|
||||
SSL_CTX_free(context);
|
||||
SSL_free(conn);
|
||||
|
||||
http->tls = NULL;
|
||||
}
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
#ifdef WIN32
|
||||
closesocket(http->fd);
|
||||
#else
|
||||
@@ -269,6 +325,23 @@ httpConnect(const char *host, /* I - Host to connect to */
|
||||
*/
|
||||
|
||||
if ((hostaddr = gethostbyname(host)) == NULL)
|
||||
{
|
||||
/*
|
||||
* This hack to make users that don't have a localhost entry in
|
||||
* their hosts file or DNS happy...
|
||||
*/
|
||||
|
||||
if (strcasecmp(host, "localhost") != 0)
|
||||
return (NULL);
|
||||
else if ((hostaddr = gethostbyname("127.0.0.1")) == NULL)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Verify that it is an IPv4 address (IPv6 support will come in CUPS 1.2...)
|
||||
*/
|
||||
|
||||
if (hostaddr->h_addrtype != AF_INET || hostaddr->h_length != 4)
|
||||
return (NULL);
|
||||
|
||||
/*
|
||||
@@ -282,6 +355,7 @@ httpConnect(const char *host, /* I - Host to connect to */
|
||||
http->version = HTTP_1_1;
|
||||
http->blocking = 1;
|
||||
http->activity = time(NULL);
|
||||
http->fd = -1;
|
||||
|
||||
/*
|
||||
* Copy the hostname and port and then "reconnect"...
|
||||
@@ -295,6 +369,18 @@ httpConnect(const char *host, /* I - Host to connect to */
|
||||
#else
|
||||
http->hostaddr.sin_port = htons(port);
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Set the default encryption status...
|
||||
*/
|
||||
|
||||
if (port == 443)
|
||||
http->encryption = HTTP_ENCRYPT_ALWAYS;
|
||||
|
||||
/*
|
||||
* Connect to the remote system...
|
||||
*/
|
||||
|
||||
if (httpReconnect(http))
|
||||
{
|
||||
free(http);
|
||||
@@ -305,6 +391,36 @@ httpConnect(const char *host, /* I - Host to connect to */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'httpEncryption()' - Set the required encryption on the link.
|
||||
*/
|
||||
|
||||
int /* O - -1 on error, 0 on success */
|
||||
httpEncryption(http_t *http, /* I - HTTP data */
|
||||
http_encryption_t e) /* I - New encryption preference */
|
||||
{
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (!http)
|
||||
return (0);
|
||||
|
||||
http->encryption = e;
|
||||
|
||||
if ((http->encryption == HTTP_ENCRYPT_ALWAYS && !http->tls) ||
|
||||
(http->encryption == HTTP_ENCRYPT_NEVER && http->tls))
|
||||
return (httpReconnect(http));
|
||||
else if (http->encryption == HTTP_ENCRYPT_REQUIRED && !http->tls)
|
||||
return (http_upgrade(http));
|
||||
else
|
||||
return (0);
|
||||
#else
|
||||
if (e == HTTP_ENCRYPT_ALWAYS || e == HTTP_ENCRYPT_REQUIRED)
|
||||
return (-1);
|
||||
else
|
||||
return (0);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'httpReconnect()' - Reconnect to a HTTP server...
|
||||
*/
|
||||
@@ -312,14 +428,30 @@ httpConnect(const char *host, /* I - Host to connect to */
|
||||
int /* O - 0 on success, non-zero on failure */
|
||||
httpReconnect(http_t *http) /* I - HTTP data */
|
||||
{
|
||||
int val; /* Socket option value */
|
||||
int val; /* Socket option value */
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_CTX *context; /* Context for encryption */
|
||||
SSL *conn; /* Connection for encryption */
|
||||
|
||||
|
||||
if (http->tls)
|
||||
{
|
||||
conn = (SSL *)(http->tls);
|
||||
context = SSL_get_SSL_CTX(conn);
|
||||
|
||||
SSL_shutdown(conn);
|
||||
SSL_CTX_free(context);
|
||||
SSL_free(conn);
|
||||
|
||||
http->tls = NULL;
|
||||
}
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
/*
|
||||
* Close any previously open socket...
|
||||
*/
|
||||
|
||||
if (http->fd)
|
||||
if (http->fd >= 0)
|
||||
#ifdef WIN32
|
||||
closesocket(http->fd);
|
||||
#else
|
||||
@@ -374,12 +506,52 @@ httpReconnect(http_t *http) /* I - HTTP data */
|
||||
close(http->fd);
|
||||
#endif
|
||||
|
||||
http->fd = -1;
|
||||
|
||||
return (-1);
|
||||
}
|
||||
|
||||
http->error = 0;
|
||||
http->status = HTTP_CONTINUE;
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->encryption == HTTP_ENCRYPT_ALWAYS)
|
||||
{
|
||||
/*
|
||||
* Always do encryption via SSL.
|
||||
*/
|
||||
|
||||
context = SSL_CTX_new(SSLv23_method());
|
||||
conn = SSL_new(context);
|
||||
|
||||
SSL_set_fd(conn, http->fd);
|
||||
if (SSL_connect(conn) != 1)
|
||||
{
|
||||
SSL_CTX_free(context);
|
||||
SSL_free(conn);
|
||||
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
http->error = WSAGetLastError();
|
||||
#else
|
||||
http->error = errno;
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
http->status = HTTP_ERROR;
|
||||
|
||||
#ifdef WIN32
|
||||
closesocket(http->fd);
|
||||
#else
|
||||
close(http->fd);
|
||||
#endif
|
||||
|
||||
return (-1);
|
||||
}
|
||||
|
||||
http->tls = conn;
|
||||
}
|
||||
else if (http->encryption == HTTP_ENCRYPT_REQUIRED)
|
||||
return (http_upgrade(http));
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -397,13 +569,30 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
int *port, /* O - Port number to use */
|
||||
char *resource) /* O - Resource/filename [1024] */
|
||||
{
|
||||
char *ptr; /* Pointer into string... */
|
||||
char *ptr; /* Pointer into string... */
|
||||
const char *atsign, /* @ sign */
|
||||
*slash; /* Separator */
|
||||
char safeuri[HTTP_MAX_URI]; /* "Safe" local copy of URI */
|
||||
|
||||
|
||||
/*
|
||||
* Range check input...
|
||||
*/
|
||||
|
||||
if (uri == NULL || method == NULL || username == NULL || host == NULL ||
|
||||
port == NULL || resource == NULL)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Copy the URL to a local string to make sure we don't have a URL
|
||||
* longer than HTTP_MAX_URI characters long...
|
||||
*/
|
||||
|
||||
strncpy(safeuri, uri, sizeof(safeuri));
|
||||
safeuri[sizeof(safeuri) - 1] = '\0';
|
||||
|
||||
uri = safeuri;
|
||||
|
||||
/*
|
||||
* Grab the method portion of the URI...
|
||||
*/
|
||||
@@ -422,9 +611,9 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
* Standard URI with method...
|
||||
*/
|
||||
|
||||
ptr = host;
|
||||
while (*uri != ':' && *uri != '\0')
|
||||
*ptr++ = *uri++;
|
||||
for (ptr = host; *uri != ':' && *uri != '\0'; uri ++)
|
||||
if (ptr < (host + HTTP_MAX_URI - 1))
|
||||
*ptr++ = *uri;
|
||||
|
||||
*ptr = '\0';
|
||||
if (*uri == ':')
|
||||
@@ -439,7 +628,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
{
|
||||
if ((ptr = strchr(host, '/')) != NULL)
|
||||
{
|
||||
strncpy(resource, ptr, HTTP_MAX_URI - 1);
|
||||
strncpy(resource, ptr, HTTP_MAX_URI);
|
||||
resource[HTTP_MAX_URI - 1] = '\0';
|
||||
*ptr = '\0';
|
||||
}
|
||||
@@ -456,7 +645,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
|
||||
if (*uri == '/')
|
||||
{
|
||||
strncpy(resource, uri, HTTP_MAX_URI - 1);
|
||||
strncpy(resource, uri, HTTP_MAX_URI);
|
||||
resource[HTTP_MAX_URI - 1] = '\0';
|
||||
}
|
||||
}
|
||||
@@ -490,44 +679,49 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
}
|
||||
|
||||
/*
|
||||
* Grab the hostname...
|
||||
* Grab the username, if any...
|
||||
*/
|
||||
|
||||
while (*uri == '/')
|
||||
uri ++;
|
||||
|
||||
ptr = host;
|
||||
while (!(*uri == ':' && isdigit(uri[1])) && *uri != '@' && *uri != '/' && *uri != '\0')
|
||||
*ptr ++ = *uri ++;
|
||||
if ((slash = strchr(uri, '/')) == NULL)
|
||||
slash = uri + strlen(uri);
|
||||
|
||||
*ptr = '\0';
|
||||
|
||||
if (*uri == '@')
|
||||
if ((atsign = strchr(uri, '@')) != NULL && atsign < slash)
|
||||
{
|
||||
/*
|
||||
* Got a username...
|
||||
* Got a username:password combo...
|
||||
*/
|
||||
|
||||
strncpy(username, host, 31);
|
||||
username[31] = '\0';
|
||||
|
||||
ptr = host;
|
||||
uri ++;
|
||||
while (*uri != ':' && *uri != '/' && *uri != '\0')
|
||||
*ptr ++ = *uri ++;
|
||||
for (ptr = username; uri < atsign; uri ++)
|
||||
if (ptr < (username + HTTP_MAX_URI - 1))
|
||||
*ptr++ = *uri;
|
||||
|
||||
*ptr = '\0';
|
||||
|
||||
uri = atsign + 1;
|
||||
}
|
||||
else
|
||||
username[0] = '\0';
|
||||
|
||||
/*
|
||||
* Grab the hostname...
|
||||
*/
|
||||
|
||||
for (ptr = host; *uri != ':' && *uri != '/' && *uri != '\0'; uri ++)
|
||||
if (ptr < (host + HTTP_MAX_URI - 1))
|
||||
*ptr++ = *uri;
|
||||
|
||||
*ptr = '\0';
|
||||
|
||||
if (*uri != ':')
|
||||
{
|
||||
if (strcasecmp(method, "http") == 0)
|
||||
*port = 80;
|
||||
else if (strcasecmp(method, "https") == 0)
|
||||
*port = 443;
|
||||
else if (strcasecmp(method, "ipp") == 0) /* Not registered yet... */
|
||||
else if (strcasecmp(method, "ipp") == 0)
|
||||
*port = ippPort();
|
||||
else if (strcasecmp(method, "socket") == 0) /* Not registered yet... */
|
||||
*port = 9100;
|
||||
@@ -564,7 +758,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
* The remaining portion is the resource string...
|
||||
*/
|
||||
|
||||
strncpy(resource, uri, HTTP_MAX_URI - 1);
|
||||
strncpy(resource, uri, HTTP_MAX_URI);
|
||||
resource[HTTP_MAX_URI - 1] = '\0';
|
||||
}
|
||||
|
||||
@@ -596,7 +790,7 @@ httpGetSubField(http_t *http, /* I - HTTP data */
|
||||
* Skip leading whitespace...
|
||||
*/
|
||||
|
||||
while (isspace(*fptr));
|
||||
while (isspace(*fptr))
|
||||
fptr ++;
|
||||
|
||||
if (*fptr == ',')
|
||||
@@ -631,7 +825,7 @@ httpGetSubField(http_t *http, /* I - HTTP data */
|
||||
|
||||
fptr ++;
|
||||
|
||||
while (isspace(*fptr));
|
||||
while (isspace(*fptr))
|
||||
fptr ++;
|
||||
|
||||
if (*fptr == '\"')
|
||||
@@ -878,6 +1072,10 @@ httpRead(http_t *http, /* I - HTTP data */
|
||||
if (http->used > 0)
|
||||
memcpy(http->buffer, http->buffer + length, http->used);
|
||||
}
|
||||
#ifdef HAVE_LIBSSL
|
||||
else if (http->tls)
|
||||
bytes = SSL_read((SSL *)(http->tls), buffer, length);
|
||||
#endif /* HAVE_LIBSSL */
|
||||
else
|
||||
{
|
||||
DEBUG_printf(("httpRead: reading %d bytes from socket...\n", length));
|
||||
@@ -960,7 +1158,13 @@ httpWrite(http_t *http, /* I - HTTP data */
|
||||
|
||||
while (length > 0)
|
||||
{
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->tls)
|
||||
bytes = SSL_write((SSL *)(http->tls), buffer, length);
|
||||
else
|
||||
#endif /* HAVE_LIBSSL */
|
||||
bytes = send(http->fd, buffer, length, 0);
|
||||
|
||||
if (bytes < 0)
|
||||
{
|
||||
DEBUG_puts("httpWrite: error writing data...\n");
|
||||
@@ -1040,13 +1244,21 @@ httpGets(char *line, /* I - Line to read into */
|
||||
else
|
||||
bufptr ++;
|
||||
|
||||
if (bufptr >= bufend)
|
||||
if (bufptr >= bufend && http->used < HTTP_MAX_BUFFER)
|
||||
{
|
||||
/*
|
||||
* No newline; see if there is more data to be read...
|
||||
*/
|
||||
|
||||
if ((bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0)) < 0)
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->tls)
|
||||
bytes = SSL_read((SSL *)(http->tls), bufend,
|
||||
HTTP_MAX_BUFFER - http->used);
|
||||
else
|
||||
#endif /* HAVE_LIBSSL */
|
||||
bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0);
|
||||
|
||||
if (bytes < 0)
|
||||
{
|
||||
/*
|
||||
* Nope, can't get a line this time...
|
||||
@@ -1088,7 +1300,7 @@ httpGets(char *line, /* I - Line to read into */
|
||||
bufend += bytes;
|
||||
}
|
||||
}
|
||||
while (bufptr >= bufend);
|
||||
while (bufptr >= bufend && http->used < HTTP_MAX_BUFFER);
|
||||
|
||||
http->activity = time(NULL);
|
||||
|
||||
@@ -1099,6 +1311,7 @@ httpGets(char *line, /* I - Line to read into */
|
||||
lineptr = line;
|
||||
bufptr = http->buffer;
|
||||
bytes = 0;
|
||||
length --;
|
||||
|
||||
while (bufptr < bufend && bytes < length)
|
||||
{
|
||||
@@ -1107,14 +1320,7 @@ httpGets(char *line, /* I - Line to read into */
|
||||
if (*bufptr == 0x0a)
|
||||
{
|
||||
bufptr ++;
|
||||
*lineptr = '\0';
|
||||
|
||||
http->used -= bytes;
|
||||
if (http->used > 0)
|
||||
memcpy(http->buffer, bufptr, http->used);
|
||||
|
||||
DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
|
||||
return (line);
|
||||
break;
|
||||
}
|
||||
else if (*bufptr == 0x0d)
|
||||
bufptr ++;
|
||||
@@ -1122,6 +1328,18 @@ httpGets(char *line, /* I - Line to read into */
|
||||
*lineptr++ = *bufptr++;
|
||||
}
|
||||
|
||||
if (bytes > 0)
|
||||
{
|
||||
*lineptr = '\0';
|
||||
|
||||
http->used -= bytes;
|
||||
if (http->used > 0)
|
||||
memcpy(http->buffer, bufptr, http->used);
|
||||
|
||||
DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
|
||||
return (line);
|
||||
}
|
||||
|
||||
DEBUG_puts("httpGets(): No new line available!");
|
||||
|
||||
return (NULL);
|
||||
@@ -1152,8 +1370,17 @@ httpPrintf(http_t *http, /* I - HTTP data */
|
||||
DEBUG_printf(("httpPrintf: %s", buf));
|
||||
|
||||
for (tbytes = 0, bufptr = buf; tbytes < bytes; tbytes += nbytes, bufptr += nbytes)
|
||||
if ((nbytes = send(http->fd, bufptr, bytes - tbytes, 0)) < 0)
|
||||
{
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->tls)
|
||||
nbytes = SSL_write((SSL *)(http->tls), bufptr, bytes - tbytes);
|
||||
else
|
||||
#endif /* HAVE_LIBSSL */
|
||||
nbytes = send(http->fd, bufptr, bytes - tbytes, 0);
|
||||
|
||||
if (nbytes < 0)
|
||||
return (-1);
|
||||
}
|
||||
|
||||
return (bytes);
|
||||
}
|
||||
@@ -1168,6 +1395,10 @@ httpStatus(http_status_t status) /* I - HTTP status code */
|
||||
{
|
||||
switch (status)
|
||||
{
|
||||
case HTTP_CONTINUE :
|
||||
return ("Continue");
|
||||
case HTTP_SWITCHING_PROTOCOLS :
|
||||
return ("Switching Protocols");
|
||||
case HTTP_OK :
|
||||
return ("OK");
|
||||
case HTTP_CREATED :
|
||||
@@ -1190,6 +1421,8 @@ httpStatus(http_status_t status) /* I - HTTP status code */
|
||||
return ("Request Entity Too Large");
|
||||
case HTTP_URI_TOO_LONG :
|
||||
return ("URI Too Long");
|
||||
case HTTP_UPGRADE_REQUIRED :
|
||||
return ("Upgrade Required");
|
||||
case HTTP_NOT_IMPLEMENTED :
|
||||
return ("Not Implemented");
|
||||
case HTTP_NOT_SUPPORTED :
|
||||
@@ -1212,9 +1445,9 @@ httpGetDateString(time_t t) /* I - UNIX time */
|
||||
|
||||
|
||||
tdate = gmtime(&t);
|
||||
sprintf(datetime, "%s, %02d %s %d %02d:%02d:%02d GMT",
|
||||
days[tdate->tm_wday], tdate->tm_mday, months[tdate->tm_mon],
|
||||
tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
|
||||
snprintf(datetime, sizeof(datetime), "%s, %02d %s %d %02d:%02d:%02d GMT",
|
||||
days[tdate->tm_wday], tdate->tm_mday, months[tdate->tm_mon],
|
||||
tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec);
|
||||
|
||||
return (datetime);
|
||||
}
|
||||
@@ -1268,6 +1501,10 @@ httpUpdate(http_t *http) /* I - HTTP data */
|
||||
http_field_t field; /* Field index */
|
||||
int major, minor; /* HTTP version numbers */
|
||||
http_status_t status; /* Authorization status */
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_CTX *context; /* Context for encryption */
|
||||
SSL *conn; /* Connection for encryption */
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
DEBUG_printf(("httpUpdate(%08x)\n", http));
|
||||
@@ -1301,6 +1538,43 @@ httpUpdate(http_t *http) /* I - HTTP data */
|
||||
if (http->status == HTTP_CONTINUE)
|
||||
return (http->status);
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->status == HTTP_SWITCHING_PROTOCOLS && !http->tls)
|
||||
{
|
||||
context = SSL_CTX_new(SSLv23_method());
|
||||
conn = SSL_new(context);
|
||||
|
||||
SSL_set_fd(conn, http->fd);
|
||||
if (SSL_connect(conn) != 1)
|
||||
{
|
||||
SSL_CTX_free(context);
|
||||
SSL_free(conn);
|
||||
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
http->error = WSAGetLastError();
|
||||
#else
|
||||
http->error = errno;
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
http->status = HTTP_ERROR;
|
||||
|
||||
#ifdef WIN32
|
||||
closesocket(http->fd);
|
||||
#else
|
||||
close(http->fd);
|
||||
#endif
|
||||
|
||||
return (HTTP_ERROR);
|
||||
}
|
||||
|
||||
http->tls = conn;
|
||||
|
||||
return (HTTP_CONTINUE);
|
||||
}
|
||||
else if (http->status == HTTP_UPGRADE_REQUIRED &&
|
||||
http->encryption != HTTP_ENCRYPT_NEVER)
|
||||
http->encryption = HTTP_ENCRYPT_REQUIRED;
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
httpGetLength(http);
|
||||
|
||||
switch (http->state)
|
||||
@@ -1601,12 +1875,15 @@ http_send(http_t *http, /* I - HTTP data */
|
||||
* Encode the URI as needed...
|
||||
*/
|
||||
|
||||
for (ptr = buf; *uri != '\0'; uri ++)
|
||||
for (ptr = buf; *uri != '\0' && ptr < (buf + sizeof(buf) - 1); uri ++)
|
||||
if (*uri <= ' ' || *uri >= 127)
|
||||
{
|
||||
*ptr ++ = '%';
|
||||
*ptr ++ = hex[(*uri >> 4) & 15];
|
||||
*ptr ++ = hex[*uri & 15];
|
||||
if (ptr < (buf + sizeof(buf) - 1))
|
||||
*ptr ++ = '%';
|
||||
if (ptr < (buf + sizeof(buf) - 1))
|
||||
*ptr ++ = hex[(*uri >> 4) & 15];
|
||||
if (ptr < (buf + sizeof(buf) - 1))
|
||||
*ptr ++ = hex[*uri & 15];
|
||||
}
|
||||
else
|
||||
*ptr ++ = *uri;
|
||||
@@ -1630,6 +1907,14 @@ http_send(http_t *http, /* I - HTTP data */
|
||||
|
||||
http->status = HTTP_CONTINUE;
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
if (http->encryption == HTTP_ENCRYPT_REQUIRED && !http->tls)
|
||||
{
|
||||
httpSetField(http, HTTP_FIELD_CONNECTION, "Upgrade");
|
||||
httpSetField(http, HTTP_FIELD_UPGRADE, "TLS/1.0,SSL/2.0,SSL/3.0");
|
||||
}
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
if (httpPrintf(http, "%s %s HTTP/1.1\r\n", codes[request], buf) < 1)
|
||||
{
|
||||
http->status = HTTP_ERROR;
|
||||
@@ -1660,6 +1945,98 @@ http_send(http_t *http, /* I - HTTP data */
|
||||
}
|
||||
|
||||
|
||||
#ifdef HAVE_LIBSSL
|
||||
/*
|
||||
* 'http_upgrade()' - Force upgrade to TLS encryption.
|
||||
*/
|
||||
|
||||
static int /* O - Status of connection */
|
||||
http_upgrade(http_t *http) /* I - HTTP data */
|
||||
{
|
||||
int ret; /* Return value */
|
||||
http_t myhttp; /* Local copy of HTTP data */
|
||||
|
||||
|
||||
DEBUG_printf(("http_upgrade(%p)\n", http));
|
||||
|
||||
/*
|
||||
* Copy the HTTP data to a local variable so we can do the OPTIONS
|
||||
* request without interfering with the existing request data...
|
||||
*/
|
||||
|
||||
memcpy(&myhttp, http, sizeof(myhttp));
|
||||
|
||||
/*
|
||||
* Send an OPTIONS request to the server, requiring SSL or TLS
|
||||
* encryption on the link...
|
||||
*/
|
||||
|
||||
httpClearFields(&myhttp);
|
||||
httpSetField(&myhttp, HTTP_FIELD_CONNECTION, "upgrade");
|
||||
httpSetField(&myhttp, HTTP_FIELD_UPGRADE, "TLS/1.0, SSL/2.0, SSL/3.0");
|
||||
|
||||
if ((ret = httpOptions(&myhttp, "*")) == 0)
|
||||
{
|
||||
/*
|
||||
* Wait for the secure connection...
|
||||
*/
|
||||
|
||||
while (httpUpdate(&myhttp) == HTTP_CONTINUE);
|
||||
}
|
||||
|
||||
httpFlush(&myhttp);
|
||||
|
||||
/*
|
||||
* Copy the HTTP data back over, if any...
|
||||
*/
|
||||
|
||||
http->fd = myhttp.fd;
|
||||
http->error = myhttp.error;
|
||||
http->activity = myhttp.activity;
|
||||
http->status = myhttp.status;
|
||||
http->version = myhttp.version;
|
||||
http->keep_alive = myhttp.keep_alive;
|
||||
http->used = myhttp.used;
|
||||
|
||||
if (http->used)
|
||||
memcpy(http->buffer, myhttp.buffer, http->used);
|
||||
|
||||
http->auth_type = myhttp.auth_type;
|
||||
http->nonce_count = myhttp.nonce_count;
|
||||
|
||||
memcpy(http->nonce, myhttp.nonce, sizeof(http->nonce));
|
||||
|
||||
http->tls = myhttp.tls;
|
||||
http->encryption = myhttp.encryption;
|
||||
|
||||
/*
|
||||
* See if we actually went secure...
|
||||
*/
|
||||
|
||||
if (!http->tls)
|
||||
{
|
||||
/*
|
||||
* Server does not support HTTP upgrade...
|
||||
*/
|
||||
|
||||
DEBUG_puts("Server does not support HTTP upgrade!");
|
||||
|
||||
#ifdef WIN32
|
||||
closesocket(http->fd);
|
||||
#else
|
||||
close(http->fd);
|
||||
#endif
|
||||
|
||||
http->fd = -1;
|
||||
|
||||
return (-1);
|
||||
}
|
||||
else
|
||||
return (ret);
|
||||
}
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
|
||||
+18
-1
@@ -4,7 +4,7 @@
|
||||
* Hyper-Text Transport Protocol definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -126,6 +126,19 @@ typedef enum
|
||||
} http_encoding_t;
|
||||
|
||||
|
||||
/*
|
||||
* HTTP encryption values...
|
||||
*/
|
||||
|
||||
typedef enum
|
||||
{
|
||||
HTTP_ENCRYPT_IF_REQUESTED, /* Encrypt if requested (TLS upgrade) */
|
||||
HTTP_ENCRYPT_NEVER, /* Never encrypt */
|
||||
HTTP_ENCRYPT_REQUIRED, /* Encryption is required (TLS upgrade) */
|
||||
HTTP_ENCRYPT_ALWAYS /* Always encrypt (SSL) */
|
||||
} http_encryption_t;
|
||||
|
||||
|
||||
/*
|
||||
* HTTP authentication types...
|
||||
*/
|
||||
@@ -150,6 +163,7 @@ typedef enum
|
||||
HTTP_ERROR = -1, /* An error response from httpXxxx() */
|
||||
|
||||
HTTP_CONTINUE = 100, /* Everything OK, keep going... */
|
||||
HTTP_SWITCHING_PROTOCOLS, /* HTTP upgrade to TLS/SSL */
|
||||
|
||||
HTTP_OK = 200, /* OPTIONS/GET/HEAD/POST/TRACE command was successful */
|
||||
HTTP_CREATED, /* PUT command was successful */
|
||||
@@ -182,6 +196,7 @@ typedef enum
|
||||
HTTP_REQUEST_TOO_LARGE, /* Request entity too large */
|
||||
HTTP_URI_TOO_LONG, /* URI too long */
|
||||
HTTP_UNSUPPORTED_MEDIATYPE, /* The requested media type is unsupported */
|
||||
HTTP_UPGRADE_REQUIRED = 426, /* Upgrade to SSL/TLS required */
|
||||
|
||||
HTTP_SERVER_ERROR = 500, /* Internal server error */
|
||||
HTTP_NOT_IMPLEMENTED, /* Feature not implemented */
|
||||
@@ -261,6 +276,7 @@ typedef struct
|
||||
/* Nonce value */
|
||||
int nonce_count; /* Nonce count */
|
||||
void *tls; /* TLS state information */
|
||||
http_encryption_t encryption; /* Encryption requirements */
|
||||
} http_t;
|
||||
|
||||
|
||||
@@ -275,6 +291,7 @@ extern int httpCheck(http_t *http);
|
||||
extern void httpClose(http_t *http);
|
||||
extern http_t *httpConnect(const char *host, int port);
|
||||
extern int httpDelete(http_t *http, const char *uri);
|
||||
extern int httpEncryption(http_t *http, http_encryption_t e);
|
||||
# define httpError(http) ((http)->error)
|
||||
extern void httpFlush(http_t *http);
|
||||
extern int httpGet(http_t *http, const char *uri);
|
||||
|
||||
+235
-83
@@ -4,7 +4,7 @@
|
||||
* Internet Printing Protocol support functions for the Common UNIX
|
||||
* Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -93,7 +93,7 @@ ippAddBoolean(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddBoolean(%08x, %02x, \'%s\', %d)\n", ipp, group, name, value));
|
||||
DEBUG_printf(("ippAddBoolean(%p, %02x, \'%s\', %d)\n", ipp, group, name, value));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
return (NULL);
|
||||
@@ -125,7 +125,7 @@ ippAddBooleans(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddBooleans(%08x, %02x, \'%s\', %d, %08x)\n", ipp,
|
||||
DEBUG_printf(("ippAddBooleans(%p, %02x, \'%s\', %d, %p)\n", ipp,
|
||||
group, name, num_values, values));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
@@ -159,7 +159,7 @@ ippAddDate(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddDate(%08x, %02x, \'%s\', %08x)\n", ipp, group, name,
|
||||
DEBUG_printf(("ippAddDate(%p, %02x, \'%s\', %p)\n", ipp, group, name,
|
||||
value));
|
||||
|
||||
if (ipp == NULL || name == NULL || value == NULL)
|
||||
@@ -191,7 +191,7 @@ ippAddInteger(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddInteger(%08x, %d, \'%s\', %d)\n", ipp, group, name,
|
||||
DEBUG_printf(("ippAddInteger(%p, %d, \'%s\', %d)\n", ipp, group, name,
|
||||
value));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
@@ -268,9 +268,10 @@ ippAddString(ipp_t *ipp, /* I - IPP request */
|
||||
attr->group_tag = group;
|
||||
attr->value_tag = type;
|
||||
attr->values[0].string.charset = charset ? strdup(charset) : NULL;
|
||||
attr->values[0].string.text = strdup(value);
|
||||
attr->values[0].string.text = value ? strdup(value) : NULL;
|
||||
|
||||
if (type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET)
|
||||
if ((type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET) &&
|
||||
attr->values[0].string.text)
|
||||
{
|
||||
/*
|
||||
* Convert to lowercase and change _ to - as needed...
|
||||
@@ -480,7 +481,7 @@ ippAddSeparator(ipp_t *ipp) /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddSeparator(%08x)\n", ipp));
|
||||
DEBUG_printf(("ippAddSeparator(%p)\n", ipp));
|
||||
|
||||
if (ipp == NULL)
|
||||
return (NULL);
|
||||
@@ -555,6 +556,8 @@ ippDelete(ipp_t *ipp) /* I - IPP request */
|
||||
*next; /* Next attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippNew(): %p\n", ipp));
|
||||
|
||||
if (ipp == NULL)
|
||||
return;
|
||||
|
||||
@@ -575,75 +578,80 @@ ippDelete(ipp_t *ipp) /* I - IPP request */
|
||||
const char * /* O - Text string */
|
||||
ippErrorString(ipp_status_t error) /* I - Error status */
|
||||
{
|
||||
static cups_lang_t *language = 0; /* Language info */
|
||||
static char unknown[255]; /* Unknown error statuses */
|
||||
static const char *status_oks[] = /* "OK" status codes */
|
||||
{
|
||||
"successful-ok",
|
||||
"successful-ok-ignored-or-substituted-attributes",
|
||||
"successful-ok-conflicting-attributes",
|
||||
"successful-ok-ignored-subscriptions",
|
||||
"successful-ok-ignored-notifications",
|
||||
"successful-ok-too-many-events",
|
||||
"successful-ok-but-cancel-subscription"
|
||||
},
|
||||
*status_400s[] = /* Client errors */
|
||||
{
|
||||
"client-error-bad-request",
|
||||
"client-error-forbidden",
|
||||
"client-error-not-authenticated",
|
||||
"client-error-not-authorized",
|
||||
"client-error-not-possible",
|
||||
"client-error-timeout",
|
||||
"client-error-not-found",
|
||||
"client-error-gone",
|
||||
"client-error-request-entity-too-large",
|
||||
"client-error-request-value-too-long",
|
||||
"client-error-document-format-not-supported",
|
||||
"client-error-attributes-or-values-not-supported",
|
||||
"client-error-uri-scheme-not-supported",
|
||||
"client-error-charset-not-supported",
|
||||
"client-error-conflicting-attributes",
|
||||
"client-error-compression-not-supported",
|
||||
"client-error-compression-error",
|
||||
"client-error-document-format-error",
|
||||
"client-error-document-access-error",
|
||||
"client-error-attributes-not-settable",
|
||||
"client-error-ignored-all-subscriptions",
|
||||
"client-error-too-many-subscriptions",
|
||||
"client-error-ignored-all-notifications",
|
||||
"client-error-print-support-file-not-found"
|
||||
},
|
||||
*status_500s[] = /* Server errors */
|
||||
{
|
||||
"server-error-internal-error",
|
||||
"server-error-operation-not-supported",
|
||||
"server-error-service-unavailable",
|
||||
"server-error-version-not-supported",
|
||||
"server-error-device-error",
|
||||
"server-error-temporary-error",
|
||||
"server-error-not-accepting-jobs",
|
||||
"server-error-busy",
|
||||
"server-error-job-canceled",
|
||||
"server-error-multiple-document-jobs-not-supported",
|
||||
"server-error-printer-is-deactivated"
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Load the localized message file as needed...
|
||||
* See if the error code is a known value...
|
||||
*/
|
||||
|
||||
if (!language)
|
||||
language = cupsLangDefault();
|
||||
if (error >= IPP_OK && error <= IPP_OK_BUT_CANCEL_SUBSCRIPTION)
|
||||
return (status_oks[error]);
|
||||
else if (error == IPP_REDIRECTION_OTHER_SITE)
|
||||
return ("redirection-other-site");
|
||||
else if (error >= IPP_BAD_REQUEST && error <= IPP_PRINT_SUPPORT_FILE_NOT_FOUND)
|
||||
return (status_400s[error - IPP_BAD_REQUEST]);
|
||||
else if (error >= IPP_INTERNAL_ERROR && error <= IPP_PRINTER_IS_DEACTIVATED)
|
||||
return (status_500s[error - IPP_INTERNAL_ERROR]);
|
||||
|
||||
/*
|
||||
* Return the appropriate message...
|
||||
* No, build an "unknown-xxxx" error string...
|
||||
*/
|
||||
|
||||
switch (error)
|
||||
{
|
||||
case IPP_OK :
|
||||
case IPP_OK_SUBST :
|
||||
case IPP_OK_CONFLICT :
|
||||
return ("OK");
|
||||
|
||||
case IPP_BAD_REQUEST :
|
||||
return (cupsLangString(language, HTTP_BAD_REQUEST));
|
||||
|
||||
case IPP_FORBIDDEN :
|
||||
return (cupsLangString(language, HTTP_FORBIDDEN));
|
||||
|
||||
case IPP_NOT_AUTHENTICATED :
|
||||
case IPP_NOT_AUTHORIZED :
|
||||
return (cupsLangString(language, HTTP_UNAUTHORIZED));
|
||||
|
||||
case IPP_NOT_POSSIBLE :
|
||||
return (cupsLangString(language, HTTP_METHOD_NOT_ALLOWED));
|
||||
|
||||
case IPP_TIMEOUT :
|
||||
return (cupsLangString(language, HTTP_REQUEST_TIMEOUT));
|
||||
|
||||
case IPP_NOT_FOUND :
|
||||
return (cupsLangString(language, HTTP_NOT_FOUND));
|
||||
|
||||
case IPP_GONE :
|
||||
return (cupsLangString(language, HTTP_GONE));
|
||||
|
||||
case IPP_DOCUMENT_FORMAT :
|
||||
return (cupsLangString(language, HTTP_UNSUPPORTED_MEDIATYPE));
|
||||
|
||||
case IPP_CONFLICT :
|
||||
return (cupsLangString(language, HTTP_CONFLICT));
|
||||
|
||||
case IPP_INTERNAL_ERROR :
|
||||
return (cupsLangString(language, HTTP_SERVER_ERROR));
|
||||
|
||||
case IPP_OPERATION_NOT_SUPPORTED :
|
||||
case IPP_VERSION_NOT_SUPPORTED :
|
||||
return (cupsLangString(language, HTTP_NOT_SUPPORTED));
|
||||
|
||||
case IPP_SERVICE_UNAVAILABLE :
|
||||
case IPP_DEVICE_ERROR :
|
||||
case IPP_TEMPORARY_ERROR :
|
||||
case IPP_PRINTER_BUSY :
|
||||
return (cupsLangString(language, HTTP_SERVICE_UNAVAILABLE));
|
||||
|
||||
case IPP_NOT_ACCEPTING :
|
||||
return (cupsLangString(language, CUPS_MSG_NOT_ACCEPTING_JOBS));
|
||||
|
||||
default :
|
||||
return ("ERROR");
|
||||
}
|
||||
sprintf(unknown, "unknown-%04x", error);
|
||||
|
||||
return (unknown);
|
||||
}
|
||||
|
||||
|
||||
@@ -656,23 +664,26 @@ ippFindAttribute(ipp_t *ipp, /* I - IPP request */
|
||||
const char *name, /* I - Name of attribute */
|
||||
ipp_tag_t type) /* I - Type of attribute */
|
||||
{
|
||||
ipp_attribute_t *attr; /* Current atttribute */
|
||||
ipp_attribute_t *attr; /* Current atttribute */
|
||||
ipp_tag_t value_tag; /* Value tag */
|
||||
|
||||
|
||||
DEBUG_printf(("ippFindAttribute(%08x, \'%s\')\n", ipp, name));
|
||||
DEBUG_printf(("ippFindAttribute(%p, \'%s\')\n", ipp, name));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
return (NULL);
|
||||
|
||||
for (attr = ipp->attrs; attr != NULL; attr = attr->next)
|
||||
{
|
||||
DEBUG_printf(("ippFindAttribute: attr = %08x, name = \'%s\'\n", attr,
|
||||
DEBUG_printf(("ippFindAttribute: attr = %p, name = \'%s\'\n", attr,
|
||||
attr->name));
|
||||
|
||||
value_tag = (ipp_tag_t)(attr->value_tag & IPP_TAG_MASK);
|
||||
|
||||
if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
|
||||
(attr->value_tag == type || type == IPP_TAG_ZERO ||
|
||||
(attr->value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
|
||||
(attr->value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))
|
||||
(value_tag == type || type == IPP_TAG_ZERO ||
|
||||
(value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
|
||||
(value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))
|
||||
return (attr);
|
||||
}
|
||||
|
||||
@@ -727,7 +738,7 @@ ippLength(ipp_t *ipp) /* I - IPP request */
|
||||
bytes += 2 * attr->num_values; /* Name lengths */
|
||||
bytes += 2 * attr->num_values; /* Value lengths */
|
||||
|
||||
switch (attr->value_tag)
|
||||
switch (attr->value_tag & ~IPP_TAG_COPY)
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
@@ -798,7 +809,7 @@ ippNew(void)
|
||||
ipp_t *temp; /* New IPP request */
|
||||
|
||||
|
||||
if ((temp = (ipp_t *)calloc(sizeof(ipp_t), 1)) != NULL)
|
||||
if ((temp = (ipp_t *)calloc(1, sizeof(ipp_t))) != NULL)
|
||||
{
|
||||
/*
|
||||
* Default to IPP 1.1...
|
||||
@@ -808,6 +819,8 @@ ippNew(void)
|
||||
temp->request.any.version[1] = 1;
|
||||
}
|
||||
|
||||
DEBUG_printf(("ippNew(): %p\n", temp));
|
||||
|
||||
return (temp);
|
||||
}
|
||||
|
||||
@@ -827,7 +840,7 @@ ippRead(http_t *http, /* I - HTTP data */
|
||||
ipp_tag_t tag; /* Current tag */
|
||||
|
||||
|
||||
DEBUG_printf(("ippRead(%08x, %08x)\n", http, ipp));
|
||||
DEBUG_printf(("ippRead(%p, %p)\n", http, ipp));
|
||||
|
||||
if (http == NULL || ipp == NULL)
|
||||
return (IPP_ERROR);
|
||||
@@ -873,6 +886,10 @@ ippRead(http_t *http, /* I - HTTP data */
|
||||
ipp->current = NULL;
|
||||
ipp->curtag = IPP_TAG_ZERO;
|
||||
|
||||
DEBUG_printf(("ippRead: version=%d.%d\n", buffer[0], buffer[1]));
|
||||
DEBUG_printf(("ippRead: op_status=%04x\n", ipp->request.any.op_status));
|
||||
DEBUG_printf(("ippRead: request_id=%d\n", ipp->request.any.request_id));
|
||||
|
||||
/*
|
||||
* If blocking is disabled, stop here...
|
||||
*/
|
||||
@@ -942,6 +959,32 @@ ippRead(http_t *http, /* I - HTTP data */
|
||||
|
||||
attr = ipp->current;
|
||||
|
||||
/*
|
||||
* Make sure we aren't adding a new value of a different
|
||||
* type...
|
||||
*/
|
||||
|
||||
if (attr->value_tag == IPP_TAG_STRING ||
|
||||
(attr->value_tag >= IPP_TAG_TEXTLANG &&
|
||||
attr->value_tag <= IPP_TAG_MIMETYPE))
|
||||
{
|
||||
/*
|
||||
* String values can sometimes come across in different
|
||||
* forms; accept sets of differing values...
|
||||
*/
|
||||
|
||||
if (tag != IPP_TAG_STRING &&
|
||||
(tag < IPP_TAG_TEXTLANG || tag > IPP_TAG_MIMETYPE))
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
else if (attr->value_tag != tag)
|
||||
return (IPP_ERROR);
|
||||
|
||||
/*
|
||||
* Finally, make sure we don't have too many elements in the
|
||||
* attribute array...
|
||||
*/
|
||||
|
||||
if (attr->num_values >= IPP_MAX_VALUES)
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
@@ -1207,6 +1250,10 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
ipp->current = ipp->attrs;
|
||||
ipp->curtag = IPP_TAG_ZERO;
|
||||
|
||||
DEBUG_printf(("ippWrite: version=%d.%d\n", buffer[0], buffer[1]));
|
||||
DEBUG_printf(("ippWrite: op_status=%04x\n", ipp->request.any.op_status));
|
||||
DEBUG_printf(("ippWrite: request_id=%d\n", ipp->request.any.request_id));
|
||||
|
||||
/*
|
||||
* If blocking is disabled, stop here...
|
||||
*/
|
||||
@@ -1241,7 +1288,8 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
*bufptr++ = attr->group_tag;
|
||||
}
|
||||
|
||||
n = strlen(attr->name);
|
||||
if ((n = strlen(attr->name)) > (sizeof(buffer) - 3))
|
||||
return (IPP_ERROR);
|
||||
|
||||
DEBUG_printf(("ippWrite: writing value tag = %x\n", attr->value_tag));
|
||||
DEBUG_printf(("ippWrite: writing name = %d, \'%s\'\n", n, attr->name));
|
||||
@@ -1252,12 +1300,23 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
memcpy(bufptr, attr->name, n);
|
||||
bufptr += n;
|
||||
|
||||
switch (attr->value_tag)
|
||||
switch (attr->value_tag & ~IPP_TAG_COPY)
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 9)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
if (i)
|
||||
{
|
||||
/*
|
||||
@@ -1282,6 +1341,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
case IPP_TAG_BOOLEAN :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 6)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
if (i)
|
||||
{
|
||||
/*
|
||||
@@ -1322,6 +1392,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
attr->value_tag));
|
||||
DEBUG_printf(("ippWrite: writing name = 0, \'\'\n"));
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 3)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
*bufptr++ = attr->value_tag;
|
||||
*bufptr++ = 0;
|
||||
*bufptr++ = 0;
|
||||
@@ -1329,6 +1410,9 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
|
||||
n = strlen(attr->values[i].string.text);
|
||||
|
||||
if (n > sizeof(buffer))
|
||||
return (IPP_ERROR);
|
||||
|
||||
DEBUG_printf(("ippWrite: writing string = %d, \'%s\'\n", n,
|
||||
attr->values[i].string.text));
|
||||
|
||||
@@ -1353,6 +1437,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
case IPP_TAG_DATE :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 16)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
if (i)
|
||||
{
|
||||
/*
|
||||
@@ -1375,6 +1470,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
case IPP_TAG_RESOLUTION :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 14)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
if (i)
|
||||
{
|
||||
/*
|
||||
@@ -1404,6 +1510,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
case IPP_TAG_RANGE :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 13)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
if (i)
|
||||
{
|
||||
/*
|
||||
@@ -1440,6 +1557,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
* values with a zero-length name...
|
||||
*/
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 3)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
*bufptr++ = attr->value_tag;
|
||||
*bufptr++ = 0;
|
||||
*bufptr++ = 0;
|
||||
@@ -1447,7 +1575,10 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
|
||||
n = strlen(attr->values[i].string.charset) +
|
||||
strlen(attr->values[i].string.text) +
|
||||
2;
|
||||
4;
|
||||
|
||||
if (n > sizeof(buffer))
|
||||
return (IPP_ERROR);
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
|
||||
{
|
||||
@@ -1494,6 +1625,17 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
* values with a zero-length name...
|
||||
*/
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < 3)
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
{
|
||||
DEBUG_puts("ippWrite: Could not write IPP attribute...");
|
||||
return (IPP_ERROR);
|
||||
}
|
||||
|
||||
bufptr = buffer;
|
||||
}
|
||||
|
||||
*bufptr++ = attr->value_tag;
|
||||
*bufptr++ = 0;
|
||||
*bufptr++ = 0;
|
||||
@@ -1501,6 +1643,9 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
|
||||
n = attr->values[i].unknown.length;
|
||||
|
||||
if (n > sizeof(buffer))
|
||||
return (IPP_ERROR);
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
|
||||
{
|
||||
if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
|
||||
@@ -1618,7 +1763,7 @@ _ipp_add_attr(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("_ipp_add_attr(%08x, %d)\n", ipp, num_values));
|
||||
DEBUG_printf(("_ipp_add_attr(%p, %d)\n", ipp, num_values));
|
||||
|
||||
if (ipp == NULL || num_values < 0)
|
||||
return (NULL);
|
||||
@@ -1638,6 +1783,8 @@ _ipp_add_attr(ipp_t *ipp, /* I - IPP request */
|
||||
|
||||
ipp->last = attr;
|
||||
|
||||
DEBUG_printf(("_ipp_add_attr(): %p\n", attr));
|
||||
|
||||
return (attr);
|
||||
}
|
||||
|
||||
@@ -1652,6 +1799,8 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */
|
||||
int i; /* Looping var */
|
||||
|
||||
|
||||
DEBUG_printf(("_ipp_free_attr(): %p\n", attr));
|
||||
|
||||
switch (attr->value_tag)
|
||||
{
|
||||
case IPP_TAG_TEXT :
|
||||
@@ -1671,7 +1820,7 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */
|
||||
case IPP_TAG_NAMELANG :
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
if (attr->values[i].string.charset)
|
||||
if (attr->values[i].string.charset && i == 0)
|
||||
free(attr->values[i].string.charset);
|
||||
free(attr->values[i].string.text);
|
||||
}
|
||||
@@ -1705,7 +1854,7 @@ ipp_read(http_t *http, /* I - Client connection */
|
||||
* Loop until all bytes are read...
|
||||
*/
|
||||
|
||||
for (tbytes = 0; tbytes < length; tbytes += bytes, buffer += bytes)
|
||||
for (tbytes = 0, bytes = 0; tbytes < length; tbytes += bytes, buffer += bytes)
|
||||
if ((bytes = httpRead(http, (char *)buffer, length - tbytes)) <= 0)
|
||||
break;
|
||||
|
||||
@@ -1713,7 +1862,10 @@ ipp_read(http_t *http, /* I - Client connection */
|
||||
* Return the number of bytes read...
|
||||
*/
|
||||
|
||||
return (tbytes);
|
||||
if (tbytes == 0 && bytes < 0)
|
||||
return (-1);
|
||||
else
|
||||
return (tbytes);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+79
-11
@@ -4,7 +4,7 @@
|
||||
* Internet Printing Protocol definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -76,13 +76,15 @@ typedef enum /**** Format tags for attribute formats... ****/
|
||||
IPP_TAG_END,
|
||||
IPP_TAG_PRINTER,
|
||||
IPP_TAG_UNSUPPORTED_GROUP,
|
||||
IPP_TAG_SUBSCRIPTION,
|
||||
IPP_TAG_EVENT_NOTIFICATION,
|
||||
IPP_TAG_UNSUPPORTED_VALUE = 0x10,
|
||||
IPP_TAG_DEFAULT,
|
||||
IPP_TAG_UNKNOWN,
|
||||
IPP_TAG_NOVALUE,
|
||||
IPP_TAG_NOTSETTABLE = 0x15,
|
||||
IPP_TAG_DELETEATTR,
|
||||
IPP_TAG_ANYVALUE,
|
||||
IPP_TAG_ADMINDEFINE,
|
||||
IPP_TAG_INTEGER = 0x21,
|
||||
IPP_TAG_BOOLEAN,
|
||||
IPP_TAG_ENUM,
|
||||
@@ -90,9 +92,10 @@ typedef enum /**** Format tags for attribute formats... ****/
|
||||
IPP_TAG_DATE,
|
||||
IPP_TAG_RESOLUTION,
|
||||
IPP_TAG_RANGE,
|
||||
IPP_TAG_COLLECTION,
|
||||
IPP_TAG_BEGIN_COLLECTION,
|
||||
IPP_TAG_TEXTLANG,
|
||||
IPP_TAG_NAMELANG,
|
||||
IPP_TAG_END_COLLECTION,
|
||||
IPP_TAG_TEXT = 0x41,
|
||||
IPP_TAG_NAME,
|
||||
IPP_TAG_KEYWORD = 0x44,
|
||||
@@ -100,7 +103,10 @@ typedef enum /**** Format tags for attribute formats... ****/
|
||||
IPP_TAG_URISCHEME,
|
||||
IPP_TAG_CHARSET,
|
||||
IPP_TAG_LANGUAGE,
|
||||
IPP_TAG_MIMETYPE
|
||||
IPP_TAG_MIMETYPE,
|
||||
IPP_TAG_MEMBERNAME,
|
||||
IPP_TAG_MASK = 0x7fffffff, /* Mask for copied attribute values */
|
||||
IPP_TAG_COPY = 0x80000000 /* Bitflag for copied attribute values */
|
||||
} ipp_tag_t;
|
||||
|
||||
typedef enum /**** Resolution units... ****/
|
||||
@@ -111,11 +117,34 @@ typedef enum /**** Resolution units... ****/
|
||||
|
||||
typedef enum /**** Finishings... ****/
|
||||
{
|
||||
IPP_FINISH_NONE = 3,
|
||||
IPP_FINISH_STAPLE,
|
||||
IPP_FINISH_PUNCH,
|
||||
IPP_FINISH_COVER,
|
||||
IPP_FINISH_BIND
|
||||
IPP_FINISHINGS_NONE = 3,
|
||||
IPP_FINISHINGS_STAPLE,
|
||||
IPP_FINISHINGS_PUNCH,
|
||||
IPP_FINISHINGS_COVER,
|
||||
IPP_FINISHINGS_BIND,
|
||||
IPP_FINISHINGS_SADDLE_STITCH,
|
||||
IPP_FINISHINGS_EDGE_STITCH,
|
||||
IPP_FINISHINGS_FOLD,
|
||||
IPP_FINISHINGS_TRIM,
|
||||
IPP_FINISHINGS_BALE,
|
||||
IPP_FINISHINGS_BOOKLET_MAKER,
|
||||
IPP_FINISHINGS_JOB_OFFSET,
|
||||
IPP_FINISHINGS_STAPLE_TOP_LEFT = 20,
|
||||
IPP_FINISHINGS_STAPLE_BOTTOM_LEFT,
|
||||
IPP_FINISHINGS_STAPLE_TOP_RIGHT,
|
||||
IPP_FINISHINGS_STAPLE_BOTTOM_RIGHT,
|
||||
IPP_FINISHINGS_EDGE_STITCH_LEFT,
|
||||
IPP_FINISHINGS_EDGE_STITCH_TOP,
|
||||
IPP_FINISHINGS_EDGE_STITCH_RIGHT,
|
||||
IPP_FINISHINGS_EDGE_STITCH_BOTTOM,
|
||||
IPP_FINISHINGS_STAPLE_DUAL_LEFT,
|
||||
IPP_FINISHINGS_STAPLE_DUAL_TOP,
|
||||
IPP_FINISHINGS_STAPLE_DUAL_RIGHT,
|
||||
IPP_FINISHINGS_STAPLE_DUAL_BOTTOM,
|
||||
IPP_FINISHINGS_BIND_LEFT = 50,
|
||||
IPP_FINISHINGS_BIND_TOP,
|
||||
IPP_FINISHINGS_BIND_RIGHT,
|
||||
IPP_FINISHINGS_BIND_BOTTOM
|
||||
} ipp_finish_t;
|
||||
|
||||
typedef enum /**** Orientation... ****/
|
||||
@@ -181,6 +210,31 @@ typedef enum /**** IPP operations... ****/
|
||||
IPP_SET_PRINTER_ATTRIBUTES,
|
||||
IPP_SET_JOB_ATTRIBUTES,
|
||||
IPP_GET_PRINTER_SUPPORTED_VALUES,
|
||||
IPP_CREATE_PRINTER_SUBSCRIPTION,
|
||||
IPP_CREATE_JOB_SUBSCRIPTION,
|
||||
IPP_GET_SUBSCRIPTION_ATTRIBUTES,
|
||||
IPP_GET_SUBSCRIPTIONS,
|
||||
IPP_RENEW_SUBSCRIPTION,
|
||||
IPP_CANCEL_SUBSCRIPTION,
|
||||
IPP_GET_NOTIFICATIONS,
|
||||
IPP_SEND_NOTIFICATIONS,
|
||||
IPP_GET_PRINT_SUPPORT_FILES = 0x0021,
|
||||
IPP_ENABLE_PRINTER,
|
||||
IPP_DISABLE_PRINTER,
|
||||
IPP_PAUSE_PRINTER_AFTER_CURRENT_JOB,
|
||||
IPP_HOLD_NEW_JOBS,
|
||||
IPP_RELEASE_HELD_NEW_JOBS,
|
||||
IPP_DEACTIVATE_PRINTER,
|
||||
IPP_ACTIVATE_PRINTER,
|
||||
IPP_RESTART_PRINTER,
|
||||
IPP_SHUTDOWN_PRINTER,
|
||||
IPP_STARTUP_PRINTER,
|
||||
IPP_REPROCESS_JOB,
|
||||
IPP_CANCEL_CURRENT_JOB,
|
||||
IPP_SUSPEND_CURRENT_JOB,
|
||||
IPP_RESUME_JOB,
|
||||
IPP_PROMOTE_JOB,
|
||||
IPP_SCHEDULE_JOB_AFTER,
|
||||
IPP_PRIVATE = 0x4000,
|
||||
CUPS_GET_DEFAULT,
|
||||
CUPS_GET_PRINTERS,
|
||||
@@ -194,7 +248,9 @@ typedef enum /**** IPP operations... ****/
|
||||
CUPS_SET_DEFAULT,
|
||||
CUPS_GET_DEVICES,
|
||||
CUPS_GET_PPDS,
|
||||
CUPS_MOVE_JOB
|
||||
CUPS_MOVE_JOB,
|
||||
CUPS_ADD_DEVICE,
|
||||
CUPS_DELETE_DEVICE
|
||||
} ipp_op_t;
|
||||
|
||||
typedef enum /**** IPP status codes... ****/
|
||||
@@ -202,6 +258,11 @@ typedef enum /**** IPP status codes... ****/
|
||||
IPP_OK = 0x0000,
|
||||
IPP_OK_SUBST,
|
||||
IPP_OK_CONFLICT,
|
||||
IPP_OK_IGNORED_SUBSCRIPTIONS,
|
||||
IPP_OK_IGNORED_NOTIFICATIONS,
|
||||
IPP_OK_TOO_MANY_EVENTS,
|
||||
IPP_OK_BUT_CANCEL_SUBSCRIPTION,
|
||||
IPP_REDIRECTION_OTHER_SITE = 0x300,
|
||||
IPP_BAD_REQUEST = 0x0400,
|
||||
IPP_FORBIDDEN,
|
||||
IPP_NOT_AUTHENTICATED,
|
||||
@@ -221,6 +282,12 @@ typedef enum /**** IPP status codes... ****/
|
||||
IPP_COMPRESSION_ERROR,
|
||||
IPP_DOCUMENT_FORMAT_ERROR,
|
||||
IPP_DOCUMENT_ACCESS_ERROR,
|
||||
IPP_ATTRIBUTES_NOT_SETTABLE,
|
||||
IPP_IGNORED_ALL_SUBSCRIPTIONS,
|
||||
IPP_TOO_MANY_SUBSCRIPTIONS,
|
||||
IPP_IGNORED_ALL_NOTIFICATIONS,
|
||||
IPP_PRINT_SUPPORT_FILE_NOT_FOUND,
|
||||
|
||||
IPP_INTERNAL_ERROR = 0x0500,
|
||||
IPP_OPERATION_NOT_SUPPORTED,
|
||||
IPP_SERVICE_UNAVAILABLE,
|
||||
@@ -230,7 +297,8 @@ typedef enum /**** IPP status codes... ****/
|
||||
IPP_NOT_ACCEPTING,
|
||||
IPP_PRINTER_BUSY,
|
||||
IPP_ERROR_JOB_CANCELLED,
|
||||
IPP_MULTIPLE_JOBS_NOT_SUPPORTED
|
||||
IPP_MULTIPLE_JOBS_NOT_SUPPORTED,
|
||||
IPP_PRINTER_IS_DEACTIVATED
|
||||
} ipp_status_t;
|
||||
|
||||
typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/
|
||||
|
||||
+9
-4
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* I18N/language support for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -263,7 +263,10 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
*/
|
||||
|
||||
if (fp == NULL)
|
||||
strcpy(line, lang_default[0]);
|
||||
{
|
||||
strncpy(line, lang_default[0], sizeof(line) - 1);
|
||||
line[sizeof(line) - 1] = '\0';
|
||||
}
|
||||
else if (fgets(line, sizeof(line), fp) == NULL)
|
||||
{
|
||||
/*
|
||||
@@ -320,7 +323,8 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
*/
|
||||
|
||||
lang->used ++;
|
||||
strcpy(lang->language, langname);
|
||||
strncpy(lang->language, langname, sizeof(lang->language) - 1);
|
||||
lang->language[sizeof(lang->language) - 1] = '\0';
|
||||
|
||||
for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
|
||||
if (strcmp(lang_encodings[i], line) == 0)
|
||||
@@ -347,7 +351,8 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
if (lang_default[count] == NULL)
|
||||
break;
|
||||
|
||||
strcpy(line, lang_default[count]);
|
||||
strncpy(line, lang_default[count], sizeof(line) - 1);
|
||||
/* Already set last byte to 0 above... */
|
||||
}
|
||||
else if (fgets(line, sizeof(line), fp) == NULL)
|
||||
break;
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Multi-language support for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+7
-3
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Option marking routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -118,7 +118,9 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */
|
||||
if (c1->marked)
|
||||
break;
|
||||
|
||||
if (j == 0 || strcasecmp(c1->choice, "None") == 0 ||
|
||||
if (j == 0 ||
|
||||
strcasecmp(c1->choice, "None") == 0 ||
|
||||
strcasecmp(c1->choice, "Off") == 0 ||
|
||||
strcasecmp(c1->choice, "False") == 0)
|
||||
c1 = NULL;
|
||||
}
|
||||
@@ -149,7 +151,9 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */
|
||||
if (c2->marked)
|
||||
break;
|
||||
|
||||
if (j == 0 || strcasecmp(c2->choice, "None") == 0 ||
|
||||
if (j == 0 ||
|
||||
strcasecmp(c2->choice, "None") == 0 ||
|
||||
strcasecmp(c2->choice, "Off") == 0 ||
|
||||
strcasecmp(c2->choice, "False") == 0)
|
||||
c2 = NULL;
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* MD5 password support for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+47
-281
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Option routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,12 +23,11 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* cupsAddOption() - Add an option to an option array.
|
||||
* cupsEncodeOptions() - Encode printer options into IPP attributes.
|
||||
* cupsFreeOptions() - Free all memory used by options.
|
||||
* cupsGetOption() - Get an option value.
|
||||
* cupsParseOptions() - Parse options from a command-line argument.
|
||||
* cupsMarkOptions() - Mark command-line options in a PPD file.
|
||||
* cupsAddOption() - Add an option to an option array.
|
||||
* cupsFreeOptions() - Free all memory used by options.
|
||||
* cupsGetOption() - Get an option value.
|
||||
* cupsParseOptions() - Parse options from a command-line argument.
|
||||
* cupsMarkOptions() - Mark command-line options in a PPD file.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -56,8 +55,9 @@ cupsAddOption(const char *name, /* I - Name of option */
|
||||
cups_option_t *temp; /* Pointer to new option */
|
||||
|
||||
|
||||
if (name == NULL || value == NULL || options == NULL)
|
||||
return (0);
|
||||
if (name == NULL || !name[0] || value == NULL ||
|
||||
options == NULL || num_options < 0)
|
||||
return (num_options);
|
||||
|
||||
/*
|
||||
* Look for an existing option with the same name...
|
||||
@@ -102,274 +102,6 @@ cupsAddOption(const char *name, /* I - Name of option */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsEncodeOptions()' - Encode printer options into IPP attributes.
|
||||
*/
|
||||
|
||||
void
|
||||
cupsEncodeOptions(ipp_t *ipp, /* I - Request to add to */
|
||||
int num_options, /* I - Number of options */
|
||||
cups_option_t *options) /* I - Options */
|
||||
{
|
||||
int i, j; /* Looping vars */
|
||||
int count; /* Number of values */
|
||||
int n; /* Attribute value */
|
||||
char *s, /* Pointer into option value */
|
||||
*val, /* Pointer to option value */
|
||||
*copy, /* Copy of option value */
|
||||
*sep; /* Option separator */
|
||||
ipp_attribute_t *attr; /* IPP job-id attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions(%p, %d, %p)\n", ipp, num_options, options));
|
||||
|
||||
if (ipp == NULL || num_options < 1 || options == NULL)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Handle the document format stuff first...
|
||||
*/
|
||||
|
||||
if ((val = (char *)cupsGetOption("document-format", num_options, options)) != NULL)
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, val);
|
||||
else if (cupsGetOption("raw", num_options, options))
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/vnd.cups-raw");
|
||||
else
|
||||
ippAddString(ipp, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/octet-stream");
|
||||
|
||||
/*
|
||||
* Then add all other options...
|
||||
*/
|
||||
|
||||
for (i = 0; i < num_options; i ++)
|
||||
{
|
||||
/*
|
||||
* Skip document format options - handled above...
|
||||
*/
|
||||
|
||||
if (strcasecmp(options[i].name, "raw") == 0 ||
|
||||
strcasecmp(options[i].name, "document-format") == 0)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Count the number of values...
|
||||
*/
|
||||
|
||||
for (count = 1, sep = options[i].value;
|
||||
(sep = strchr(sep + 1, ',')) != NULL;
|
||||
count ++);
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: option = \'%s\', count = %d\n",
|
||||
options[i].name, count));
|
||||
|
||||
if ((attr = _ipp_add_attr(ipp, count)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for attributes!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->group_tag = IPP_TAG_JOB;
|
||||
|
||||
if ((attr->name = strdup(options[i].name)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for name!");
|
||||
return;
|
||||
}
|
||||
|
||||
if (count > 1)
|
||||
{
|
||||
/*
|
||||
* Make a copy of the value we can fiddle with...
|
||||
*/
|
||||
|
||||
if ((copy = strdup(options[i].value)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for value copy!");
|
||||
return;
|
||||
}
|
||||
|
||||
val = copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Since we have a single value, use the value directly...
|
||||
*/
|
||||
|
||||
val = options[i].value;
|
||||
copy = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* See what the option value is; for compatibility with older interface
|
||||
* scripts, we have to support single-argument options as well as
|
||||
* option=value, option=low-high, option=MxN, and option=val1,val2,...,valN.
|
||||
*/
|
||||
|
||||
if (*val == '\0')
|
||||
{
|
||||
/*
|
||||
* Old-style System V boolean value...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
|
||||
if (strncasecmp(attr->name, "no", 2) == 0)
|
||||
{
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
|
||||
strcpy(attr->name, attr->name + 2);
|
||||
attr->values[0].boolean = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
|
||||
attr->values[0].boolean = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Scan the value string for values...
|
||||
*/
|
||||
|
||||
for (j = 0; *val != '\0'; val = sep, j ++)
|
||||
{
|
||||
/*
|
||||
* Find the end of this value and mark it if needed...
|
||||
*/
|
||||
|
||||
if ((sep = strchr(val, ',')) != NULL)
|
||||
*sep++ = '\0';
|
||||
else
|
||||
sep = val + strlen(val);
|
||||
|
||||
/*
|
||||
* See what kind of value it is...
|
||||
*/
|
||||
|
||||
if (strcasecmp(val, "true") == 0 ||
|
||||
strcasecmp(val, "on") == 0 ||
|
||||
strcasecmp(val, "yes") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - true...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
attr->values[j].boolean = 1;
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean true value...");
|
||||
}
|
||||
else if (strcasecmp(val, "false") == 0 ||
|
||||
strcasecmp(val, "off") == 0 ||
|
||||
strcasecmp(val, "no") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - false...
|
||||
*/
|
||||
|
||||
attr->value_tag = IPP_TAG_BOOLEAN;
|
||||
attr->values[j].boolean = 0;
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Added boolean false value...");
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Number, range, resolution, or string...
|
||||
*/
|
||||
|
||||
n = strtol(val, &s, 0);
|
||||
|
||||
if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
|
||||
{
|
||||
/*
|
||||
* String value(s)...
|
||||
*/
|
||||
|
||||
if ((attr->values[j].string.text = strdup(val)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->value_tag = IPP_TAG_NAME;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
|
||||
}
|
||||
else if (*s == '-')
|
||||
{
|
||||
attr->value_tag = IPP_TAG_RANGE;
|
||||
attr->values[j].range.lower = n;
|
||||
attr->values[j].range.upper = strtol(s + 1, NULL, 0);
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added range option value %d-%d...\n",
|
||||
n, attr->values[j].range.upper));
|
||||
}
|
||||
else if (*s == 'x')
|
||||
{
|
||||
attr->value_tag = IPP_TAG_RESOLUTION;
|
||||
attr->values[j].resolution.xres = n;
|
||||
attr->values[j].resolution.yres = strtol(s + 1, &s, 0);
|
||||
|
||||
if (strcasecmp(s, "dpc") == 0)
|
||||
attr->values[j].resolution.units = IPP_RES_PER_CM;
|
||||
else if (strcasecmp(s, "dpi") == 0)
|
||||
attr->values[j].resolution.units = IPP_RES_PER_INCH;
|
||||
else
|
||||
{
|
||||
if ((attr->values[j].string.text = strdup(val)) == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
DEBUG_puts("cupsEncodeOptions: Ran out of memory for string!");
|
||||
return;
|
||||
}
|
||||
|
||||
attr->value_tag = IPP_TAG_NAME;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Added string value \'%s\'...\n", val));
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Adding resolution option value %s...\n",
|
||||
val));
|
||||
}
|
||||
else
|
||||
{
|
||||
attr->value_tag = IPP_TAG_INTEGER;
|
||||
attr->values[j].integer = n;
|
||||
|
||||
DEBUG_printf(("cupsEncodeOptions: Adding integer option value %d...\n", n));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsFreeOptions()' - Free all memory used by options.
|
||||
*/
|
||||
@@ -381,7 +113,7 @@ cupsFreeOptions(int num_options, /* I - Number of options */
|
||||
int i; /* Looping var */
|
||||
|
||||
|
||||
if (num_options == 0 || options == NULL)
|
||||
if (num_options <= 0 || options == NULL)
|
||||
return;
|
||||
|
||||
for (i = 0; i < num_options; i ++)
|
||||
@@ -406,7 +138,7 @@ cupsGetOption(const char *name, /* I - Name of option */
|
||||
int i; /* Looping var */
|
||||
|
||||
|
||||
if (name == NULL || num_options == 0 || options == NULL)
|
||||
if (name == NULL || num_options <= 0 || options == NULL)
|
||||
return (NULL);
|
||||
|
||||
for (i = 0; i < num_options; i ++)
|
||||
@@ -432,7 +164,7 @@ cupsParseOptions(const char *arg, /* I - Argument to parse */
|
||||
*value; /* Pointer to value */
|
||||
|
||||
|
||||
if (arg == NULL || options == NULL)
|
||||
if (arg == NULL || options == NULL || num_options < 0)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
@@ -442,6 +174,17 @@ cupsParseOptions(const char *arg, /* I - Argument to parse */
|
||||
copyarg = strdup(arg);
|
||||
ptr = copyarg;
|
||||
|
||||
/*
|
||||
* Skip leading spaces...
|
||||
*/
|
||||
|
||||
while (isspace(*ptr))
|
||||
ptr ++;
|
||||
|
||||
/*
|
||||
* Loop through the string...
|
||||
*/
|
||||
|
||||
while (*ptr != '\0')
|
||||
{
|
||||
/*
|
||||
@@ -452,6 +195,13 @@ cupsParseOptions(const char *arg, /* I - Argument to parse */
|
||||
while (!isspace(*ptr) && *ptr != '=' && *ptr != '\0')
|
||||
ptr ++;
|
||||
|
||||
/*
|
||||
* Avoid an empty name...
|
||||
*/
|
||||
|
||||
if (ptr == name)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Skip trailing spaces...
|
||||
*/
|
||||
@@ -465,7 +215,12 @@ cupsParseOptions(const char *arg, /* I - Argument to parse */
|
||||
* Start of another option...
|
||||
*/
|
||||
|
||||
num_options = cupsAddOption(name, "", num_options, options);
|
||||
if (strncasecmp(name, "no", 2) == 0)
|
||||
num_options = cupsAddOption(name + 2, "false", num_options,
|
||||
options);
|
||||
else
|
||||
num_options = cupsAddOption(name, "true", num_options, options);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -554,6 +309,17 @@ cupsMarkOptions(ppd_file_t *ppd, /* I - PPD file */
|
||||
s[255]; /* Temporary string */
|
||||
|
||||
|
||||
/*
|
||||
* Check arguments...
|
||||
*/
|
||||
|
||||
if (ppd == NULL || num_options <= 0 || options == NULL)
|
||||
return (0);
|
||||
|
||||
/*
|
||||
* Mark options...
|
||||
*/
|
||||
|
||||
conflict = 0;
|
||||
|
||||
for (i = num_options; i > 0; i --, options ++)
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Page size functions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+92
-18
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD file routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -108,6 +108,7 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */
|
||||
ppd_emul_t *emul; /* Current emulation */
|
||||
ppd_group_t *group; /* Current group */
|
||||
char **font; /* Current font */
|
||||
char **filter; /* Current filter */
|
||||
|
||||
|
||||
/*
|
||||
@@ -121,6 +122,10 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */
|
||||
* Free all strings at the top level...
|
||||
*/
|
||||
|
||||
safe_free(ppd->patches);
|
||||
safe_free(ppd->jcl_begin);
|
||||
safe_free(ppd->jcl_ps);
|
||||
safe_free(ppd->jcl_end);
|
||||
safe_free(ppd->lang_encoding);
|
||||
safe_free(ppd->lang_version);
|
||||
safe_free(ppd->modelname);
|
||||
@@ -171,6 +176,18 @@ ppdClose(ppd_file_t *ppd) /* I - PPD file record */
|
||||
if (ppd->num_consts > 0)
|
||||
safe_free(ppd->consts);
|
||||
|
||||
/*
|
||||
* Free any filters...
|
||||
*/
|
||||
|
||||
if (ppd->num_filters > 0)
|
||||
{
|
||||
for (i = ppd->num_filters, filter = ppd->filters; i > 0; i --, filter ++)
|
||||
safe_free(*filter);
|
||||
|
||||
safe_free(ppd->filters);
|
||||
}
|
||||
|
||||
/*
|
||||
* Free any fonts...
|
||||
*/
|
||||
@@ -411,12 +428,17 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
ppd_const_t *constraint; /* Current constraint */
|
||||
ppd_size_t *size; /* Current page size */
|
||||
int mask; /* Line data mask */
|
||||
char keyword[41], /* Keyword from file */
|
||||
name[41], /* Option from file */
|
||||
text[81], /* Human-readable text from file */
|
||||
char keyword[PPD_MAX_NAME],
|
||||
/* Keyword from file */
|
||||
name[PPD_MAX_NAME],
|
||||
/* Option from file */
|
||||
text[PPD_MAX_TEXT],
|
||||
/* Human-readable text from file */
|
||||
*string, /* Code/text from file */
|
||||
*sptr, /* Pointer into string */
|
||||
*nameptr; /* Pointer into name */
|
||||
*nameptr, /* Pointer into name */
|
||||
*temp, /* Temporary string pointer */
|
||||
**tempfonts; /* Temporary fonts pointer */
|
||||
float order; /* Order dependency number */
|
||||
ppd_section_t section; /* Order dependency section */
|
||||
ppd_profile_t *profile; /* Pointer to color profile */
|
||||
@@ -620,6 +642,13 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
else
|
||||
filter = realloc(ppd->filters, sizeof(char *) * (ppd->num_filters + 1));
|
||||
|
||||
if (filter == NULL)
|
||||
{
|
||||
safe_free(filter);
|
||||
ppdClose(ppd);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
ppd->filters = filter;
|
||||
filter += ppd->num_filters;
|
||||
ppd->num_filters ++;
|
||||
@@ -640,17 +669,19 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
*/
|
||||
|
||||
if (ppd->num_fonts == 0)
|
||||
ppd->fonts = (char **)malloc(sizeof(char *));
|
||||
tempfonts = (char **)malloc(sizeof(char *));
|
||||
else
|
||||
ppd->fonts = (char **)realloc(ppd->fonts,
|
||||
sizeof(char *) * (ppd->num_fonts + 1));
|
||||
tempfonts = (char **)realloc(ppd->fonts,
|
||||
sizeof(char *) * (ppd->num_fonts + 1));
|
||||
|
||||
if (ppd->fonts == NULL)
|
||||
if (tempfonts == NULL)
|
||||
{
|
||||
safe_free(string);
|
||||
ppdClose(ppd);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
||||
ppd->fonts = tempfonts;
|
||||
ppd->fonts[ppd->num_fonts] = strdup(name);
|
||||
ppd->num_fonts ++;
|
||||
}
|
||||
@@ -816,8 +847,11 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
|
||||
for (i = 0, sptr = string; i < count; i ++)
|
||||
{
|
||||
for (nameptr = ppd->emulations[i].name; *sptr != '\0' && *sptr != ' ';)
|
||||
*nameptr ++ = *sptr ++;
|
||||
for (nameptr = ppd->emulations[i].name;
|
||||
*sptr != '\0' && *sptr != ' ';
|
||||
sptr ++)
|
||||
if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))
|
||||
*nameptr++ = *sptr;
|
||||
|
||||
*nameptr = '\0';
|
||||
|
||||
@@ -856,8 +890,16 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
}
|
||||
else
|
||||
{
|
||||
ppd->patches = realloc(ppd->patches, strlen(ppd->patches) +
|
||||
strlen(string) + 1);
|
||||
temp = realloc(ppd->patches, strlen(ppd->patches) +
|
||||
strlen(string) + 1);
|
||||
if (temp == NULL)
|
||||
{
|
||||
safe_free(string);
|
||||
ppdClose(ppd);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
ppd->patches = temp;
|
||||
|
||||
strcpy(ppd->patches + strlen(ppd->patches), string);
|
||||
}
|
||||
@@ -1146,6 +1188,11 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
break;
|
||||
|
||||
case 2 : /* Two options... */
|
||||
/*
|
||||
* The following strcpy's are safe, as optionN and
|
||||
* choiceN are all the same size (size defined by PPD spec...)
|
||||
*/
|
||||
|
||||
if (constraint->option1[0] == '*')
|
||||
strcpy(constraint->option1, constraint->option1 + 1);
|
||||
|
||||
@@ -1159,6 +1206,11 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
break;
|
||||
|
||||
case 3 : /* Two options, one choice... */
|
||||
/*
|
||||
* The following strcpy's are safe, as optionN and
|
||||
* choiceN are all the same size (size defined by PPD spec...)
|
||||
*/
|
||||
|
||||
if (constraint->option1[0] == '*')
|
||||
strcpy(constraint->option1, constraint->option1 + 1);
|
||||
|
||||
@@ -1373,7 +1425,7 @@ ppdOpenFile(const char *filename) /* I - File to read from */
|
||||
* 'compare_strings()' - Compare two strings.
|
||||
*/
|
||||
|
||||
int /* O - Result of comparison */
|
||||
static int /* O - Result of comparison */
|
||||
compare_strings(char *s, /* I - First string */
|
||||
char *t) /* I - Second string */
|
||||
{
|
||||
@@ -1600,7 +1652,29 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
*lineptr++ = ch;
|
||||
|
||||
if (ch == '\"')
|
||||
endquote = !endquote;
|
||||
{
|
||||
endquote = !endquote;
|
||||
|
||||
if (!endquote)
|
||||
{
|
||||
/*
|
||||
* End of quoted string; ignore trailing characters...
|
||||
*/
|
||||
|
||||
while ((ch = getc(fp)) != EOF)
|
||||
if (ch == '\n')
|
||||
break;
|
||||
else if (ch == '\r')
|
||||
{
|
||||
ch = getc(fp);
|
||||
if (ch != '\n')
|
||||
ungetc(ch, fp);
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1679,7 +1753,7 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
keyptr = keyword;
|
||||
|
||||
while (*lineptr != '\0' && *lineptr != ':' && !isspace(*lineptr) &&
|
||||
(keyptr - keyword) < 40)
|
||||
(keyptr - keyword) < (PPD_MAX_NAME - 1))
|
||||
*keyptr++ = *lineptr++;
|
||||
|
||||
*keyptr = '\0';
|
||||
@@ -1714,7 +1788,7 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
textptr = text;
|
||||
|
||||
while (*lineptr != '\0' && *lineptr != '\n' && *lineptr != ':' &&
|
||||
(textptr - text) < 80)
|
||||
(textptr - text) < (PPD_MAX_TEXT - 1))
|
||||
*textptr++ = *lineptr++;
|
||||
|
||||
*textptr = '\0';
|
||||
|
||||
+40
-15
@@ -4,7 +4,7 @@
|
||||
* PostScript Printer Description definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -58,6 +58,15 @@ extern "C" {
|
||||
# define PPD_VERSION 4.3 /* Kept in sync with Adobe version number */
|
||||
|
||||
|
||||
/*
|
||||
* PPD size limits (defined in Adobe spec)
|
||||
*/
|
||||
|
||||
# define PPD_MAX_NAME 41 /* Maximum size of name + 1 for nul */
|
||||
# define PPD_MAX_TEXT 81 /* Maximum size of text + 1 for nul */
|
||||
# define PPD_MAX_LINE 256 /* Maximum size of line + 1 for nul */
|
||||
|
||||
|
||||
/*
|
||||
* Types and structures...
|
||||
*/
|
||||
@@ -92,8 +101,10 @@ typedef enum /**** Colorspaces ****/
|
||||
typedef struct /**** Option choices ****/
|
||||
{
|
||||
char marked, /* 0 if not selected, 1 otherwise */
|
||||
choice[41], /* Computer-readable option name */
|
||||
text[81], /* Human-readable option name */
|
||||
choice[PPD_MAX_NAME],
|
||||
/* Computer-readable option name */
|
||||
text[PPD_MAX_TEXT],
|
||||
/* Human-readable option name */
|
||||
*code; /* Code to send for this option */
|
||||
void *option; /* Pointer to parent option structure */
|
||||
} ppd_choice_t;
|
||||
@@ -101,9 +112,12 @@ typedef struct /**** Option choices ****/
|
||||
typedef struct /**** Options ****/
|
||||
{
|
||||
char conflicted, /* 0 if no conflicts exist, 1 otherwise */
|
||||
keyword[41], /* Option keyword name ("PageSize", etc.) */
|
||||
defchoice[41], /* Default option choice */
|
||||
text[81]; /* Human-readable text */
|
||||
keyword[PPD_MAX_NAME],
|
||||
/* Option keyword name ("PageSize", etc.) */
|
||||
defchoice[PPD_MAX_NAME],
|
||||
/* Default option choice */
|
||||
text[PPD_MAX_TEXT];
|
||||
/* Human-readable text */
|
||||
ppd_ui_t ui; /* Type of UI option */
|
||||
ppd_section_t section; /* Section for command */
|
||||
float order; /* Order number */
|
||||
@@ -113,7 +127,8 @@ typedef struct /**** Options ****/
|
||||
|
||||
typedef struct ppd_group_str /**** Groups ****/
|
||||
{
|
||||
char text[81]; /* Human-readable group name */
|
||||
char text[PPD_MAX_TEXT];
|
||||
/* Human-readable group name */
|
||||
int num_options; /* Number of options */
|
||||
ppd_option_t *options; /* Options */
|
||||
int num_subgroups; /* Number of sub-groups */
|
||||
@@ -123,16 +138,21 @@ typedef struct ppd_group_str /**** Groups ****/
|
||||
|
||||
typedef struct /**** Constraints ****/
|
||||
{
|
||||
char option1[41], /* First keyword */
|
||||
choice1[41], /* First option/choice (blank for all) */
|
||||
option2[41], /* Second keyword */
|
||||
choice2[41]; /* Second option/choice (blank for all) */
|
||||
char option1[PPD_MAX_NAME],
|
||||
/* First keyword */
|
||||
choice1[PPD_MAX_NAME],
|
||||
/* First option/choice (blank for all) */
|
||||
option2[PPD_MAX_NAME],
|
||||
/* Second keyword */
|
||||
choice2[PPD_MAX_NAME];
|
||||
/* Second option/choice (blank for all) */
|
||||
} ppd_const_t;
|
||||
|
||||
typedef struct /**** Page Sizes ****/
|
||||
{
|
||||
int marked; /* Page size selected? */
|
||||
char name[41]; /* Media size option */
|
||||
char name[PPD_MAX_NAME];
|
||||
/* Media size option */
|
||||
float width, /* Width of media in points */
|
||||
length, /* Length of media in points */
|
||||
left, /* Left printable margin in points */
|
||||
@@ -143,15 +163,18 @@ typedef struct /**** Page Sizes ****/
|
||||
|
||||
typedef struct /**** Emulators ****/
|
||||
{
|
||||
char name[41], /* Emulator name */
|
||||
char name[PPD_MAX_NAME],
|
||||
/* Emulator name */
|
||||
*start, /* Code to switch to this emulation */
|
||||
*stop; /* Code to stop this emulation */
|
||||
} ppd_emul_t;
|
||||
|
||||
typedef struct /**** sRGB Color Profiles ****/
|
||||
{
|
||||
char resolution[41], /* Resolution or "-" */
|
||||
media_type[41]; /* Media type of "-" */
|
||||
char resolution[PPD_MAX_NAME],
|
||||
/* Resolution or "-" */
|
||||
media_type[PPD_MAX_NAME];
|
||||
/* Media type of "-" */
|
||||
float density, /* Ink density to use */
|
||||
gamma, /* Gamma correction to use */
|
||||
matrix[3][3]; /* Transform matrix */
|
||||
@@ -214,6 +237,8 @@ extern int ppdEmit(ppd_file_t *ppd, FILE *fp,
|
||||
ppd_section_t section);
|
||||
extern int ppdEmitFd(ppd_file_t *ppd, int fd,
|
||||
ppd_section_t section);
|
||||
extern int ppdEmitJCL(ppd_file_t *ppd, FILE *fp, int job_id,
|
||||
const char *user, const char *title);
|
||||
extern int ppdIsMarked(ppd_file_t *ppd, const char *keyword,
|
||||
const char *option);
|
||||
extern void ppdMarkDefaults(ppd_file_t *ppd);
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* snprintf functions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* String functions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* String definitions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
/*
|
||||
* "$Id$"
|
||||
*
|
||||
* Temp file utilities for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
* copyright law. Distribution and use rights are outlined in the file
|
||||
* "LICENSE.txt" which should have been included with this file. If this
|
||||
* file is missing or damaged please contact Easy Software Products
|
||||
* at:
|
||||
*
|
||||
* Attn: CUPS Licensing Information
|
||||
* Easy Software Products
|
||||
* 44141 Airport View Drive, Suite 204
|
||||
* Hollywood, Maryland 20636-3111 USA
|
||||
*
|
||||
* Voice: (301) 373-9603
|
||||
* EMail: cups-info@cups.org
|
||||
* WWW: http://www.cups.org
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* cupsTempFd() - Create a temporary file.
|
||||
* cupsTempFile() - Generate a temporary filename.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Include necessary headers...
|
||||
*/
|
||||
|
||||
#include "cups.h"
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
# include <io.h>
|
||||
#else
|
||||
# include <unistd.h>
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsTempFd()' - Create a temporary file.
|
||||
*/
|
||||
|
||||
int /* O - New file descriptor */
|
||||
cupsTempFd(char *filename, /* I - Pointer to buffer */
|
||||
int len) /* I - Size of buffer */
|
||||
{
|
||||
int fd; /* File descriptor for temp file */
|
||||
#ifdef WIN32
|
||||
char tmpdir[1024]; /* Windows temporary directory */
|
||||
DWORD curtime; /* Current time */
|
||||
#else
|
||||
char *tmpdir; /* TMPDIR environment var */
|
||||
struct timeval curtime; /* Current time */
|
||||
#endif /* WIN32 */
|
||||
static char buf[1024] = ""; /* Buffer if you pass in NULL and 0 */
|
||||
|
||||
|
||||
/*
|
||||
* See if a filename was specified...
|
||||
*/
|
||||
|
||||
if (filename == NULL)
|
||||
{
|
||||
filename = buf;
|
||||
len = sizeof(buf);
|
||||
}
|
||||
|
||||
/*
|
||||
* See if TMPDIR is defined...
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
GetTempPath(sizeof(tmpdir), tmpdir);
|
||||
#else
|
||||
if ((tmpdir = getenv("TMPDIR")) == NULL)
|
||||
{
|
||||
/*
|
||||
* Put root temp files in restricted temp directory...
|
||||
*/
|
||||
|
||||
if (getuid() == 0)
|
||||
tmpdir = CUPS_REQUESTS "/tmp";
|
||||
else
|
||||
tmpdir = "/var/tmp";
|
||||
}
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Make the temporary name using the specified directory...
|
||||
*/
|
||||
|
||||
do
|
||||
{
|
||||
#ifdef WIN32
|
||||
/*
|
||||
* Get the current time of day...
|
||||
*/
|
||||
|
||||
curtime = GetTickCount();
|
||||
|
||||
/*
|
||||
* Format a string using the hex time values...
|
||||
*/
|
||||
|
||||
snprintf(filename, len - 1, "%s/%08lx", tmpdir, curtime);
|
||||
#else
|
||||
/*
|
||||
* Get the current time of day...
|
||||
*/
|
||||
|
||||
gettimeofday(&curtime, NULL);
|
||||
|
||||
/*
|
||||
* Format a string using the hex time values...
|
||||
*/
|
||||
|
||||
snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
|
||||
curtime.tv_sec, curtime.tv_usec);
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Open the file in "exclusive" mode, making sure that we don't
|
||||
* stomp on an existing file or someone's symlink crack...
|
||||
*/
|
||||
|
||||
#ifdef O_NOFOLLOW
|
||||
fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
|
||||
#else
|
||||
fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
|
||||
#endif /* O_NOFOLLOW */
|
||||
|
||||
if (fd < 0 && errno == EPERM)
|
||||
break; /* Stop immediately if permission denied! */
|
||||
}
|
||||
while (fd < 0);
|
||||
|
||||
/*
|
||||
* Return the file descriptor...
|
||||
*/
|
||||
|
||||
return (fd);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsTempFile()' - Generate a temporary filename.
|
||||
*/
|
||||
|
||||
char * /* O - Filename */
|
||||
cupsTempFile(char *filename, /* I - Pointer to buffer */
|
||||
int len) /* I - Size of buffer */
|
||||
{
|
||||
int fd; /* File descriptor for temp file */
|
||||
static char buf[1024] = ""; /* Buffer if you pass in NULL and 0 */
|
||||
|
||||
|
||||
/*
|
||||
* See if a filename was specified...
|
||||
*/
|
||||
|
||||
if (filename == NULL)
|
||||
{
|
||||
filename = buf;
|
||||
len = sizeof(buf);
|
||||
}
|
||||
|
||||
/*
|
||||
* Create the temporary file...
|
||||
*/
|
||||
|
||||
if ((fd = cupsTempFd(filename, len)) < 0)
|
||||
return (NULL);
|
||||
|
||||
/*
|
||||
* Close the temp file - it'll be reopened later as needed...
|
||||
*/
|
||||
|
||||
close(fd);
|
||||
|
||||
/*
|
||||
* Return the temp filename...
|
||||
*/
|
||||
|
||||
return (filename);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
+34
-19
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* HTTP test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -45,25 +45,20 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
int i; /* Looping var */
|
||||
http_t *http; /* HTTP connection */
|
||||
http_status_t status; /* Status of GET command */
|
||||
char buffer[1024]; /* Input buffer */
|
||||
char buffer[8192]; /* Input buffer */
|
||||
long bytes; /* Number of bytes read */
|
||||
FILE *out; /* Output file */
|
||||
char host[HTTP_MAX_URI],
|
||||
method[HTTP_MAX_URI],
|
||||
username[HTTP_MAX_URI],
|
||||
resource[HTTP_MAX_URI];
|
||||
int port;
|
||||
long length, total;
|
||||
time_t start, current;
|
||||
|
||||
#define HOST "dns.easysw.com"
|
||||
#define PORT 80
|
||||
|
||||
puts("Connecting to " HOST "...");
|
||||
|
||||
httpInitialize();
|
||||
http = httpConnect(HOST, PORT);
|
||||
if (http == NULL)
|
||||
{
|
||||
puts("Unable to connect to " HOST "!");
|
||||
return (1);
|
||||
}
|
||||
|
||||
puts("Connected to " HOST "...");
|
||||
|
||||
http = NULL;
|
||||
out = stdout;
|
||||
|
||||
for (i = 1; i < argc; i ++)
|
||||
@@ -75,22 +70,42 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
continue;
|
||||
}
|
||||
|
||||
printf("Requesting file \"%s\"...\n", argv[i]);
|
||||
httpSeparate(argv[i], method, username, host, &port, resource);
|
||||
|
||||
http = httpConnect(host, port);
|
||||
if (http == NULL)
|
||||
{
|
||||
perror(host);
|
||||
continue;
|
||||
}
|
||||
printf("Requesting file \"%s\"...\n", resource);
|
||||
httpClearFields(http);
|
||||
httpSetField(http, HTTP_FIELD_ACCEPT_LANGUAGE, "en");
|
||||
httpGet(http, argv[i]);
|
||||
status = httpUpdate(http);
|
||||
httpGet(http, resource);
|
||||
while ((status = httpUpdate(http)) == HTTP_CONTINUE);
|
||||
|
||||
if (status == HTTP_OK)
|
||||
puts("GET OK:");
|
||||
else
|
||||
printf("GET failed with status %d...\n", status);
|
||||
|
||||
|
||||
start = time(NULL);
|
||||
length = atoi(httpGetField(http, HTTP_FIELD_CONTENT_LENGTH));
|
||||
total = 0;
|
||||
|
||||
while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
|
||||
{
|
||||
total += bytes;
|
||||
fwrite(buffer, bytes, 1, out);
|
||||
if (out != stdout)
|
||||
printf("Read %ld bytes, %ld total...\n", bytes, ftell(out));
|
||||
{
|
||||
current = time(NULL);
|
||||
if (current == start) current ++;
|
||||
printf("\r%ld/%ld bytes (%ld bytes/sec) ", total, length,
|
||||
total / (current - start));
|
||||
fflush(stdout);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+12
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -171,6 +171,17 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
}
|
||||
}
|
||||
|
||||
printf(" num_profiles = %d\n", ppd->num_profiles);
|
||||
for (j = 0; j < ppd->num_profiles; j ++)
|
||||
printf(" profiles[%d] = %s/%s %.3f %.3f [ %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f %.3f ]\n",
|
||||
j, ppd->profiles[j].resolution, ppd->profiles[j].media_type,
|
||||
ppd->profiles[j].gamma, ppd->profiles[j].density,
|
||||
ppd->profiles[j].matrix[0][0], ppd->profiles[j].matrix[0][1],
|
||||
ppd->profiles[j].matrix[0][2], ppd->profiles[j].matrix[1][0],
|
||||
ppd->profiles[j].matrix[1][1], ppd->profiles[j].matrix[1][2],
|
||||
ppd->profiles[j].matrix[2][0], ppd->profiles[j].matrix[2][1],
|
||||
ppd->profiles[j].matrix[2][2]);
|
||||
|
||||
printf(" num_fonts = %d\n", ppd->num_fonts);
|
||||
for (j = 0; j < ppd->num_fonts; j ++)
|
||||
printf(" fonts[%d] = %s\n", j, ppd->fonts[j]);
|
||||
|
||||
+152
-3
@@ -4,7 +4,7 @@
|
||||
* User, system, and password routines for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -24,13 +24,16 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* cupsEncryption() - Get the default encryption settings...
|
||||
* cupsGetPassword() - Get a password from the user...
|
||||
* cupsServer() - Return the hostname of the default server...
|
||||
* cupsSetEncryption() - Set the encryption preference.
|
||||
* cupsSetPasswordCB() - Set the password callback for CUPS.
|
||||
* cupsSetServer() - Set the default server name...
|
||||
* cupsSetUser() - Set the default user name...
|
||||
* cupsUser() - Return the current users name.
|
||||
* cups_get_password() - Get a password from the user...
|
||||
* cups_get_line() - Get a line from a file...
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -48,17 +51,112 @@
|
||||
*/
|
||||
|
||||
static const char *cups_get_password(const char *prompt);
|
||||
static char *cups_get_line(char *buf, int buflen, FILE *fp);
|
||||
|
||||
|
||||
/*
|
||||
* Local globals...
|
||||
*/
|
||||
|
||||
static http_encryption_t cups_encryption = (http_encryption_t)-1;
|
||||
static char cups_user[65] = "",
|
||||
cups_server[256] = "";
|
||||
static const char *(*cups_pwdcb)(const char *) = cups_get_password;
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsEncryption()' - Get the default encryption settings...
|
||||
*/
|
||||
|
||||
http_encryption_t
|
||||
cupsEncryption(void)
|
||||
{
|
||||
FILE *fp; /* client.conf file */
|
||||
char *encryption; /* CUPS_ENCRYPTION variable */
|
||||
const char *home; /* Home directory of user */
|
||||
static char line[1024]; /* Line from file */
|
||||
|
||||
|
||||
/*
|
||||
* First see if we have already set the encryption stuff...
|
||||
*/
|
||||
|
||||
if (cups_encryption == (http_encryption_t)-1)
|
||||
{
|
||||
/*
|
||||
* Then see if the CUPS_ENCRYPTION environment variable is set...
|
||||
*/
|
||||
|
||||
if ((encryption = getenv("CUPS_ENCRYPTION")) == NULL)
|
||||
{
|
||||
/*
|
||||
* Next check to see if we have a $HOME/.cupsrc or client.conf file...
|
||||
*/
|
||||
|
||||
if ((home = getenv("HOME")) != NULL)
|
||||
{
|
||||
snprintf(line, sizeof(line), "%s/.cupsrc", home);
|
||||
fp = fopen(line, "r");
|
||||
}
|
||||
else
|
||||
fp = NULL;
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
if ((home = getenv("CUPS_SERVERROOT")) != NULL)
|
||||
{
|
||||
snprintf(line, sizeof(line), "%s/client.conf", home);
|
||||
fp = fopen(line, "r");
|
||||
}
|
||||
else
|
||||
fp = fopen(CUPS_SERVERROOT "/client.conf", "r");
|
||||
}
|
||||
|
||||
encryption = "IfRequested";
|
||||
|
||||
if (fp != NULL)
|
||||
{
|
||||
/*
|
||||
* Read the config file and look for a ServerName line...
|
||||
*/
|
||||
|
||||
while (cups_get_line(line, sizeof(line), fp) != NULL)
|
||||
if (strncmp(line, "Encryption ", 11) == 0)
|
||||
{
|
||||
/*
|
||||
* Got it! Drop any trailing newline and find the name...
|
||||
*/
|
||||
|
||||
encryption = line + strlen(line) - 1;
|
||||
if (*encryption == '\n')
|
||||
*encryption = '\0';
|
||||
|
||||
for (encryption = line + 11; isspace(*encryption); encryption ++);
|
||||
break;
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Set the encryption preference...
|
||||
*/
|
||||
|
||||
if (strcasecmp(encryption, "never") == 0)
|
||||
cups_encryption = HTTP_ENCRYPT_NEVER;
|
||||
else if (strcasecmp(encryption, "always") == 0)
|
||||
cups_encryption = HTTP_ENCRYPT_ALWAYS;
|
||||
else if (strcasecmp(encryption, "required") == 0)
|
||||
cups_encryption = HTTP_ENCRYPT_REQUIRED;
|
||||
else
|
||||
cups_encryption = HTTP_ENCRYPT_IF_REQUESTED;
|
||||
}
|
||||
|
||||
return (cups_encryption);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsGetPassword()' - Get a password from the user...
|
||||
*/
|
||||
@@ -70,6 +168,17 @@ cupsGetPassword(const char *prompt) /* I - Prompt string */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsSetEncryption()' - Set the encryption preference.
|
||||
*/
|
||||
|
||||
void
|
||||
cupsSetEncryption(http_encryption_t e) /* I - New encryption preference */
|
||||
{
|
||||
cups_encryption = e;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsServer()' - Return the hostname of the default server...
|
||||
*/
|
||||
@@ -126,7 +235,7 @@ cupsServer(void)
|
||||
* Read the config file and look for a ServerName line...
|
||||
*/
|
||||
|
||||
while (fgets(line, sizeof(line), fp) != NULL)
|
||||
while (cups_get_line(line, sizeof(line), fp) != NULL)
|
||||
if (strncmp(line, "ServerName ", 11) == 0)
|
||||
{
|
||||
/*
|
||||
@@ -267,7 +376,7 @@ cupsUser(void)
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Rewind the password file again and copy the username...
|
||||
* Copy the username...
|
||||
*/
|
||||
|
||||
setpwent();
|
||||
@@ -275,6 +384,12 @@ cupsUser(void)
|
||||
strncpy(cups_user, pwd->pw_name, sizeof(cups_user) - 1);
|
||||
cups_user[sizeof(cups_user) - 1] = '\0';
|
||||
}
|
||||
|
||||
/*
|
||||
* Rewind the password file again...
|
||||
*/
|
||||
|
||||
setpwent();
|
||||
}
|
||||
|
||||
return (cups_user);
|
||||
@@ -293,6 +408,40 @@ cups_get_password(const char *prompt) /* I - Prompt string */
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
|
||||
/*
|
||||
* 'cups_get_line()' - Get a line from a file.
|
||||
*/
|
||||
|
||||
static char * /* O - Line from file */
|
||||
cups_get_line(char *buf, /* I - Line buffer */
|
||||
int buflen, /* I - Size of line buffer */
|
||||
FILE *fp) /* I - File to read from */
|
||||
{
|
||||
char *bufptr; /* Pointer to end of buffer */
|
||||
|
||||
|
||||
/*
|
||||
* Get the line from a file...
|
||||
*/
|
||||
|
||||
if (fgets(buf, buflen, fp) == NULL)
|
||||
return (NULL);
|
||||
|
||||
/*
|
||||
* Remove all trailing whitespace...
|
||||
*/
|
||||
|
||||
bufptr = buf + strlen(buf) - 1;
|
||||
if (bufptr < buf)
|
||||
return (NULL);
|
||||
|
||||
while (isspace(*bufptr) && bufptr >= buf)
|
||||
*bufptr-- = '\0';
|
||||
|
||||
return (buf);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
|
||||
+480
-233
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Printing utilities for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -25,14 +25,15 @@
|
||||
*
|
||||
* cupsCancelJob() - Cancel a print job.
|
||||
* cupsDoFileRequest() - Do an IPP request...
|
||||
* cupsFreeJobs() - Free memory used by job data.
|
||||
* cupsGetClasses() - Get a list of printer classes.
|
||||
* cupsGetDefault() - Get the default printer or class.
|
||||
* cupsGetJobs() - Get the jobs from the server.
|
||||
* cupsGetPPD() - Get the PPD file for a printer.
|
||||
* cupsGetPrinters() - Get a list of printers.
|
||||
* cupsLastError() - Return the last IPP error that occurred.
|
||||
* cupsPrintFile() - Print a file to a printer or class.
|
||||
* cupsPrintFiles() - Print one or more files to a printer or class.
|
||||
* cupsTempFile() - Generate a temporary filename.
|
||||
* cups_connect() - Connect to the specified host...
|
||||
* cups_local_auth() - Get the local authorization certificate if
|
||||
* available/applicable...
|
||||
@@ -176,7 +177,7 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
char realm[HTTP_MAX_VALUE], /* realm="xyz" string */
|
||||
nonce[HTTP_MAX_VALUE], /* nonce="xyz" string */
|
||||
plain[255], /* Plaintext username:password */
|
||||
encode[255]; /* Encoded username:password */
|
||||
encode[512]; /* Encoded username:password */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
|
||||
|
||||
@@ -189,7 +190,7 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
DEBUG_printf(("cupsDoFileRequest(%p, %08s, \'%s\', \'%s\')\n",
|
||||
DEBUG_printf(("cupsDoFileRequest(%p, %08x, \'%s\', \'%s\')\n",
|
||||
http, request, resource, filename ? filename : "(null)"));
|
||||
|
||||
/*
|
||||
@@ -255,7 +256,15 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
DEBUG_puts("cupsDoFileRequest: post...");
|
||||
|
||||
if (httpPost(http, resource))
|
||||
continue;
|
||||
{
|
||||
if (httpReconnect(http))
|
||||
{
|
||||
status = HTTP_ERROR;
|
||||
break;
|
||||
}
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Send the IPP data and wait for the response...
|
||||
@@ -362,6 +371,22 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
else
|
||||
break;
|
||||
}
|
||||
#ifdef HAVE_LIBSSL
|
||||
else if (status == HTTP_UPGRADE_REQUIRED)
|
||||
{
|
||||
/*
|
||||
* Flush any error message...
|
||||
*/
|
||||
|
||||
httpFlush(http);
|
||||
|
||||
/*
|
||||
* Try again, this time with encryption enabled...
|
||||
*/
|
||||
|
||||
continue;
|
||||
}
|
||||
#endif /* HAVE_LIBSSL */
|
||||
else if (status != HTTP_OK)
|
||||
{
|
||||
DEBUG_printf(("cupsDoFileRequest: error %d...\n", status));
|
||||
@@ -393,12 +418,6 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
response = NULL;
|
||||
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
|
||||
/*
|
||||
* Flush any remaining data...
|
||||
*/
|
||||
|
||||
httpFlush(http);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -411,6 +430,12 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
if (filename != NULL)
|
||||
fclose(file);
|
||||
|
||||
/*
|
||||
* Flush any remaining data...
|
||||
*/
|
||||
|
||||
httpFlush(http);
|
||||
|
||||
/*
|
||||
* Delete the original request and return the response...
|
||||
*/
|
||||
@@ -430,6 +455,32 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsFreeJobs()' - Free memory used by job data.
|
||||
*/
|
||||
|
||||
void
|
||||
cupsFreeJobs(int num_jobs,/* I - Number of jobs */
|
||||
cups_job_t *jobs) /* I - Jobs */
|
||||
{
|
||||
int i; /* Looping var */
|
||||
|
||||
|
||||
if (num_jobs <= 0 || jobs == NULL)
|
||||
return;
|
||||
|
||||
for (i = 0; i < num_jobs; i ++)
|
||||
{
|
||||
free(jobs[i].dest);
|
||||
free(jobs[i].user);
|
||||
free(jobs[i].format);
|
||||
free(jobs[i].title);
|
||||
}
|
||||
|
||||
free(jobs);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsGetClasses()' - Get a list of printer classes.
|
||||
*/
|
||||
@@ -467,6 +518,7 @@ cupsGetClasses(char ***classes) /* O - Classes */
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
@@ -482,6 +534,9 @@ cupsGetClasses(char ***classes) /* O - Classes */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", NULL, "printer-name");
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
@@ -541,9 +596,6 @@ cupsGetClasses(char ***classes) /* O - Classes */
|
||||
const char * /* O - Default printer or NULL */
|
||||
cupsGetDefault(void)
|
||||
{
|
||||
FILE *fp; /* cupsd.conf file */
|
||||
char *printer; /* Pointer to server name */
|
||||
char line[1024]; /* Line from file */
|
||||
ipp_t *request, /* IPP Request */
|
||||
*response; /* IPP Response */
|
||||
ipp_attribute_t *attr; /* Current attribute */
|
||||
@@ -564,48 +616,6 @@ cupsGetDefault(void)
|
||||
else if ((var = getenv("PRINTER")) != NULL && strcmp(var, "lp") != 0)
|
||||
return (var);
|
||||
|
||||
/*
|
||||
* Next check to see if we have a client.conf file...
|
||||
*/
|
||||
|
||||
if ((var = getenv("CUPS_SERVERROOT")) != NULL)
|
||||
snprintf(line, sizeof(line), "%s/client.conf", var);
|
||||
else
|
||||
strcpy(line, CUPS_SERVERROOT "/client.conf");
|
||||
|
||||
if ((fp = fopen(line, "r")) != NULL)
|
||||
{
|
||||
/*
|
||||
* Read the client.conf file and look for a DefaultPrinter line...
|
||||
*/
|
||||
|
||||
while (fgets(line, sizeof(line), fp) != NULL)
|
||||
if (strncmp(line, "DefaultPrinter ", 15) == 0)
|
||||
{
|
||||
/*
|
||||
* Got it! Drop any trailing newline and find the name...
|
||||
*/
|
||||
|
||||
printer = line + strlen(line) - 1;
|
||||
if (*printer == '\n')
|
||||
*printer = '\0';
|
||||
|
||||
for (printer = line + 15; isspace(*printer); printer ++);
|
||||
|
||||
if (*printer)
|
||||
{
|
||||
strncpy(def_printer, printer, sizeof(def_printer) - 1);
|
||||
def_printer[sizeof(def_printer) - 1] = '\0';
|
||||
|
||||
fclose(fp);
|
||||
|
||||
return (def_printer);
|
||||
}
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to connect to the server...
|
||||
*/
|
||||
@@ -662,6 +672,260 @@ cupsGetDefault(void)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsGetJobs()' - Get the jobs from the server.
|
||||
*/
|
||||
|
||||
int /* O - Number of jobs */
|
||||
cupsGetJobs(cups_job_t **jobs, /* O - Job data */
|
||||
const char *mydest, /* I - Only show jobs for dest? */
|
||||
int myjobs, /* I - Only show my jobs? */
|
||||
int completed) /* I - Only show completed jobs? */
|
||||
{
|
||||
int n; /* Number of jobs */
|
||||
ipp_t *request, /* IPP Request */
|
||||
*response; /* IPP Response */
|
||||
ipp_attribute_t *attr; /* Current attribute */
|
||||
cups_lang_t *language; /* Default language */
|
||||
cups_job_t *temp; /* Temporary pointer */
|
||||
int id, /* job-id */
|
||||
priority, /* job-priority */
|
||||
size; /* job-k-octets */
|
||||
ipp_jstate_t state; /* job-state */
|
||||
time_t completed_time, /* time-at-completed */
|
||||
creation_time, /* time-at-creation */
|
||||
processing_time; /* time-at-processing */
|
||||
const char *dest, /* job-printer-uri */
|
||||
*format, /* document-format */
|
||||
*title, /* job-name */
|
||||
*user; /* job-originating-user-name */
|
||||
char uri[HTTP_MAX_URI]; /* URI for jobs */
|
||||
static const char *attrs[] = /* Requested attributes */
|
||||
{
|
||||
"job-id",
|
||||
"job-priority",
|
||||
"job-k-octets",
|
||||
"job-state",
|
||||
"time-at-completed",
|
||||
"time-at-creation",
|
||||
"time-at-processing",
|
||||
"job-printer-uri",
|
||||
"document-format",
|
||||
"job-name",
|
||||
"job-originating-user-name"
|
||||
};
|
||||
|
||||
|
||||
if (jobs == NULL)
|
||||
{
|
||||
last_error = IPP_INTERNAL_ERROR;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to connect to the server...
|
||||
*/
|
||||
|
||||
if (!cups_connect("default", NULL, NULL))
|
||||
{
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Build an IPP_GET_JOBS request, which requires the following
|
||||
* attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
* requesting-user-name
|
||||
* which-jobs
|
||||
* my-jobs
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_JOBS;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
language = cupsLangDefault();
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
if (mydest)
|
||||
snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", mydest);
|
||||
else
|
||||
strcpy(uri, "ipp://localhost/jobs");
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, uri);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
|
||||
"requesting-user-name", NULL, cupsUser());
|
||||
|
||||
if (myjobs)
|
||||
ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
|
||||
|
||||
if (completed)
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"which-jobs", NULL, "completed");
|
||||
|
||||
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", sizeof(attrs) / sizeof(attrs[0]),
|
||||
NULL, attrs);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
n = 0;
|
||||
*jobs = NULL;
|
||||
|
||||
if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
|
||||
{
|
||||
last_error = response->request.status.status_code;
|
||||
|
||||
for (attr = response->attrs; attr != NULL; attr = attr->next)
|
||||
{
|
||||
/*
|
||||
* Skip leading attributes until we hit a job...
|
||||
*/
|
||||
|
||||
while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
|
||||
attr = attr->next;
|
||||
|
||||
if (attr == NULL)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Pull the needed attributes from this job...
|
||||
*/
|
||||
|
||||
id = 0;
|
||||
size = 0;
|
||||
priority = 50;
|
||||
state = IPP_JOB_PENDING;
|
||||
user = NULL;
|
||||
dest = NULL;
|
||||
format = NULL;
|
||||
title = NULL;
|
||||
creation_time = 0;
|
||||
completed_time = 0;
|
||||
processing_time = 0;
|
||||
|
||||
while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
|
||||
{
|
||||
if (strcmp(attr->name, "job-id") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
id = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "job-state") == 0 &&
|
||||
attr->value_tag == IPP_TAG_ENUM)
|
||||
state = (ipp_jstate_t)attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "job-priority") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
priority = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "job-k-octets") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
size = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "time-at-completed") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
completed_time = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "time-at-creation") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
creation_time = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "time-at-processing") == 0 &&
|
||||
attr->value_tag == IPP_TAG_INTEGER)
|
||||
processing_time = attr->values[0].integer;
|
||||
else if (strcmp(attr->name, "job-printer-uri") == 0 &&
|
||||
attr->value_tag == IPP_TAG_URI)
|
||||
{
|
||||
if ((dest = strrchr(attr->values[0].string.text, '/')) != NULL)
|
||||
dest ++;
|
||||
}
|
||||
else if (strcmp(attr->name, "job-originating-user-name") == 0 &&
|
||||
attr->value_tag == IPP_TAG_NAME)
|
||||
user = attr->values[0].string.text;
|
||||
else if (strcmp(attr->name, "document-format") == 0 &&
|
||||
attr->value_tag == IPP_TAG_MIMETYPE)
|
||||
format = attr->values[0].string.text;
|
||||
else if (strcmp(attr->name, "job-name") == 0 &&
|
||||
attr->value_tag == IPP_TAG_TEXT)
|
||||
title = attr->values[0].string.text;
|
||||
|
||||
attr = attr->next;
|
||||
}
|
||||
|
||||
/*
|
||||
* See if we have everything needed...
|
||||
*/
|
||||
|
||||
if (dest == NULL || format == NULL || title == NULL || user == NULL ||
|
||||
id == 0)
|
||||
{
|
||||
if (attr == NULL)
|
||||
break;
|
||||
else
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Allocate memory for the job...
|
||||
*/
|
||||
|
||||
if (n == 0)
|
||||
temp = malloc(sizeof(cups_job_t));
|
||||
else
|
||||
temp = realloc(*jobs, sizeof(cups_job_t) * (n + 1));
|
||||
|
||||
if (temp == NULL)
|
||||
{
|
||||
/*
|
||||
* Ran out of memory!
|
||||
*/
|
||||
|
||||
cupsFreeJobs(n, *jobs);
|
||||
*jobs = NULL;
|
||||
|
||||
ippDelete(response);
|
||||
return (0);
|
||||
}
|
||||
|
||||
*jobs = temp;
|
||||
temp += n;
|
||||
n ++;
|
||||
|
||||
/*
|
||||
* Copy the data over...
|
||||
*/
|
||||
|
||||
temp->dest = strdup(dest);
|
||||
temp->user = strdup(user);
|
||||
temp->format = strdup(format);
|
||||
temp->title = strdup(title);
|
||||
temp->id = id;
|
||||
temp->priority = priority;
|
||||
temp->state = state;
|
||||
temp->size = size;
|
||||
temp->completed_time = completed_time;
|
||||
temp->creation_time = creation_time;
|
||||
temp->processing_time = processing_time;
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
else
|
||||
last_error = IPP_BAD_REQUEST;
|
||||
|
||||
return (n);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsGetPPD()' - Get the PPD file for a printer.
|
||||
*/
|
||||
@@ -669,11 +933,12 @@ cupsGetDefault(void)
|
||||
const char * /* O - Filename for PPD file */
|
||||
cupsGetPPD(const char *name) /* I - Printer name */
|
||||
{
|
||||
int i; /* Looping var */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *attr; /* Current attribute */
|
||||
cups_lang_t *language; /* Local language */
|
||||
FILE *fp; /* PPD file */
|
||||
int fd; /* PPD file */
|
||||
int bytes; /* Number of bytes read */
|
||||
char buffer[8192]; /* Buffer for file */
|
||||
char printer[HTTP_MAX_URI], /* Printer name */
|
||||
@@ -686,10 +951,16 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
char realm[HTTP_MAX_VALUE], /* realm="xyz" string */
|
||||
nonce[HTTP_MAX_VALUE], /* nonce="xyz" string */
|
||||
plain[255], /* Plaintext username:password */
|
||||
encode[255]; /* Encoded username:password */
|
||||
encode[512]; /* Encoded username:password */
|
||||
http_status_t status; /* HTTP status from server */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
static char filename[HTTP_MAX_URI]; /* Local filename */
|
||||
static const char *requested_attrs[] =/* Requested attributes */
|
||||
{
|
||||
"printer-uri-supported",
|
||||
"printer-type",
|
||||
"member-uris"
|
||||
};
|
||||
|
||||
|
||||
if (name == NULL)
|
||||
@@ -708,81 +979,112 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (strchr(name, '@') == NULL)
|
||||
/*
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
|
||||
* attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
language = cupsLangDefault();
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "ipp://localhost/printers/%s", name);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, buffer);
|
||||
|
||||
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
|
||||
"requested-attributes",
|
||||
sizeof(requested_attrs) / sizeof(requested_attrs[0]),
|
||||
NULL, requested_attrs);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
|
||||
{
|
||||
/*
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
|
||||
* attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
*/
|
||||
last_error = response->request.status.status_code;
|
||||
printer[0] = '\0';
|
||||
hostname[0] = '\0';
|
||||
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
language = cupsLangDefault();
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
snprintf(buffer, sizeof(buffer), "ipp://localhost/printers/%s", name);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, buffer);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
if ((response = cupsDoRequest(cups_server, request, "/")) != NULL)
|
||||
if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
last_error = response->request.status.status_code;
|
||||
/*
|
||||
* Get the first actual server and printer name in the class...
|
||||
*/
|
||||
|
||||
if ((attr = ippFindAttribute(response, "printer-uri-supported",
|
||||
IPP_TAG_URI)) != NULL)
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
/*
|
||||
* Get the actual server and printer names...
|
||||
*/
|
||||
|
||||
httpSeparate(attr->values[0].string.text, method, username, hostname,
|
||||
httpSeparate(attr->values[0].string.text, method, username, hostname,
|
||||
&port, resource);
|
||||
strcpy(printer, strrchr(resource, '/') + 1);
|
||||
if (strncmp(resource, "/printers/", 10) == 0)
|
||||
{
|
||||
/*
|
||||
* Found a printer!
|
||||
*/
|
||||
|
||||
/*
|
||||
* Remap local hostname to localhost...
|
||||
*/
|
||||
|
||||
gethostname(buffer, sizeof(buffer));
|
||||
|
||||
if (strcasecmp(buffer, hostname) == 0)
|
||||
strcpy(hostname, "localhost");
|
||||
strncpy(printer, resource + 10, sizeof(printer) - 1);
|
||||
printer[sizeof(printer) - 1] = '\0';
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ((attr = ippFindAttribute(response, "printer-uri-supported",
|
||||
IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Get the actual server and printer names...
|
||||
*/
|
||||
|
||||
ippDelete(response);
|
||||
httpSeparate(attr->values[0].string.text, method, username, hostname,
|
||||
&port, resource);
|
||||
strncpy(printer, strrchr(resource, '/') + 1, sizeof(printer) - 1);
|
||||
printer[sizeof(printer) - 1] = '\0';
|
||||
}
|
||||
|
||||
cupsLangFree(language);
|
||||
ippDelete(response);
|
||||
|
||||
/*
|
||||
* Reconnect to the correct server as needed...
|
||||
* Remap local hostname to localhost...
|
||||
*/
|
||||
|
||||
if (strcasecmp(cups_server->hostname, hostname) != 0)
|
||||
{
|
||||
httpClose(cups_server);
|
||||
gethostname(buffer, sizeof(buffer));
|
||||
|
||||
if ((cups_server = httpConnect(hostname, ippPort())) == NULL)
|
||||
{
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
return (NULL);
|
||||
}
|
||||
if (strcasecmp(buffer, hostname) == 0)
|
||||
strcpy(hostname, "localhost");
|
||||
}
|
||||
|
||||
cupsLangFree(language);
|
||||
|
||||
if (!printer[0])
|
||||
return (NULL);
|
||||
|
||||
/*
|
||||
* Reconnect to the correct server as needed...
|
||||
*/
|
||||
|
||||
if (strcasecmp(cups_server->hostname, hostname) != 0)
|
||||
{
|
||||
httpClose(cups_server);
|
||||
|
||||
if ((cups_server = httpConnect(hostname, ippPort())) == NULL)
|
||||
{
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
return (NULL);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -790,7 +1092,17 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
* Get a temp file...
|
||||
*/
|
||||
|
||||
cupsTempFile(filename, sizeof(filename));
|
||||
if ((fd = cupsTempFd(filename, sizeof(filename))) < 0)
|
||||
{
|
||||
/*
|
||||
* Can't open file; close the server connection and return NULL...
|
||||
*/
|
||||
|
||||
httpFlush(cups_server);
|
||||
httpClose(cups_server);
|
||||
cups_server = NULL;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* And send a request to the HTTP server...
|
||||
@@ -806,8 +1118,16 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
|
||||
if (httpGet(cups_server, resource))
|
||||
{
|
||||
status = HTTP_UNAUTHORIZED;
|
||||
continue;
|
||||
if (httpReconnect(cups_server))
|
||||
{
|
||||
status = HTTP_ERROR;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
status = HTTP_UNAUTHORIZED;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
|
||||
@@ -876,29 +1196,29 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
break;
|
||||
}
|
||||
}
|
||||
while (status == HTTP_UNAUTHORIZED);
|
||||
while (status == HTTP_UNAUTHORIZED || status == HTTP_UPGRADE_REQUIRED);
|
||||
|
||||
/*
|
||||
* OK, we need to copy the file; open the file and copy it...
|
||||
* See if we actually got the file or an error...
|
||||
*/
|
||||
|
||||
unlink(filename);
|
||||
if ((fp = fopen(filename, "w")) == NULL)
|
||||
if (status != HTTP_OK)
|
||||
{
|
||||
/*
|
||||
* Can't open file; close the server connection and return NULL...
|
||||
*/
|
||||
|
||||
unlink(filename);
|
||||
httpFlush(cups_server);
|
||||
httpClose(cups_server);
|
||||
cups_server = NULL;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
fwrite(buffer, bytes, 1, fp);
|
||||
/*
|
||||
* OK, we need to copy the file...
|
||||
*/
|
||||
|
||||
fclose(fp);
|
||||
while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
write(fd, buffer, bytes);
|
||||
|
||||
close(fd);
|
||||
|
||||
return (filename);
|
||||
}
|
||||
@@ -941,6 +1261,7 @@ cupsGetPrinters(char ***printers) /* O - Printers */
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
@@ -956,6 +1277,9 @@ cupsGetPrinters(char ***printers) /* O - Printers */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", NULL, "printer-name");
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
@@ -1031,7 +1355,7 @@ cupsPrintFile(const char *name, /* I - Printer or class name */
|
||||
cups_option_t *options) /* I - Options */
|
||||
{
|
||||
DEBUG_printf(("cupsPrintFile(\'%s\', \'%s\', %d, %p)\n",
|
||||
printer, filename, num_options, options));
|
||||
name, filename, num_options, options));
|
||||
|
||||
return (cupsPrintFiles(name, 1, &filename, title, num_options, options));
|
||||
}
|
||||
@@ -1062,7 +1386,7 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
|
||||
|
||||
DEBUG_printf(("cupsPrintFiles(\'%s\', %d, %p, %d, %p)\n",
|
||||
printer, num_files, files, num_options, options));
|
||||
name, num_files, files, num_options, options));
|
||||
|
||||
if (name == NULL || num_files < 1 || files == NULL)
|
||||
return (0);
|
||||
@@ -1217,96 +1541,6 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsTempFile()' - Generate a temporary filename.
|
||||
*/
|
||||
|
||||
char * /* O - Filename */
|
||||
cupsTempFile(char *filename, /* I - Pointer to buffer */
|
||||
int len) /* I - Size of buffer */
|
||||
{
|
||||
int fd; /* File descriptor for temp file */
|
||||
char *tmpdir; /* TMPDIR environment var */
|
||||
struct timeval curtime; /* Current time */
|
||||
static char buf[1024] = ""; /* Buffer if you pass in NULL and 0 */
|
||||
|
||||
|
||||
/*
|
||||
* See if a filename was specified...
|
||||
*/
|
||||
|
||||
if (filename == NULL)
|
||||
{
|
||||
filename = buf;
|
||||
len = sizeof(buf);
|
||||
}
|
||||
|
||||
/*
|
||||
* See if TMPDIR is defined...
|
||||
*/
|
||||
|
||||
if ((tmpdir = getenv("TMPDIR")) == NULL)
|
||||
{
|
||||
#ifdef WIN32
|
||||
tmpdir = "C:/WINDOWS/TEMP";
|
||||
#else
|
||||
/*
|
||||
* Put root temp files in restricted temp directory...
|
||||
*/
|
||||
|
||||
if (getuid() == 0)
|
||||
tmpdir = CUPS_REQUESTS "/tmp";
|
||||
else
|
||||
tmpdir = "/var/tmp";
|
||||
#endif /* WIN32 */
|
||||
}
|
||||
|
||||
/*
|
||||
* Make the temporary name using the specified directory...
|
||||
*/
|
||||
|
||||
do
|
||||
{
|
||||
/*
|
||||
* Get the current time of day...
|
||||
*/
|
||||
|
||||
gettimeofday(&curtime, NULL);
|
||||
|
||||
/*
|
||||
* Format a string using the hex time values...
|
||||
*/
|
||||
|
||||
snprintf(filename, len, "%s/%p%05x", tmpdir,
|
||||
curtime.tv_sec, curtime.tv_usec);
|
||||
|
||||
/*
|
||||
* Open the file in "exclusive" mode, making sure that we don't
|
||||
* stomp on an existing file or someone's symlink crack...
|
||||
*/
|
||||
|
||||
#ifdef O_NOFOLLOW
|
||||
fd = open(filename, O_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
|
||||
#else
|
||||
fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0600);
|
||||
#endif /* O_NOFOLLOW */
|
||||
}
|
||||
while (fd < 0);
|
||||
|
||||
/*
|
||||
* Close the temp file - it'll be reopened later as needed...
|
||||
*/
|
||||
|
||||
close(fd);
|
||||
|
||||
/*
|
||||
* Return the temp filename...
|
||||
*/
|
||||
|
||||
return (filename);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cups_connect()' - Connect to the specified host...
|
||||
*/
|
||||
@@ -1316,12 +1550,13 @@ cups_connect(const char *name, /* I - Destination (printer[@host]) */
|
||||
char *printer, /* O - Printer name [HTTP_MAX_URI] */
|
||||
char *hostname) /* O - Hostname [HTTP_MAX_URI] */
|
||||
{
|
||||
char hostbuf[HTTP_MAX_URI];
|
||||
/* Name of host */
|
||||
char hostbuf[HTTP_MAX_URI]; /* Name of host */
|
||||
static char printerbuf[HTTP_MAX_URI];
|
||||
/* Name of printer or class */
|
||||
/* Name of printer or class */
|
||||
|
||||
|
||||
DEBUG_printf(("cups_connect(\"%s\", %p, %p)\n", name, printer, hostname));
|
||||
|
||||
if (name == NULL)
|
||||
{
|
||||
last_error = IPP_BAD_REQUEST;
|
||||
@@ -1358,13 +1593,18 @@ cups_connect(const char *name, /* I - Destination (printer[@host]) */
|
||||
httpClose(cups_server);
|
||||
}
|
||||
|
||||
DEBUG_printf(("connecting to %s on port %d...\n", hostname, ippPort()));
|
||||
|
||||
if ((cups_server = httpConnect(hostname, ippPort())) == NULL)
|
||||
{
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
return (NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
httpEncryption(cups_server, cupsEncryption());
|
||||
return (printer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1383,10 +1623,11 @@ cups_local_auth(http_t *http) /* I - Connection */
|
||||
|
||||
return (0);
|
||||
#else
|
||||
int pid; /* Current process ID */
|
||||
FILE *fp; /* Certificate file */
|
||||
char filename[1024], /* Certificate filename */
|
||||
certificate[33]; /* Certificate string */
|
||||
int pid; /* Current process ID */
|
||||
FILE *fp; /* Certificate file */
|
||||
char filename[1024], /* Certificate filename */
|
||||
certificate[33];/* Certificate string */
|
||||
const char *root; /* Server root directory */
|
||||
|
||||
|
||||
/*
|
||||
@@ -1402,10 +1643,16 @@ cups_local_auth(http_t *http) /* I - Connection */
|
||||
* try the root certificate...
|
||||
*/
|
||||
|
||||
if ((root = getenv("CUPS_SERVERROOT")) == NULL)
|
||||
root = CUPS_SERVERROOT;
|
||||
|
||||
pid = getpid();
|
||||
sprintf(filename, CUPS_SERVERROOT "/certs/%d", pid);
|
||||
snprintf(filename, sizeof(filename), "%s/certs/%d", root, pid);
|
||||
if ((fp = fopen(filename, "r")) == NULL && pid > 0)
|
||||
fp = fopen(CUPS_SERVERROOT "/certs/0", "r");
|
||||
{
|
||||
snprintf(filename, sizeof(filename), "%s/certs/0", root);
|
||||
fp = fopen(filename, "r");
|
||||
}
|
||||
|
||||
if (fp == NULL)
|
||||
return (0);
|
||||
@@ -1421,7 +1668,7 @@ cups_local_auth(http_t *http) /* I - Connection */
|
||||
* Set the authorization string and return...
|
||||
*/
|
||||
|
||||
sprintf(authstring, "Local %s", certificate);
|
||||
snprintf(authstring, sizeof(authstring), "Local %s", certificate);
|
||||
|
||||
return (1);
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
%%BeginResource: procset hpgltops 1.1 0
|
||||
%
|
||||
% "$Id: HPGLprolog 932 2000-02-26 20:01:37Z mike $"
|
||||
% "$Id: HPGLprolog 1605 2001-03-02 22:34:21Z andy $"
|
||||
%
|
||||
% HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
|
||||
%
|
||||
@@ -9,7 +9,7 @@
|
||||
% should be called 'NP' (newpath), but GhostScript uses the 'NP' name
|
||||
% for 'noaccess put' in some of its font files...
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Datafile makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -262,6 +272,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: classified 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: classified 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -262,6 +272,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: confidential 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: confidential 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -262,6 +272,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: secret 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: secret 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -246,6 +256,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: standard 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: standard 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+18
-8
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript test page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/OCTANT { % Draw a color wheel OCTANT...
|
||||
% (name) radius r g b OCTANT -
|
||||
@@ -477,7 +487,7 @@ gsave
|
||||
pageHeight 2 mul sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
smallFont setfont % Font
|
||||
(Copyright 1993-2000 Easy Software Products, All Rights Reserved.) CENTER
|
||||
(Copyright 1993-2001 Easy Software Products, All Rights Reserved.) CENTER
|
||||
pageHeight sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
(CUPS, and the CUPS logo are the trademark property of) CENTER
|
||||
@@ -507,6 +517,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: testprint.ps 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: testprint.ps 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -262,6 +272,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: topsecret 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: topsecret 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+17
-7
@@ -14,13 +14,23 @@
|
||||
%
|
||||
% PostScript banner page for the Common UNIX Printing System ("CUPS").
|
||||
%
|
||||
% Copyright 1993-2000 Easy Software Products
|
||||
% Copyright 1993-2001 Easy Software Products
|
||||
%
|
||||
% These coded instructions, statements, and computer programs contain
|
||||
% unpublished proprietary information of Easy Software Products, and
|
||||
% are protected by Federal copyright law. They may not be disclosed
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
% These coded instructions, statements, and computer programs are the
|
||||
% property of Easy Software Products and are protected by Federal
|
||||
% copyright law. Distribution and use rights are outlined in the file
|
||||
% "LICENSE.txt" which should have been included with this file. If this
|
||||
% file is missing or damaged please contact Easy Software Products
|
||||
% at:
|
||||
%
|
||||
% Attn: CUPS Licensing Information
|
||||
% Easy Software Products
|
||||
% 44141 Airport View Drive, Suite 204
|
||||
% Hollywood, Maryland 20636-3111 USA
|
||||
%
|
||||
% Voice: (301) 373-9603
|
||||
% EMail: cups-info@cups.org
|
||||
% WWW: http://www.cups.org
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
% (name) CENTER -
|
||||
@@ -262,6 +272,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: unclassified 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: unclassified 1646 2001-03-25 12:42:57Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Documentation makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -17,7 +17,7 @@
|
||||
# 44141 Airport View Drive, Suite 204
|
||||
# Hollywood, Maryland 20636-3111 USA
|
||||
#
|
||||
# Voice: (301) 373-9603
|
||||
# Voice: (301) 373-9600
|
||||
# EMail: cups-info@cups.org
|
||||
# WWW: http://www.cups.org
|
||||
#
|
||||
|
||||
+9
-9
@@ -2,11 +2,11 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> CUPS Configuration Management Plan</TITLE>
|
||||
<META NAME="AUTHOR" CONTENT="Easy Software Products">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
|
||||
<STYLE>
|
||||
<META NAME="author" CONTENT="Easy Software Products">
|
||||
<META NAME="copyright" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="docnumber" CONTENT="CUPS-CMP-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
|
||||
<STYLE TYPE="text/css"><!--
|
||||
BODY { font-family: serif; font-size: 11.0pt }
|
||||
H1 { font-family: sans-serif; font-size: 20.0pt }
|
||||
H2 { font-family: sans-serif; font-size: 17.0pt }
|
||||
@@ -17,14 +17,14 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
|
||||
SUB { font-size: 8.0pt }
|
||||
SUP { font-size: 8.0pt }
|
||||
PRE { font-size: 9.0pt }
|
||||
</STYLE>
|
||||
--></STYLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
|
||||
<H1> CUPS Configuration Management Plan</H1></A><BR>
|
||||
CUPS-CMP-1.1<BR>
|
||||
Easy Software Products<BR>
|
||||
Copyright 1997-2000, All Rights Reserved<BR>
|
||||
Copyright 1997-2001, All Rights Reserved<BR>
|
||||
</CENTER>
|
||||
<HR>
|
||||
<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
|
||||
@@ -376,7 +376,7 @@ name and revision information is provided by the CVS "$Id$" tag:
|
||||
*
|
||||
* Description of file contents.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights
|
||||
* reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are
|
||||
@@ -391,7 +391,7 @@ name and revision information is provided by the CVS "$Id$" tag:
|
||||
* 44141 Airport View Drive, Suite 204
|
||||
* Hollywood, Maryland 20636-3111 USA
|
||||
*
|
||||
* Voice: (301) 373-9603
|
||||
* Voice: (301) 373-9600
|
||||
* EMail: cups-info@cups.org
|
||||
* WWW: http://www.cups.org
|
||||
*
|
||||
|
||||
Arquivo binário não exibido.
+3
-3
@@ -1,7 +1,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-CMP-1.1">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="Author" CONTENT="Easy Software Products">
|
||||
<TITLE>CUPS Configuration Management Plan</TITLE>
|
||||
</HEAD>
|
||||
@@ -221,7 +221,7 @@ information is provided by the CVS "$Id$" tag:
|
||||
*
|
||||
* Description of file contents.
|
||||
*
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights
|
||||
* reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are
|
||||
@@ -236,7 +236,7 @@ information is provided by the CVS "$Id$" tag:
|
||||
* 44141 Airport View Drive, Suite 204
|
||||
* Hollywood, Maryland 20636-3111 USA
|
||||
*
|
||||
* Voice: (301) 373-9603
|
||||
* Voice: (301) 373-9600
|
||||
* EMail: cups-info@cups.org
|
||||
* WWW: http://www.cups.org
|
||||
*
|
||||
|
||||
@@ -74,7 +74,7 @@ The following documentation for CUPS is available on this server:
|
||||
|
||||
<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
|
||||
trademark property of <A HREF="http://www.easysw.com">Easy Software
|
||||
Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,
|
||||
Products</A>. CUPS is copyright 1997-2001 by Easy Software Products,
|
||||
All Rights Reserved.
|
||||
|
||||
</BODY>
|
||||
|
||||
+7
-7
@@ -2,11 +2,11 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> CUPS Interface Design Description</TITLE>
|
||||
<META NAME="AUTHOR" CONTENT="Easy Software Products">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
|
||||
<STYLE>
|
||||
<META NAME="author" CONTENT="Easy Software Products">
|
||||
<META NAME="copyright" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="docnumber" CONTENT="CUPS-IDD-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
|
||||
<STYLE TYPE="text/css"><!--
|
||||
BODY { font-family: serif; font-size: 11.0pt }
|
||||
H1 { font-family: sans-serif; font-size: 20.0pt }
|
||||
H2 { font-family: sans-serif; font-size: 17.0pt }
|
||||
@@ -17,14 +17,14 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
|
||||
SUB { font-size: 8.0pt }
|
||||
SUP { font-size: 8.0pt }
|
||||
PRE { font-size: 9.0pt }
|
||||
</STYLE>
|
||||
--></STYLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
|
||||
<H1> CUPS Interface Design Description</H1></A><BR>
|
||||
CUPS-IDD-1.1<BR>
|
||||
Easy Software Products<BR>
|
||||
Copyright 1997-2000, All Rights Reserved<BR>
|
||||
Copyright 1997-2001, All Rights Reserved<BR>
|
||||
</CENTER>
|
||||
<HR>
|
||||
<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
|
||||
|
||||
Arquivo binário não exibido.
+1
-1
@@ -1,6 +1,6 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-IDD-1.1">
|
||||
<META NAME="Author" CONTENT="Easy Software Products">
|
||||
<TITLE>CUPS Interface Design Description</TITLE>
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@
|
||||
|
||||
<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
|
||||
trademark property of <A HREF="http://www.easysw.com">Easy Software
|
||||
Products</A>. CUPS is copyright 1997-2000 by Easy Software Products,
|
||||
Products</A>. CUPS is copyright 1997-2001 by Easy Software Products,
|
||||
All Rights Reserved.
|
||||
|
||||
</BODY>
|
||||
|
||||
+93
-71
@@ -2,11 +2,11 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> CUPS Implementation of IPP</TITLE>
|
||||
<META NAME="AUTHOR" CONTENT="Easy Software Products">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-IPP-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
|
||||
<STYLE>
|
||||
<META NAME="author" CONTENT="Easy Software Products">
|
||||
<META NAME="copyright" CONTENT="Copyright 1997-2001 All Rights Reserved">
|
||||
<META NAME="docnumber" CONTENT="CUPS-IPP-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
|
||||
<STYLE TYPE="text/css"><!--
|
||||
BODY { font-family: serif; font-size: 11.0pt }
|
||||
H1 { font-family: sans-serif; font-size: 20.0pt }
|
||||
H2 { font-family: sans-serif; font-size: 17.0pt }
|
||||
@@ -17,14 +17,14 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
|
||||
SUB { font-size: 8.0pt }
|
||||
SUP { font-size: 8.0pt }
|
||||
PRE { font-size: 9.0pt }
|
||||
</STYLE>
|
||||
--></STYLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
|
||||
<H1> CUPS Implementation of IPP</H1></A><BR>
|
||||
CUPS-IPP-1.1<BR>
|
||||
Easy Software Products<BR>
|
||||
Copyright 1997-2000, All Rights Reserved<BR>
|
||||
Copyright 1997-2001 All Rights Reserved<BR>
|
||||
</CENTER>
|
||||
<HR>
|
||||
<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
|
||||
@@ -150,19 +150,21 @@ Copyright 1997-2000, All Rights Reserved<BR>
|
||||
<LI><A HREF="#5_2_9">5.2.9 job-hold-until (keyword | name(MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_10">5.2.10 job-sheets (1setof type3 keyword |
|
||||
name(MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_11">5.2.11 lpi (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_2_12">5.2.12 page-bottom (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_13">5.2.13 page-left (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_14">5.2.14 page-right (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_15">5.2.15 page-set (type2 keyword)</A></LI>
|
||||
<LI><A HREF="#5_2_16">5.2.16 page-top (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_17">5.2.17 penwidth (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_18">5.2.18 position (type2 keyword)</A></LI>
|
||||
<LI><A HREF="#5_2_19">5.2.19 ppi (integer(1:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_20">5.2.20 prettyprint (boolean)</A></LI>
|
||||
<LI><A HREF="#5_2_21">5.2.21 saturation (integer(0:200))</A></LI>
|
||||
<LI><A HREF="#5_2_22">5.2.22 scaling (integer(1:1000))</A></LI>
|
||||
<LI><A HREF="#5_2_23">5.2.23 wrap (boolean)</A></LI>
|
||||
<LI><A HREF="#5_2_11">5.2.11 job-originating-host-name (name(MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_12">5.2.12 lpi (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_2_13">5.2.13 page-bottom (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_14">5.2.14 page-label (text(MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_15">5.2.15 page-left (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_16">5.2.16 page-right (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_17">5.2.17 page-set (type2 keyword)</A></LI>
|
||||
<LI><A HREF="#5_2_18">5.2.18 page-top (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_19">5.2.19 penwidth (integer(0:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_20">5.2.20 position (type2 keyword)</A></LI>
|
||||
<LI><A HREF="#5_2_21">5.2.21 ppi (integer(1:MAX))</A></LI>
|
||||
<LI><A HREF="#5_2_22">5.2.22 prettyprint (boolean)</A></LI>
|
||||
<LI><A HREF="#5_2_23">5.2.23 saturation (integer(0:200))</A></LI>
|
||||
<LI><A HREF="#5_2_24">5.2.24 scaling (integer(1:1000))</A></LI>
|
||||
<LI><A HREF="#5_2_25">5.2.25 wrap (boolean)</A></LI>
|
||||
</UL>
|
||||
<LI><A HREF="#5_3">5.3 PPD Attributes</A></LI>
|
||||
<UL>
|
||||
@@ -173,15 +175,16 @@ name(MAX))</A></LI>
|
||||
</UL>
|
||||
<LI><A HREF="#5_4">5.4 Printer Attributes</A></LI>
|
||||
<UL>
|
||||
<LI><A HREF="#5_4_1">5.4.1 job-sheets-default (1setof type3 keyword |
|
||||
<LI><A HREF="#5_4_1">5.4.1 job-k-limit (integer)</A></LI>
|
||||
<LI><A HREF="#5_4_2">5.4.2 job-page-limit (integer)</A></LI>
|
||||
<LI><A HREF="#5_4_3">5.4.3 job-quota-period (integer)</A></LI>
|
||||
<LI><A HREF="#5_4_4">5.4.4 job-sheets-supported (1setof type3 keyword |
|
||||
name(MAX))</A></LI>
|
||||
<LI><A HREF="#5_4_2">5.4.2 job-sheets-supported (1setof type3 keyword |
|
||||
name(MAX))</A></LI>
|
||||
<LI><A HREF="#5_4_3">5.4.3 printer-type (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_4_4">5.4.4 printer-type-mask (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_4_5">5.4.5 requesting-user-name-allowed (1setof
|
||||
<LI><A HREF="#5_4_5">5.4.5 printer-type (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_4_6">5.4.6 printer-type-mask (type2 enum)</A></LI>
|
||||
<LI><A HREF="#5_4_7">5.4.7 requesting-user-name-allowed (1setof
|
||||
name(127))</A></LI>
|
||||
<LI><A HREF="#5_4_6">5.4.6 requesting-user-name-denied (1setof
|
||||
<LI><A HREF="#5_4_8">5.4.8 requesting-user-name-denied (1setof
|
||||
name(127))</A></LI>
|
||||
</UL>
|
||||
<LI><A HREF="#5_5">5.5 Printer Class Attributes</A></LI>
|
||||
@@ -668,13 +671,12 @@ additional printer information. </P>
|
||||
<P>"printer-state-message" (text(MAX)): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a textual
|
||||
reason for the current printer state. </P>
|
||||
<P>"requesting-user-name-allowed" (1setof name(127)) </P>
|
||||
<P>"requesting-user-name-allowed" (1setof name(127) | delete) </P>
|
||||
<P><I>OR</I></P>
|
||||
<P>"requesting-user-name-denied" (1setof name(127)): </P>
|
||||
<P>"requesting-user-name-denied" (1setof name(127) | delete): </P>
|
||||
<P>The client OPTIONALLY supplies one of these attributes to specify
|
||||
an access control list for incoming print jobs. The special name
|
||||
"ALLUSERS" is reserved to indicate that all users are allowed or
|
||||
denied. </P>
|
||||
an access control list for incoming print jobs. To allow all users
|
||||
access to a printer, use the delete tag for the attribute value. </P>
|
||||
</UL>
|
||||
<P>The CUPS-Add-Printer request can optionally be followed by a PPD
|
||||
file or System V interface script to be used for the printer. The
|
||||
@@ -796,30 +798,29 @@ CUPS-Add-Class request: </P>
|
||||
printers and printer classes that are part of the class. </P>
|
||||
<P>"printer-is-accepting-jobs" (boolean): </P>
|
||||
<P>The client OPTIONALLY supplies this boolean attribute indicating
|
||||
whether or not the printer object should accept new jobs. </P>
|
||||
whether or not the class object should accept new jobs. </P>
|
||||
<P>"printer-info" (text(127)): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating the
|
||||
printer information string. </P>
|
||||
<P>"printer-location" (text(127)): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a textual
|
||||
location of the printer. </P>
|
||||
location of the class. </P>
|
||||
<P>"printer-more-info" (uri): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a URI for
|
||||
additional printer information. </P>
|
||||
additional class information. </P>
|
||||
<P>"printer-state" (type2 enum): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating the
|
||||
initial/current state of the printer. Only the "idle" and "stopped"
|
||||
initial/current state of the class. Only the "idle" and "stopped"
|
||||
enumerations are recognized. </P>
|
||||
<P>"printer-state-message" (text(MAX)): </P>
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a textual
|
||||
reason for the current printer state. </P>
|
||||
reason for the current class state. </P>
|
||||
<P>"requesting-user-name-allowed" (1setof name(127)) </P>
|
||||
<P><I>OR</I></P>
|
||||
<P>"requesting-user-name-denied" (1setof name(127)): </P>
|
||||
<P>The client OPTIONALLY supplies one of these attributes to specify
|
||||
an access control list for incoming print jobs. The special name
|
||||
"ALLUSERS" is reserved to indicate that all users are allowed or
|
||||
denied. </P>
|
||||
an access control list for incoming print jobs. To allow all users
|
||||
access to a class, use the delete tag for the attribute value. </P>
|
||||
</UL>
|
||||
<H3><A NAME="4_9_2">4.9.2 CUPS-Add-Class Response</A></H3>
|
||||
<P>The following groups of attributes are send as part of the
|
||||
@@ -1107,10 +1108,12 @@ of the device-class attribute: </P>
|
||||
"method:/dev/filename", where method may be "parallel" or "usb" in
|
||||
the current implementation. </LI>
|
||||
<LI>"serial" - The device-uri will be of the form
|
||||
"serial:/dev/filename?baud=value+parity=value+flow=value". The parity
|
||||
value can be one of "none", "even", or "odd". The flow value can be
|
||||
one of "none", "soft" (XON/XOFF handshaking), or "hard" (CTS/RTS
|
||||
handshaking). </LI>
|
||||
"serial:/dev/filename?baud=value+parity=value+flow=value". The baud
|
||||
value is the data rate in bits per second; the supported values depend
|
||||
on the underlying hardware. The parity value can be one of "none",
|
||||
"even", or "odd". The flow value can be one of "none", "soft"
|
||||
(XON/XOFF handshaking), "hard" or "rts/cts" (RTS/CTS handshaking), or
|
||||
"dtrdsr" (DTR/DSR handshaking). </LI>
|
||||
<P>The URI returned by CUPS-Get-Devices will contain the maximum baud
|
||||
rate supported by the device and the best type of flow control
|
||||
available ("soft" or "hard"). </P>
|
||||
@@ -1183,31 +1186,44 @@ attribute. </P>
|
||||
<P>If only one value is supplied, the banner file is printed before the
|
||||
job. If two values are supplied, the first value is used as the
|
||||
starting banner file and the second as the ending banner file. </P>
|
||||
<H3><A NAME="5_2_11">5.2.11 lpi (type2 enum)</A></H3>
|
||||
<H3><A NAME="5_2_11">5.2.11 job-originating-host-name (name(MAX))</A></H3>
|
||||
<P><I>(CUPS 1.1.5 and higher)</I></P>
|
||||
<P>The job-originating-host-name attribute specifies the host from
|
||||
which the job was queued. The value will be the hostname or IP address
|
||||
of the client depending on whether hostname resolution is enabled. The
|
||||
localhost address (127.0.0.1) is <B>always</B> resolved to the name
|
||||
"localhost". </P>
|
||||
<P>This attribute is read-only. </P>
|
||||
<H3><A NAME="5_2_12">5.2.12 lpi (type2 enum)</A></H3>
|
||||
<P>The lpi attribute specifies the number of lines per inch when
|
||||
printing text files. Only the values 6 and 8 are currently supported.
|
||||
The default value is 6. </P>
|
||||
<H3><A NAME="5_2_12">5.2.12 page-bottom (integer(0:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_13">5.2.13 page-bottom (integer(0:MAX))</A></H3>
|
||||
<P>The page-bottom attribute specifies the bottom margin in points (72
|
||||
points equals 1 inch). The default value is the device physical margin. </P>
|
||||
<H3><A NAME="5_2_13">5.2.13 page-left (integer(0:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_14">5.2.14 page-label (text(MAX))</A></H3>
|
||||
<P><I>(CUPS 1.1.7 and higher)</I></P>
|
||||
<P>The page-label attribute provides a text value to place in the
|
||||
header and footer on each page. If a classification level is set on the
|
||||
server, then this classification is printed before the page label. </P>
|
||||
<H3><A NAME="5_2_15">5.2.15 page-left (integer(0:MAX))</A></H3>
|
||||
<P>The page-left attribute specifies the left margin in points (72
|
||||
points equals 1 inch). The default value is the device physical margin. </P>
|
||||
<H3><A NAME="5_2_14">5.2.14 page-right (integer(0:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_16">5.2.16 page-right (integer(0:MAX))</A></H3>
|
||||
<P>The page-right attribute specifies the right margin in points (72
|
||||
points equals 1 inch). The default value is the device physical margin. </P>
|
||||
<H3><A NAME="5_2_15">5.2.15 page-set (type2 keyword)</A></H3>
|
||||
<H3><A NAME="5_2_17">5.2.17 page-set (type2 keyword)</A></H3>
|
||||
<P>The page-set attribute specifies which pages to print in a file. The
|
||||
supported keywords are "all", "even", and "odd". The default value is
|
||||
"all". </P>
|
||||
<H3><A NAME="5_2_16">5.2.16 page-top (integer(0:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_18">5.2.18 page-top (integer(0:MAX))</A></H3>
|
||||
<P>The page-top attribute specifies the top margin in points (72 points
|
||||
equals 1 inch). The default value is the device physical margin. </P>
|
||||
<H3><A NAME="5_2_17">5.2.17 penwidth (integer(0:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_19">5.2.19 penwidth (integer(0:MAX))</A></H3>
|
||||
<P>The penwidth attribute specifies the default pen width in
|
||||
micrometers when printing HP-GL/2 plot files. The default value is 1000
|
||||
(1 millimeter). </P>
|
||||
<H3><A NAME="5_2_18">5.2.18 position (type2 keyword)</A></H3>
|
||||
<H3><A NAME="5_2_20">5.2.20 position (type2 keyword)</A></H3>
|
||||
<P>The position attribute specifies the location of image files on the
|
||||
media. The following keyword values are recognized: </P>
|
||||
<UL>
|
||||
@@ -1227,27 +1243,27 @@ page </LI>
|
||||
<LI><CODE>bottom-right</CODE> - Print the image at the bottom right
|
||||
corner of the page </LI>
|
||||
</UL>
|
||||
<H3><A NAME="5_2_19">5.2.19 ppi (integer(1:MAX))</A></H3>
|
||||
<H3><A NAME="5_2_21">5.2.21 ppi (integer(1:MAX))</A></H3>
|
||||
<P>The ppi attribute specifies the resolution of an image file in
|
||||
pixels per inch. The default value is the resolution included with the
|
||||
file or 128 if no resolution information is available. </P>
|
||||
<H3><A NAME="5_2_20">5.2.20 prettyprint (boolean)</A></H3>
|
||||
<H3><A NAME="5_2_22">5.2.22 prettyprint (boolean)</A></H3>
|
||||
<P>The prettyprint attribute specifies whether text files should be
|
||||
printed with a shaded header and keyword highlighting
|
||||
(prettyprint=true) or without additional formatting
|
||||
(prettyprint=false). The default value is false. </P>
|
||||
<H3><A NAME="5_2_21">5.2.21 saturation (integer(0:200))</A></H3>
|
||||
<H3><A NAME="5_2_23">5.2.23 saturation (integer(0:200))</A></H3>
|
||||
<P>The saturation attribute specifies the color saturation when
|
||||
printing image files. A saturation of 100 is normal, while values of 50
|
||||
and 200 will be half and twice as colorful, respectively. The default
|
||||
value is 100. </P>
|
||||
<H3><A NAME="5_2_22">5.2.22 scaling (integer(1:1000))</A></H3>
|
||||
<H3><A NAME="5_2_24">5.2.24 scaling (integer(1:1000))</A></H3>
|
||||
<P>The scaling attribute specifies the scaling of image files with
|
||||
respect to the selected media. A value of 100 specifies that the image
|
||||
file should fit 100% of the page, or as much as possible given the
|
||||
image dimensions. The default value is unspecified. </P>
|
||||
<P>The scaling attribute overrides the ppi attribute if specified. </P>
|
||||
<H3><A NAME="5_2_23">5.2.23 wrap (boolean)</A></H3>
|
||||
<H3><A NAME="5_2_25">5.2.25 wrap (boolean)</A></H3>
|
||||
<P>The wrap attribute specifies whether long lines should be wrapped
|
||||
(wrap=true) or not (wrap=false) when printing text files. The default
|
||||
value is true. </P>
|
||||
@@ -1271,19 +1287,29 @@ or ShortNickName attributes are used instead. </P>
|
||||
relative to the model directory. The forward slash (/) is used to
|
||||
delineate directories. </P>
|
||||
<H2><A NAME="5_4">5.4 Printer Attributes</A></H2>
|
||||
<H3><A NAME="5_4_1">5.4.1 job-sheets-default (1setof type3 keyword |
|
||||
name(MAX))</A></H3>
|
||||
<H3><A NAME="5_4_1">5.4.1 job-k-limit (integer)</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The job-sheets-default attribute specifies the default banner
|
||||
file(s) to print before and after each job. The value "none" specifies
|
||||
that no banner should be printed. </P>
|
||||
<H3><A NAME="5_4_2">5.4.2 job-sheets-supported (1setof type3 keyword |
|
||||
<P>The job-k-limit attribute specifies the maximum number of kilobytes
|
||||
that may be printed by a user, including banner files. The default
|
||||
value of 0 specifies that there is no limit. </P>
|
||||
<H3><A NAME="5_4_2">5.4.2 job-page-limit (integer)</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The job-page-limit attribute specifies the maximum number of pages
|
||||
that may be printed by a user, including banner files. The default
|
||||
value of 0 specifies that there is no limit. </P>
|
||||
<H3><A NAME="5_4_3">5.4.3 job-quota-period (integer)</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The job-quota-period attribute specifies the time period used for
|
||||
quota calculations, in seconds. The default value of 0 specifies that
|
||||
the limits apply to all jobs that have been printed by a user that are
|
||||
still known to the system. </P>
|
||||
<H3><A NAME="5_4_4">5.4.4 job-sheets-supported (1setof type3 keyword |
|
||||
name(MAX))</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The job-sheets-supported attribute specifies the available banner
|
||||
files. There will always be at least one banner file available called
|
||||
"none". </P>
|
||||
<H3><A NAME="5_4_3">5.4.3 printer-type (type2 enum)</A></H3>
|
||||
<H3><A NAME="5_4_5">5.4.5 printer-type (type2 enum)</A></H3>
|
||||
<P>The printer-type attribute specifies printer type and capability
|
||||
bits for the printer or class. The default value is computed from
|
||||
internal state information and the PPD file for the printer. The
|
||||
@@ -1328,30 +1354,26 @@ user-defined media sizes.</TD></TR>
|
||||
</TABLE>
|
||||
</CENTER>
|
||||
</P>
|
||||
<H3><A NAME="5_4_4">5.4.4 printer-type-mask (type2 enum)</A></H3>
|
||||
<H3><A NAME="5_4_6">5.4.6 printer-type-mask (type2 enum)</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The printer-type-mask attribute is used to choose printers or
|
||||
classes with the CUPS-Get-Printers and CUPS-Get-Classes operations. The
|
||||
bits are defined identically to the printer-type attribute and default
|
||||
to all 1's. </P>
|
||||
<H3><A NAME="5_4_5">5.4.5 requesting-user-name-allowed (1setof
|
||||
<H3><A NAME="5_4_7">5.4.7 requesting-user-name-allowed (1setof
|
||||
name(127))</A></H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The requesting-user-name-allowed attribute lists all of the users
|
||||
that are allowed to access a printer or class. Either this attribute or
|
||||
the requesting-user-name-denied attribute will be defined, but not
|
||||
both. </P>
|
||||
<P>The special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed. </P>
|
||||
<H3><A NAME="5_4_6">5.4.6 requesting-user-name-denied (1setof name(127))</A>
|
||||
<H3><A NAME="5_4_8">5.4.8 requesting-user-name-denied (1setof name(127))</A>
|
||||
</H3>
|
||||
<P><I>(CUPS 1.1 and higher)</I></P>
|
||||
<P>The requesting-user-name-denied attribute lists all of the users
|
||||
that are not allowed to access a printer or class. Either this
|
||||
attribute or the requesting-user-name-allowed attribute will be
|
||||
defined, but not both. </P>
|
||||
<P>The special name "ALLUSERS" is reserved to indicate that all users
|
||||
are denied. </P>
|
||||
<H2><A NAME="5_5">5.5 Printer Class Attributes</A></H2>
|
||||
<H3><A NAME="5_5_1">5.5.1 member-names (1setof name(127))</A></H3>
|
||||
<P>The member-names attribute specifies each of the printer-name
|
||||
|
||||
Arquivo binário não exibido.
+60
-25
@@ -1,6 +1,6 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001 All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-IPP-1.1">
|
||||
<META NAME="Author" CONTENT="Easy Software Products">
|
||||
<TITLE>CUPS Implementation of IPP</TITLE>
|
||||
@@ -772,14 +772,14 @@ CUPS-Add-Printer request:
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a
|
||||
textual reason for the current printer state.
|
||||
|
||||
<P>"requesting-user-name-allowed" (1setof name(127))
|
||||
<P>"requesting-user-name-allowed" (1setof name(127) | delete)
|
||||
<P><I>OR</I>
|
||||
<P>"requesting-user-name-denied" (1setof name(127)):
|
||||
<P>"requesting-user-name-denied" (1setof name(127) | delete):
|
||||
|
||||
<P>The client OPTIONALLY supplies one of these attributes to
|
||||
specify an access control list for incoming print jobs. The
|
||||
special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed or denied.
|
||||
specify an access control list for incoming print jobs. To allow
|
||||
all users access to a printer, use the delete tag for the
|
||||
attribute value.
|
||||
|
||||
</UL>
|
||||
|
||||
@@ -988,7 +988,7 @@ CUPS-Add-Class request:
|
||||
<P>"printer-is-accepting-jobs" (boolean):
|
||||
|
||||
<P>The client OPTIONALLY supplies this boolean attribute
|
||||
indicating whether or not the printer object should accept new jobs.
|
||||
indicating whether or not the class object should accept new jobs.
|
||||
|
||||
<P>"printer-info" (text(127)):
|
||||
|
||||
@@ -998,32 +998,32 @@ CUPS-Add-Class request:
|
||||
<P>"printer-location" (text(127)):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a
|
||||
textual location of the printer.
|
||||
textual location of the class.
|
||||
|
||||
<P>"printer-more-info" (uri):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a
|
||||
URI for additional printer information.
|
||||
URI for additional class information.
|
||||
|
||||
<P>"printer-state" (type2 enum):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating the
|
||||
initial/current state of the printer. Only the "idle" and "stopped"
|
||||
initial/current state of the class. Only the "idle" and "stopped"
|
||||
enumerations are recognized.
|
||||
|
||||
<P>"printer-state-message" (text(MAX)):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a
|
||||
textual reason for the current printer state.
|
||||
textual reason for the current class state.
|
||||
|
||||
<P>"requesting-user-name-allowed" (1setof name(127))
|
||||
<P><I>OR</I>
|
||||
<P>"requesting-user-name-denied" (1setof name(127)):
|
||||
|
||||
<P>The client OPTIONALLY supplies one of these attributes to
|
||||
specify an access control list for incoming print jobs. The
|
||||
special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed or denied.
|
||||
specify an access control list for incoming print jobs. To allow
|
||||
all users access to a class, use the delete tag for the
|
||||
attribute value.
|
||||
|
||||
</UL>
|
||||
|
||||
@@ -1508,9 +1508,12 @@ of the device-class attribute:
|
||||
|
||||
<LI>"serial" - The device-uri will be of the form
|
||||
"serial:/dev/filename?baud=value+parity=value+flow=value".
|
||||
The baud value is the data rate in bits per second; the
|
||||
supported values depend on the underlying hardware.
|
||||
The parity value can be one of "none", "even", or "odd".
|
||||
The flow value can be one of "none", "soft" (XON/XOFF
|
||||
handshaking), or "hard" (CTS/RTS handshaking).
|
||||
handshaking), "hard" or "rts/cts" (RTS/CTS handshaking),
|
||||
or "dtrdsr" (DTR/DSR handshaking).
|
||||
|
||||
<P>The URI returned by CUPS-Get-Devices will contain the
|
||||
maximum baud rate supported by the device and the best
|
||||
@@ -1612,6 +1615,18 @@ The default value is stored in the job-sheets-default attribute.
|
||||
If two values are supplied, the first value is used as the starting banner
|
||||
file and the second as the ending banner file.
|
||||
|
||||
<H3>job-originating-host-name (name(MAX))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1.5 and higher)</I>
|
||||
|
||||
<P>The job-originating-host-name attribute specifies the host
|
||||
from which the job was queued. The value will be the hostname or
|
||||
IP address of the client depending on whether hostname
|
||||
resolution is enabled. The localhost address (127.0.0.1) is
|
||||
<B>always</B> resolved to the name "localhost".
|
||||
|
||||
<P>This attribute is read-only.
|
||||
|
||||
<H3>lpi (type2 enum)</H3>
|
||||
|
||||
<P>The lpi attribute specifies the number of lines per inch when
|
||||
@@ -1623,6 +1638,15 @@ The default value is 6.
|
||||
<P>The page-bottom attribute specifies the bottom margin in points (72 points
|
||||
equals 1 inch). The default value is the device physical margin.
|
||||
|
||||
<H3>page-label (text(MAX))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1.7 and higher)</I>
|
||||
|
||||
<P>The page-label attribute provides a text value to place in
|
||||
the header and footer on each page. If a classification level is
|
||||
set on the server, then this classification is printed before
|
||||
the page label.
|
||||
|
||||
<H3>page-left (integer(0:MAX))</H3>
|
||||
|
||||
<P>The page-left attribute specifies the left margin in points (72 points
|
||||
@@ -1745,13 +1769,30 @@ delineate directories.
|
||||
|
||||
<H2>Printer Attributes</H2>
|
||||
|
||||
<H3>job-sheets-default (1setof type3 keyword | name(MAX))</H3>
|
||||
<H3>job-k-limit (integer)</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
|
||||
<P>The job-sheets-default attribute specifies the default banner file(s) to
|
||||
print before and after each job. The value "none" specifies that no banner
|
||||
should be printed.
|
||||
<P>The job-k-limit attribute specifies the maximum number of kilobytes that
|
||||
may be printed by a user, including banner files. The default value of 0
|
||||
specifies that there is no limit.
|
||||
|
||||
<H3>job-page-limit (integer)</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
|
||||
<P>The job-page-limit attribute specifies the maximum number of pages that
|
||||
may be printed by a user, including banner files. The default value of 0
|
||||
specifies that there is no limit.
|
||||
|
||||
<H3>job-quota-period (integer)</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
|
||||
<P>The job-quota-period attribute specifies the time period used for quota
|
||||
calculations, in seconds. The default value of 0 specifies that the limits
|
||||
apply to all jobs that have been printed by a user that are still known to
|
||||
the system.
|
||||
|
||||
<H3>job-sheets-supported (1setof type3 keyword | name(MAX))</H3>
|
||||
|
||||
@@ -1857,9 +1898,6 @@ identically to the printer-type attribute and default to all 1's.
|
||||
allowed to access a printer or class. Either this attribute or the
|
||||
requesting-user-name-denied attribute will be defined, but not both.
|
||||
|
||||
<P>The special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed.
|
||||
|
||||
<H3>requesting-user-name-denied (1setof name(127))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
@@ -1868,9 +1906,6 @@ are allowed.
|
||||
not allowed to access a printer or class. Either this attribute or the
|
||||
requesting-user-name-allowed attribute will be defined, but not both.
|
||||
|
||||
<P>The special name "ALLUSERS" is reserved to indicate that all users
|
||||
are denied.
|
||||
|
||||
<H2>Printer Class Attributes</H2>
|
||||
|
||||
<H3>member-names (1setof name(127))</H3>
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@
|
||||
|
||||
<P ALIGN="RIGHT">July 10, 2000<BR>
|
||||
Michael Sweet, Easy Software Products<BR>
|
||||
Copyright 1998-2000, All Rights Reserved.</P>
|
||||
Copyright 1998-2001, All Rights Reserved.</P>
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE>
|
||||
@@ -413,7 +413,7 @@ on the CUPS bazaar, available at:
|
||||
</PRE></UL>
|
||||
|
||||
<P>Finally, our own ESP Print Pro software uses CUPS to provide drivers
|
||||
for over 2300 printers and can be found at:
|
||||
for thousands of printers and can be found at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://www.easysw.com/printpro">http://www.easysw.com/printpro</A>
|
||||
|
||||
Arquivo binário não exibido.
+518
-164
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
Arquivo binário não exibido.
+418
-37
@@ -1,7 +1,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.1.3">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.1.7">
|
||||
<META NAME="Author" CONTENT="Easy Software Products">
|
||||
<TITLE>CUPS Software Administrators Manual</TITLE>
|
||||
</HEAD>
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<P>This software administrators manual provides printer administration
|
||||
information for the Common UNIX Printing System<SUP>TM</SUP>
|
||||
("CUPS<SUP>TM</SUP>"), version 1.1.3.
|
||||
("CUPS<SUP>TM</SUP>"), version 1.1.7.
|
||||
|
||||
<EMBED SRC="system-overview.shtml">
|
||||
|
||||
@@ -207,6 +207,7 @@ prior to running configure:
|
||||
<B>setenv CFLAGS "-I/some/directory" ENTER</B>
|
||||
<B>setenv CXXFLAGS "-I/some/directory" ENTER</B>
|
||||
<B>setenv LDFLAGS "-L/some/directory" ENTER</B>
|
||||
<B>setenv DSOFLAGS "-L/some/directory" ENTER</B>
|
||||
<B>./configure ... ENTER</B>
|
||||
</PRE></UL>
|
||||
|
||||
@@ -216,9 +217,23 @@ prior to running configure:
|
||||
<B>CFLAGS="-I/some/directory"; export CFLAGS ENTER</B>
|
||||
<B>CXXFLAGS="-I/some/directory"; export CXXFLAGS ENTER</B>
|
||||
<B>LDFLAGS="-L/some/directory"; export LDFLAGS ENTER</B>
|
||||
<B>DSOFLAGS="-L/some/directory"; export DSOFLAGS ENTER</B>
|
||||
<B>./configure ... ENTER</B>
|
||||
</PRE></UL>
|
||||
|
||||
<P>To enable support for encryption, you'll also want to add the
|
||||
"--enable-ssl" option:
|
||||
|
||||
<UL><PRE>
|
||||
./configure --enable-ssl
|
||||
</PRE></UL>
|
||||
|
||||
<P>SSL and TLS support require the OpenSSL library, available at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://www.openssl.org">http://www.openssl.org</A>
|
||||
</PRE></UL>
|
||||
|
||||
<P>Once you have configured things, just type:
|
||||
|
||||
<UL><PRE>
|
||||
@@ -824,6 +839,7 @@ determine how the server operates:
|
||||
<LI><A HREF="#AuthClass"><CODE>AuthClass</CODE></A>
|
||||
<LI><A HREF="#AuthGroupName"><CODE>AuthGroupName</CODE></A>
|
||||
<LI><A HREF="#AuthType"><CODE>AuthType</CODE></A>
|
||||
<LI><A HREF="#AutoPurgeJobs"><CODE>AutoPurgeJobs</CODE></A>
|
||||
<LI><A HREF="#BrowseAddress"><CODE>BrowseAddress</CODE></A>
|
||||
<LI><A HREF="#BrowseAllow"><CODE>BrowseAllow</CODE></A>
|
||||
<LI><A HREF="#BrowseDeny"><CODE>BrowseDeny</CODE></A>
|
||||
@@ -835,7 +851,12 @@ determine how the server operates:
|
||||
<LI><A HREF="#BrowseShortNames"><CODE>BrowseShortNames</CODE></A>
|
||||
<LI><A HREF="#BrowseTimeout"><CODE>BrowseTimeout</CODE></A>
|
||||
<LI><A HREF="#Browsing"><CODE>Browsing</CODE></A>
|
||||
<LI><A HREF="#Classification"><CODE>Classification</CODE></A>
|
||||
<LI><A HREF="#DataDir"><CODE>DataDir</CODE></A>
|
||||
<LI><A HREF="#DefaultCharset"><CODE>DefaultCharset</CODE></A>
|
||||
<LI><A HREF="#DefaultLanguage"><CODE>DefaultLanguage</CODE></A>
|
||||
<LI><A HREF="#Deny"><CODE>Deny</CODE></A>
|
||||
<LI><A HREF="#DocumentRoot"><CODE>DocumentRoot</CODE></A>
|
||||
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
@@ -843,23 +864,29 @@ determine how the server operates:
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
|
||||
<LI><A HREF="#DefaultCharset"><CODE>DefaultCharset</CODE></A>
|
||||
<LI><A HREF="#DefaultLanguage"><CODE>DefaultLanguage</CODE></A>
|
||||
<LI><A HREF="#Deny"><CODE>Deny</CODE></A>
|
||||
<LI><A HREF="#DocumentRoot"><CODE>DocumentRoot</CODE></A>
|
||||
<LI><A HREF="#Encryption"><CODE>Encryption</CODE></A>
|
||||
<LI><A HREF="#ErrorLog"><CODE>ErrorLog</CODE></A>
|
||||
<LI><A HREF="#FilterLimit"><CODE>FilterLimit</CODE></A>
|
||||
<LI><A HREF="#FontPath"><CODE>FontPath</CODE></A>
|
||||
<LI><A HREF="#Group"><CODE>Group</CODE></A>
|
||||
<LI><A HREF="#HostNameLookups"><CODE>HostNameLookups</CODE></A>
|
||||
<LI><A HREF="#ImplicitClasses"><CODE>ImplicitClasses</CODE></A>
|
||||
<LI><A HREF="#KeepAliveTimeout"><CODE>KeepAliveTimeout</CODE></A>
|
||||
<LI><A HREF="#KeepAlive"><CODE>KeepAlive</CODE></A>
|
||||
<LI><A HREF="#Limit"><CODE>Limit</CODE></A>
|
||||
<LI><A HREF="#LimitExcept"><CODE>LimitExcept</CODE></A>
|
||||
<LI><A HREF="#LimitRequestBody"><CODE>LimitRequestBody</CODE></A>
|
||||
<LI><A HREF="#Listen"><CODE>Listen</CODE></A>
|
||||
<LI><A HREF="#Location"><CODE>Location</CODE></A>
|
||||
<LI><A HREF="#LogLevel"><CODE>LogLevel</CODE></A>
|
||||
<LI><A HREF="#MaxClients"><CODE>MaxClients</CODE></A>
|
||||
<LI><A HREF="#MaxJobs"><CODE>MaxJobs</CODE></A>
|
||||
<LI><A HREF="#MaxJobsPerPrinter"><CODE>MaxJobsPerPrinter</CODE></A>
|
||||
<LI><A HREF="#MaxJobsPerUser"><CODE>MaxJobsPerUser</CODE></A>
|
||||
<LI><A HREF="#MaxLogSize"><CODE>MaxLogSize</CODE></A>
|
||||
<LI><A HREF="#MaxRequestSize"><CODE>MaxRequestSize</CODE></A>
|
||||
<LI><A HREF="#Order"><CODE>Order</CODE></A>
|
||||
<LI><A HREF="#PageLog"><CODE>PageLog</CODE></A>
|
||||
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
@@ -867,19 +894,25 @@ determine how the server operates:
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
|
||||
<LI><A HREF="#Order"><CODE>Order</CODE></A>
|
||||
<LI><A HREF="#PageLog"><CODE>PageLog</CODE></A>
|
||||
<LI><A HREF="#Port"><CODE>Port</CODE></A>
|
||||
<LI><A HREF="#PreserveJobFiles"><CODE>PreserveJobFiles</CODE></A>
|
||||
<LI><A HREF="#PreserveJobHistory"><CODE>PreserveJobHistory</CODE></A>
|
||||
<LI><A HREF="#Printcap"><CODE>Printcap</CODE></A>
|
||||
<LI><A HREF="#PrintcapFormat"><CODE>PrintcapFormat</CODE></A>
|
||||
<LI><A HREF="#RemoteRoot"><CODE>RemoteRoot</CODE></A>
|
||||
<LI><A HREF="#RequestRoot"><CODE>RequestRoot</CODE></A>
|
||||
<LI><A HREF="#Require"><CODE>Require</CODE></A>
|
||||
<LI><A HREF="#RIPCache"><CODE>RIPCache</CODE></A>
|
||||
<LI><A HREF="#RunAsUser"><CODE>RunAsUser</CODE></A>
|
||||
<LI><A HREF="#Satisfy"><CODE>Satisfy</CODE></A>
|
||||
<LI><A HREF="#ServerAdmin"><CODE>ServerAdmin</CODE></A>
|
||||
<LI><A HREF="#ServerBin"><CODE>ServerBin</CODE></A>
|
||||
<LI><A HREF="#ServerCertificate"><CODE>ServerCertificate</CODE></A>
|
||||
<LI><A HREF="#ServerKey"><CODE>ServerKey</CODE></A>
|
||||
<LI><A HREF="#ServerName"><CODE>ServerName</CODE></A>
|
||||
<LI><A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A>
|
||||
<LI><A HREF="#SSLListen"><CODE>SSLListen</CODE></A>
|
||||
<LI><A HREF="#SSLPort"><CODE>SSLPort</CODE></A>
|
||||
<LI><A HREF="#SystemGroup"><CODE>SystemGroup</CODE></A>
|
||||
<LI><A HREF="#TempDir"><CODE>TempDir</CODE></A>
|
||||
<LI><A HREF="#Timeout"><CODE>Timeout</CODE></A>
|
||||
@@ -1077,6 +1110,23 @@ authenticate using <A HREF="#CERTIFICATES">certificates</A>.
|
||||
<P>The <CODE>AuthType</CODE> directive must appear inside a
|
||||
<A HREF="#Location"><CODE>Location</CODE></A> directive.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="AutoPurgeJobs">AutoPurgeJobs</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
AutoPurgeJobs Yes
|
||||
AutoPurgeJobs No
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>AutoPurgeJobs</CODE> directive specifies whether or not to purge
|
||||
completed jobs once they are no longer required for quotas. This option has
|
||||
no effect if quotas are not enabled. The default setting is <CODE>No</CODE>.
|
||||
|
||||
<!-- NEED 5in -->
|
||||
<H3><A NAME="BrowseAddress">BrowseAddress</A></H3>
|
||||
<HR>
|
||||
@@ -1369,6 +1419,28 @@ browsing is enabled. The default setting is <CODE>On</CODE>.
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Classification">Classification</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
Classification
|
||||
Classification classified
|
||||
Classification confidential
|
||||
Classification secret
|
||||
Classification topsecret
|
||||
Classification unclassified
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Classification</CODE> directive sets the classification level
|
||||
on the server. When this option is set, at least one of the banner pages
|
||||
is forced to the classification level, and the classification is placed
|
||||
on each page of output. The default is no classification level.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="DataDir">DataDir</A></H3>
|
||||
<HR>
|
||||
@@ -1513,6 +1585,26 @@ and then directly under the <CODE>DocumentRoot</CODE> directory
|
||||
(e.g. <VAR>/usr/share/doc/cups/...</VAR>), so it is possible to localize
|
||||
the web content by providing subdirectories for each language needed.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Encryption">Encryption</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
Encryption Never
|
||||
Encryption IfRequested
|
||||
Encryption Required
|
||||
Encryption Always
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Encryption</CODE> directive must appear instead a
|
||||
<A HREF="#Location"><CODE>Location</CODE></A>
|
||||
section and specifies the encryption settings for that location.
|
||||
The default setting is <CODE>IfRequested</CODE> for all locations.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ErrorLog">ErrorLog</A></H3>
|
||||
<HR>
|
||||
@@ -1565,6 +1657,23 @@ limit the scheduler to printing a single job at any time.
|
||||
|
||||
<P>The default limit is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="FontPath">FontPath</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
FontPath /foo/bar/fonts
|
||||
FontPath /usr/share/cups/fonts:/foo/bar/fonts
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>FontPath</CODE> directive specifies the font path to use when
|
||||
searching for fonts. The default font path is
|
||||
<CODE>/usr/share/cups/fonts</CODE>.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Group">Group</A></H3>
|
||||
<HR>
|
||||
@@ -1593,15 +1702,23 @@ system.
|
||||
<UL><PRE>
|
||||
HostNameLookups On
|
||||
HostNameLookups Off
|
||||
HostNameLookups Double
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>HostNameLookups</CODE> directive controls whether or not
|
||||
CUPS looks up the hostname for connecting clients. The default is
|
||||
<CODE>Off</CODE> to avoid the potential server performance problems
|
||||
with hostname lookups. Turn this option <CODE>On</CODE> only if
|
||||
absolutely required.
|
||||
<P>The <CODE>HostNameLookups</CODE> directive controls whether
|
||||
or not CUPS looks up the hostname for connecting clients. The
|
||||
<CODE>Double</CODE> setting causes CUPS to verify that the
|
||||
hostname resolved from the address matches one of the addresses
|
||||
returned for that hostname. <CODE>Double</CODE> lookups also
|
||||
prevent clients with unregistered addresses from connecting
|
||||
to your server.
|
||||
|
||||
The default is <CODE>Off</CODE> to avoid the potential server
|
||||
performance problems with hostname lookups. Set this option to
|
||||
<CODE>On</CODE> or <CODE>Double</CODE> only if absolutely
|
||||
required.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ImplicitClasses">ImplicitClasses</A></H3>
|
||||
@@ -1660,6 +1777,74 @@ KeepAliveTimeout 30
|
||||
persistent HTTP connection will remain open after the last request. The
|
||||
default is 60 seconds.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Limit">Limit</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
<Limit GET POST>
|
||||
...
|
||||
</Limit>
|
||||
|
||||
<Limit ALL>
|
||||
...
|
||||
</Limit>
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Limit</CODE> directive groups access control directives for
|
||||
specific types of HTTP requests and must appear inside a
|
||||
<A HREF="#Location"><CODE>Location</CODE></A> section. Access can be limited
|
||||
for individual request types (<CODE>DELETE</CODE>, <CODE>GET</CODE>,
|
||||
<CODE>HEAD</CODE>, <CODE>OPTIONS</CODE>, <CODE>POST</CODE>, <CODE>PUT</CODE>,
|
||||
and <CODE>TRACE</CODE>) or for all request types (<CODE>ALL</CODE>). The
|
||||
request type names are case-sensitive for compatibility with Apache.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="LimitExcept">LimitExcept</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
<LimitExcept GET POST>
|
||||
...
|
||||
</LimitExcept>
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>LimitExcept</CODE> directive groups access control directives for
|
||||
specific types of HTTP requests and must appear inside a
|
||||
<A HREF="#Location"><CODE>Location</CODE></A> section. Unlike the
|
||||
<A HREF="#Limit"><CODE>Limit</CODE></A> directive, <CODE>LimitExcept</CODE>
|
||||
restricts access for all requests <I>except</I> those listed on the
|
||||
<CODE>LimitExcept</CODE> line.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="LimitRequestBody">LimitRequestBody</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
LimitRequestBody 10485760
|
||||
LimitRequestBody 10m
|
||||
LimitRequestBody 0
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>LimitRequestBody</CODE> directive controls the maximum size of
|
||||
print files, IPP requests, and HTML form data in HTTP POST requests. The
|
||||
default limit is 0 which disables the limit check.
|
||||
|
||||
<P>Also see the identical
|
||||
<A HREF="#MaxRequestSize"><CODE>MaxRequestSize</CODE></A> directive.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Listen">Listen</A></H3>
|
||||
<HR>
|
||||
@@ -1677,8 +1862,6 @@ Listen 192.0.2.1:631
|
||||
to listen for connections. Multiple <CODE>Listen</CODE> directives can be
|
||||
provided to listen on multiple addresses.
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Listen</CODE> directive is similar to the
|
||||
<A HREF="#Port"><CODE>Port</CODE></A> directive but allows you to restrict
|
||||
access to specific interfaces or networks.
|
||||
@@ -1717,30 +1900,48 @@ information can be found later in this chapter in
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
LogLevel debug
|
||||
LogLevel error
|
||||
LogLevel info
|
||||
LogLevel none
|
||||
LogLevel emerg
|
||||
LogLevel alert
|
||||
LogLevel crit
|
||||
LogLevel error
|
||||
LogLevel warn
|
||||
LogLevel notice
|
||||
LogLevel info
|
||||
LogLevel debug
|
||||
LogLevel debug2
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>LogLevel</CODE> directive specifies the level of logging
|
||||
for the <A HREF="#ErrorLog"><CODE>ErrorLog</CODE></A> file. The
|
||||
following values are recognized:
|
||||
following values are recognized (each level logs everything under the
|
||||
preceding levels):
|
||||
|
||||
<UL>
|
||||
|
||||
<LI><CODE>debug</CODE> - Log everything.
|
||||
<LI><CODE>none</CODE> - Log nothing.
|
||||
|
||||
<LI><CODE>info</CODE> - Log all requests and state changes (default).
|
||||
<LI><CODE>emerg</CODE> - Log emergency conditions that prevent the
|
||||
server from running.
|
||||
|
||||
<LI><CODE>alert</CODE> - Log alerts that must be handled immediately.
|
||||
|
||||
<LI><CODE>crit</CODE> - Log critical errors that don't prevent
|
||||
the server from running.
|
||||
|
||||
<LI><CODE>error</CODE> - Log general errors.
|
||||
|
||||
<LI><CODE>warn</CODE> - Log errors and warnings.
|
||||
|
||||
<LI><CODE>error</CODE> - Log only errors.
|
||||
<LI><CODE>notice</CODE> - Log temporary error conditions.
|
||||
|
||||
<LI><CODE>none</CODE> - Log nothing.
|
||||
<LI><CODE>info</CODE> - Log all requests and state changes (default).
|
||||
|
||||
<LI><CODE>debug</CODE> - Log basic debugging information.
|
||||
|
||||
<LI><CODE>debug2</CODE> - Log all debugging information.
|
||||
|
||||
</UL>
|
||||
|
||||
@@ -1774,6 +1975,71 @@ simultaneous clients that will be allowed by the server. The default is
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="MaxJobs">MaxJobs</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
MaxJobs 100
|
||||
MaxJobs 9999
|
||||
MaxJobs 0
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>MaxJobs</CODE> directive controls the maximum number of jobs
|
||||
that are kept in memory. Once the number of jobs reaches the limit, the
|
||||
oldest completed job is automatically purged from the system to make room
|
||||
for the new one. If all of the known jobs are still pending or active then
|
||||
the new job will be rejected.
|
||||
|
||||
<P>Setting the maximum to 0 disables this functionality. The default
|
||||
setting is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="MaxJobsPerPrinter">MaxJobsPerPrinter</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
MaxJobsPerPrinter 100
|
||||
MaxJobsPerPrinter 9999
|
||||
MaxJobsPerPrinter 0
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>MaxJobsPerPrinter</CODE> directive controls the maximum number of active jobs
|
||||
that are allowed for each printer or class. Once a printer or class reaches the limit, new jobs will be
|
||||
rejected until one of the active jobs is completed, stopped, aborted, or cancelled.
|
||||
|
||||
<P>Setting the maximum to 0 disables this functionality. The default
|
||||
setting is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="MaxJobsPerUser">MaxJobsPerUser</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
MaxJobsPerUser 100
|
||||
MaxJobsPerUser 9999
|
||||
MaxJobsPerUser 0
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>MaxJobsPerUser</CODE> directive controls the maximum number of active jobs
|
||||
that are allowed for each user. Once a user reaches the limit, new jobs will be
|
||||
rejected until one of the active jobs is completed, stopped, aborted, or cancelled.
|
||||
|
||||
<P>Setting the maximum to 0 disables this functionality. The default
|
||||
setting is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="MaxLogSize">MaxLogSize</A></H3>
|
||||
<HR>
|
||||
@@ -1813,6 +2079,9 @@ MaxRequestSize 0
|
||||
print files, IPP requests, and HTML form data in HTTP POST requests. The
|
||||
default limit is 0 which disables the limit check.
|
||||
|
||||
<P>Also see the identical
|
||||
<A HREF="#LimitRequestBody"><CODE>LimitRequestBody</CODE></A> directive.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Order">Order</A></H3>
|
||||
<HR>
|
||||
@@ -1885,13 +2154,6 @@ Port 80
|
||||
Multiple <CODE>Port</CODE> lines can be specified to listen on multiple
|
||||
ports. The default port is 631.
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Port</CODE> directive will listen for connections on all
|
||||
network interfaces. To limit connections to a single interface use the
|
||||
<A HREF="#Listen"><CODE>Listen</CODE></A> directive with the interface
|
||||
address.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="PreserveJobHistory">PreserveJobHistory</A></H3>
|
||||
<HR>
|
||||
@@ -1949,20 +2211,39 @@ soon as each job is completed, cancelled, or aborted.
|
||||
<UL><PRE>
|
||||
Printcap
|
||||
Printcap /etc/printcap
|
||||
Printcap /etc/printers.conf
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>Printcap</CODE> directive controls whether or not a
|
||||
printcap file is automatically generated and updated with a list of
|
||||
available printers. If specified with no value (the default), then no
|
||||
printcap file will be generated.
|
||||
printcap file is automatically generated and updated with a list
|
||||
of available printers. If specified with no value, then no
|
||||
printcap file will be generated. The default is to generate a
|
||||
file named <VAR>/etc/printcap</VAR>.
|
||||
|
||||
<P>When a filename is specified (e.g. <VAR>/etc/printcap</VAR>), the
|
||||
printcap file is written whenever a printer is added or removed. The
|
||||
printcap file can then be used by applications that are hardcoded to
|
||||
look at the printcap file for the available printers.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Printcap">PrintcapFormat</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
PrintcapFormat BSD
|
||||
PrintcapFormat Solaris
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>PrintcapFormat</CODE> directive controls the output
|
||||
format of the printcap file. The default is to generate a BSD
|
||||
printcap file.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="RemoteRoot">RemoteRoot</A></H3>
|
||||
<HR>
|
||||
@@ -2020,6 +2301,32 @@ cache used by Raster Image Processor ("RIP") filters such as
|
||||
be suffixed with a "k" for kilobytes, "m" for megabytes, or
|
||||
"g" for gigabytes. The default cache size is "8m", or 8 megabytes.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="RunAsUser">RunAsUser</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
RunAsUser Yes
|
||||
RunAsUser No
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>RunAsUser</CODE> directive controls whether the
|
||||
scheduler runs as the unpriviledged user account (usually <CODE>lp</CODE>).
|
||||
The default is <CODE>No</CODE> which leaves the scheduler running as
|
||||
the <CODE>root</CODE> user.
|
||||
|
||||
<P><B>Note:</B> Running as a non-priviledged user may prevent
|
||||
LPD and locally connected printers from working due to
|
||||
permission problems. The <CODE>lpd</CODE> backend will
|
||||
automatically use a non-priviledged mode that is not 100%
|
||||
compliant with RFC 1179. The <CODE>parallel</CODE>,
|
||||
<CODE>serial</CODE>, and <CODE>usb</CODE> backends will need
|
||||
write access to the corresponding device files.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ServerAdmin">ServerAdmin</A></H3>
|
||||
<HR>
|
||||
@@ -2057,6 +2364,42 @@ assumed to be relative to the
|
||||
default executable directory is <VAR>/usr/lib/cups</VAR> or
|
||||
<VAR>/usr/lib32/cups</VAR> (IRIX 6.5).
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ServerCertificate">ServerCertificate</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
ServerCertificate /etc/cups/ssl/server.crt
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>ServerCertificate</CODE> directive specifies the
|
||||
location of the SSL certificate file used by the server when
|
||||
negotiating encrypted connections. The certificate must not be
|
||||
encrypted (password protected) since the scheduler normally runs
|
||||
in the background and will be unable to ask for a password.
|
||||
The default certificate file is <VAR>/etc/cups/ssl/server.crt</VAR>.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ServerKey">ServerKey</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
ServerKey /etc/cups/ssl/server.key
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>ServerKey</CODE> directive specifies the location
|
||||
of the SSL private key file used by the server when negotiating
|
||||
encrypted connections. The default key file is
|
||||
<VAR>/etc/cups/ssl/server.crt</VAR>.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="ServerName"></A>ServerName</H3>
|
||||
<HR>
|
||||
@@ -2091,6 +2434,44 @@ the server configuration and state files. It is also used to resolve
|
||||
relative paths in the <VAR>cupsd.conf</VAR> file. The default server
|
||||
directory is <VAR>/etc/cups</VAR>.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="SSLListen">SSLListen</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
SSLListen 127.0.0.1:443
|
||||
SSLListen 192.0.2.1:443
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>SSLListen</CODE> directive specifies a network
|
||||
address and port to listen for secure connections. Multiple
|
||||
<CODE>SSLListen</CODE> directives can be provided to listen on
|
||||
multiple addresses.
|
||||
|
||||
<P>The <CODE>SSLListen</CODE> directive is similar to the
|
||||
<A HREF="#SSLPort"><CODE>SSLPort</CODE></A> directive but allows
|
||||
you to restrict access to specific interfaces or networks.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="SSLPort">SSLPort</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
SSLPort 443
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>SSLPort</CODE> directive specifies a port to listen
|
||||
on for secure connections. Multiple <CODE>SSLPort</CODE> lines
|
||||
can be specified to listen on multiple ports.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="SystemGroup">SystemGroup</A></H3>
|
||||
<HR>
|
||||
@@ -2892,7 +3273,7 @@ would look like:
|
||||
Printer Description:MyPrinter@MyServer:\
|
||||
:pr=|/usr/bin/lp -d MyPrinter:\
|
||||
:op=daemon:\
|
||||
:pd=/etc/cups/ppd/MyPrinter.ppd
|
||||
:pd=/etc/cups/ppd/MyPrinter.ppd:
|
||||
</PRE></UL>
|
||||
|
||||
<!-- NEED 2in -->
|
||||
@@ -3774,9 +4155,9 @@ For more information please contact us at:
|
||||
<LI>WWW: <A HREF="http://www.easysw.com">
|
||||
<CODE>http://www.easysw.com</CODE></A>
|
||||
|
||||
<LI>EMail: <A HREF="mailto:support@easysw.com">support@easysw.com</A>
|
||||
<LI>EMail: <A HREF="mailto:info@easysw.com">info@easysw.com</A>
|
||||
|
||||
<LI>Telephone (M-F, 9-5 EST): +1.301.373.9603
|
||||
<LI>Telephone (M-F, 9-5 EST): +1.301.373.9600
|
||||
|
||||
</UL>
|
||||
|
||||
|
||||
+16
-7
@@ -2,11 +2,11 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<TITLE> CUPS Software Design Description</TITLE>
|
||||
<META NAME="AUTHOR" CONTENT="Easy Software Products">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-SDD-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
|
||||
<STYLE>
|
||||
<META NAME="author" CONTENT="Easy Software Products">
|
||||
<META NAME="copyright" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="docnumber" CONTENT="CUPS-SDD-1.1">
|
||||
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-8859-1">
|
||||
<STYLE TYPE="text/css"><!--
|
||||
BODY { font-family: serif; font-size: 11.0pt }
|
||||
H1 { font-family: sans-serif; font-size: 20.0pt }
|
||||
H2 { font-family: sans-serif; font-size: 17.0pt }
|
||||
@@ -17,14 +17,14 @@ H6 { font-family: sans-serif; font-size: 8.0pt }
|
||||
SUB { font-size: 8.0pt }
|
||||
SUP { font-size: 8.0pt }
|
||||
PRE { font-size: 9.0pt }
|
||||
</STYLE>
|
||||
--></STYLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
<CENTER><A HREF="#CONTENTS"><IMG SRC="images/cups-large.gif" BORDER="0" WIDTH="100%"><BR>
|
||||
<H1> CUPS Software Design Description</H1></A><BR>
|
||||
CUPS-SDD-1.1<BR>
|
||||
Easy Software Products<BR>
|
||||
Copyright 1997-2000, All Rights Reserved<BR>
|
||||
Copyright 1997-2001, All Rights Reserved<BR>
|
||||
</CENTER>
|
||||
<HR>
|
||||
<H1 ALIGN="CENTER"><A NAME="CONTENTS">Table of Contents</A></H1>
|
||||
@@ -274,6 +274,15 @@ form: </P>
|
||||
<LI><CODE>parity=<I>even</I></CODE> - Sets even parity checking. </LI>
|
||||
<LI><CODE>parity=<I>odd</I></CODE> - Sets odd parity checking. </LI>
|
||||
<LI><CODE>parity=<I>none</I></CODE> - Turns parity checking off. </LI>
|
||||
<LI><CODE>flow=dtrdsr<I></I></CODE> - Turns DTR/DSR (hardware) flow
|
||||
control on. </LI>
|
||||
<LI><CODE>flow=hard<I></I></CODE> - Turns RTS/CTS (hardware) flow
|
||||
control on. </LI>
|
||||
<LI><CODE>flow=none<I></I></CODE> - Turns flow control off. </LI>
|
||||
<LI><CODE>flow=rtscts<I></I></CODE> - Turns RTS/CTS (hardware) flow
|
||||
control on. </LI>
|
||||
<LI><CODE>flow=xonxoff<I></I></CODE> - Turns XON/XOFF (software) flow
|
||||
control on. </LI>
|
||||
</UL>
|
||||
<H3><A NAME="3_1_5">3.1.5 socket</A></H3>
|
||||
<P>The socket backend sends the specified job to a network host using
|
||||
|
||||
Arquivo binário não exibido.
Alguns arquivos não foram exibidos porque demasiados arquivos foram alterados neste diff Mostrar Mais
Referência em uma Nova Issue
Bloquear um usuário