Comparar commits
1 Commits
| Autor | SHA1 | Data | |
|---|---|---|---|
 msweet
|
8047cace9b |
+22
-839
@@ -1,844 +1,6 @@
|
||||
CHANGES.txt - 01/24/2001
|
||||
CHANGES.txt - 03/13/2000
|
||||
------------------------
|
||||
|
||||
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 includ
|
||||
"-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.
|
||||
- RPM spec file changes.
|
||||
- Documentation updates.
|
||||
- Enabled pstoraster debug messages for everything
|
||||
(only logged when LogLevel set to "debug"...)
|
||||
- Changed the Input/OutputAttributes fix in
|
||||
pstoraster so that it works on all platforms.
|
||||
- The HP-GL/2 filter didn't set the right green
|
||||
color value in encoded polylines or text.
|
||||
- Updated the "fitplot" code to handle plot sizes
|
||||
specified as "PSwidth,length" and "PSlength,width".
|
||||
- Updated the Linux parallel and USB backends to open
|
||||
the device files prior to looking in /proc for
|
||||
autoprobe info. This makes sure that loadable device
|
||||
driver modules are in fact loaded...
|
||||
- Added new FilterLimit directive to limit the number
|
||||
of processing jobs/filters on a system.
|
||||
- set-job-attributes didn't change the job-state to
|
||||
held/pending when the job-hold-until attribute was
|
||||
specified.
|
||||
- set-job-attributes didn't save the new job attributes.
|
||||
- Now change the "requesting-user-name" attribute in
|
||||
requests from remote systems to "remroot" when an
|
||||
unauthenticated "root" user is sent. This can be
|
||||
changed using the new RemoteRoot directive in
|
||||
cupsd.conf.
|
||||
- The cancel-job, hold-job, release-job, and restart-job
|
||||
operations didn't log the authenticated username.
|
||||
- The cups-lpd mini-daemon now checks for a
|
||||
document-format option before forcing raw mode with
|
||||
filter mode 'l'.
|
||||
- The cups-lpd mini-daemon now supports "-o" options
|
||||
on the command-line (passed by inetd) to set global
|
||||
defaults for all print queues.
|
||||
- The pstops filter assumed that a file with a Trailer
|
||||
comment would also have an EOF comment.
|
||||
- Added new cupsSetPasswordCB(), cupsSetServer(),
|
||||
cupsSetUser(), and ippSetPort() functions to better
|
||||
support client applications (especially GUIs...)
|
||||
- The CUPS-add-class and CUPS-add-printer operations
|
||||
didn't reset the printer-name attribute on remote
|
||||
print queues that had to be renamed when a local
|
||||
printer was defined with the same name.
|
||||
- The lpoptions command now supports a "-r" option to
|
||||
remove options for a printer or instance.
|
||||
- The lpadmin and admin.cgi programs no longer allow
|
||||
class and printer names to begin with a number; this
|
||||
caused the command-line utilities to become confused.
|
||||
- The Linux USB backend now looks for both the parallel
|
||||
and usblp driver names in the device list.
|
||||
- Added a new FontPath directive to cupsd.conf, and also
|
||||
a "--with-fontpath" option for the configure script to
|
||||
specify alternate font paths for pstoraster.
|
||||
- The CUPS-move-job operation didn't update the
|
||||
job-printer-uri attribute.
|
||||
- The scheduler only looked up printers and classes by
|
||||
name in IPP requests, instead of using the full URI.
|
||||
This caused problems with KUPS and friends with
|
||||
remote printers.
|
||||
- The scheduler now handles better localization of
|
||||
hostnames (e.g. server is host.foo.com, remote is
|
||||
host.subfoo.foo.com, localized is not host.subfoo...)
|
||||
- The scheduler logging functions now use a common
|
||||
log file checking/rotation function (courtesy of
|
||||
Crutcher Dunnavant at Red Hat)
|
||||
- The scheduler could accept more client connections
|
||||
than it allocated for if more than one Port or Listen
|
||||
line was present in cupsd.conf.
|
||||
- Other minor scheduler performance tweeks.
|
||||
- The lpq and lprm commands didn't support the default
|
||||
printer set using lpoptions.
|
||||
- The lpoptions command now supports a "-l" option to
|
||||
list the printer-specific options and their current
|
||||
settings.
|
||||
- The web printer and class lists now show a link to the
|
||||
default printer or class at the top of the page.
|
||||
- The text filter now supports pretty printing of shell
|
||||
and perl scripts as well as C/C++ source files.
|
||||
- The top and bottom margins were reversed for landscape
|
||||
text printing.
|
||||
- The lpq and lprm commands didn't understand printer
|
||||
instances.
|
||||
- The scheduler only selected on the first 100 file
|
||||
descriptors instead of the maximum file descriptor
|
||||
limit.
|
||||
- The scheduler client, listener, and mainline functions
|
||||
now share code to disable and enable monitoring for
|
||||
new client connections.
|
||||
- The imagetoraster filter didn't support all of the
|
||||
required pagedevice parameters.
|
||||
- The serial backend now checks for 100 serial ports
|
||||
under Linux.
|
||||
- The scheduler used sscanf() to pull out the remote
|
||||
printer location, description, and make/model strings,
|
||||
but if any of these options was empty then sscanf()
|
||||
would stop processing.
|
||||
- Added "debug2" log level to provide a little less
|
||||
verbose debugging information at the "debug" level.
|
||||
- The scheduler would crash if you stopped a printer
|
||||
that was currently printing a job.
|
||||
- The scheduler incorrectly allowed jobs in the cancelled,
|
||||
aborted, or completed state to be cancelled.
|
||||
- The image filters did not load TIFF images properly
|
||||
for bottom-to-top and right-to-left orientations.
|
||||
- Added new cupsEncodeOptions() function to encode
|
||||
CUPS options as IPP job attributes.
|
||||
- The IPP backend, LPD mini-daemon, client commands,
|
||||
and CUPS API did not properly encode multiple
|
||||
option values separated by commas.
|
||||
- Added new scheduler malloc logging in debug mode
|
||||
(provides summary of total arena size, allocated,
|
||||
and free bytes once a minute)
|
||||
- The EPM-based distributions didn't install the
|
||||
correct symlinks for a few man pages.
|
||||
- Fixed a memory leak in the scheduler - wasn't
|
||||
freeing old filters when deleting or renaming
|
||||
printers.
|
||||
- The scheduler now queries the primary IP address
|
||||
for the name of the server and maps any incoming
|
||||
requests from that address to the server name.
|
||||
This fixes web admin mapping problems from
|
||||
server.domain.com to localhost.
|
||||
- The web printer modify interface now remembers
|
||||
the previous device and driver settings (except
|
||||
for serial ports.)
|
||||
- The job-k-octets attribute is now stored as part of
|
||||
the job attributes; this preserves the information
|
||||
after a job is completed when job file history is
|
||||
turned off.
|
||||
- Dropped option sub-group parsing code for the moment,
|
||||
since many Xerox PPD files abuse this feature in PPD
|
||||
files and don't follow the hierarchy rules.
|
||||
- Added new wrapper code around options so that duplex
|
||||
options for some HP printers don't prevent prints.
|
||||
- Added support for Digital UNIX/Tru64 UNIX/OSF/1 format
|
||||
for "lpstat -v" output.
|
||||
- Now show the URI for remote printers instead of
|
||||
/dev/null in "lpstat -v" output.
|
||||
- Creating classes and adding printers to a class with
|
||||
the lpadmin command didn't work.
|
||||
- The banner pages and test page should now format
|
||||
correctly in both portrait and landscape orientations.
|
||||
- Updated banner page substitution so that { can appear
|
||||
by itself without quoting.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1.2
|
||||
|
||||
- Makefile/configure fixes
|
||||
- RPM spec file and EPM list file fixes
|
||||
- The cupsTempFile() function now uses a different
|
||||
algorithm for generating temp files and "reserves"
|
||||
them to avoid possible security exploitation.
|
||||
- Now use /dev/random (if available) to seed the random
|
||||
number generator for certificates.
|
||||
- The /var/spool/cups and /var/spool/cups/tmp directories
|
||||
were incorrectly owned by root; they are now owned by
|
||||
the filter user, typically "lp".
|
||||
- The scheduler now resets the permissions on the spool
|
||||
and temp directories as needed to match the filter
|
||||
user.
|
||||
- Now expose ppdCollect() as an externally callable
|
||||
function.
|
||||
- The image filters now support filtering from the
|
||||
standard input.
|
||||
- The imagetoraster filter now collects all printer
|
||||
options and job patch files and applies them to the
|
||||
page header as needed.
|
||||
- Added format and banner options to LPD backend.
|
||||
- The send-document operation didn't start a job
|
||||
immediately when last-document was true.
|
||||
- The set-job-attributes operation didn't correctly
|
||||
replace the current job-hold-until value.
|
||||
- Removed the option wrapper code from ppdEmit() and
|
||||
friends since it caused problems with Ghostscript
|
||||
and many PS printers.
|
||||
- Was setting TZ environment variable twice for job
|
||||
filters.
|
||||
- Added syslog logging in cups-lpd to aide in
|
||||
debugging problems.
|
||||
- The HP-UX parallel port backend did not list the
|
||||
available parallel ports on some systems (printf
|
||||
calling problem...)
|
||||
- The lp and lpr commands overrode user options if
|
||||
-d/-P were specified after -o.
|
||||
- The scheduler would crash with a */* filter.
|
||||
- Added support for a "default" filter for unknown file
|
||||
types. The example provided in the mime.types and
|
||||
mime.convs file prints unknown files as if "-oraw" was
|
||||
specified for the job. This functionality is disabled
|
||||
by default.
|
||||
- The "compatibility" mode fix for older backends did not
|
||||
work for smbspool. Added a workaround for it.
|
||||
- The HP-GL/2 filter didn't perform the right pen scaling
|
||||
with some files and the "fitplot" option.
|
||||
- New Software Performance Specification document that
|
||||
describes the memory, disk, and CPU usage of all the
|
||||
CUPS software.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1.1
|
||||
|
||||
- The pstoraster Makefile still referenced one of the
|
||||
old PDF filter files.
|
||||
- The filter Makefile used INSTALL_DATA instead of
|
||||
INSTALL_LIB to install the CUPS image library.
|
||||
- The administration CGI didn't work properly with
|
||||
network devices.
|
||||
- The BrowseACL variable was not updated after the
|
||||
cupsd.conf file was loaded.
|
||||
- The lpd mini-daemon didn't support printer instances.
|
||||
- Now use a default umask of 077 for child processes.
|
||||
- Now put temp files in /var/spool/cups/tmp for child
|
||||
processes and the root user, unless TMPDIR or TempDir
|
||||
is defined otherwise.
|
||||
- cupsGetPPD() no longer uses easy-to-guess filenames.
|
||||
- The CUPS-Delete-Class and CUPS-Delete-Printer
|
||||
operations now save classes.conf file as needed.
|
||||
- The lppasswd command wouldn't add a user.
|
||||
- The ppdOpen() function could cause a segfault if a
|
||||
0-length PPD file was read.
|
||||
- The image filters were not handling images with
|
||||
different X and Y resolutions properly.
|
||||
- The imagetoraster filter defaulted to RGB output
|
||||
instead of black output like pstoraster.
|
||||
- The pstops filter didn't handle binary data properly.
|
||||
- The pstops filter didn't handle copies properly for
|
||||
PS files lacking DSC comments.
|
||||
- The pstops filter now appends %%EOF to the end of
|
||||
documents if they don't have it.
|
||||
- The cupsGetPPD() function didn't work with remote
|
||||
printers lacking the @server in the name.
|
||||
- The configure script didn't work right when only
|
||||
--prefix was specified.
|
||||
- The ppdEmit() code now wraps all printer commands so
|
||||
that buggy PostScript printers will still print a file
|
||||
after receiving an option that isn't available.
|
||||
- Fixed the DeskJet margin bug, and disabled 600dpi
|
||||
color mode until it can be fixed.
|
||||
- The cupsAddDest() function didn't sort instances
|
||||
correctly in all cases.
|
||||
- The time-at-xyz attributes now expand to the date and
|
||||
time in banner files.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1
|
||||
|
||||
- Documentation updates.
|
||||
- Configuration script updates.
|
||||
- Didn't map charset and language value strings to lowercase
|
||||
and _ to - as required by SLP and IPP.
|
||||
- ppdLoadXYZ() didn't add the list of available fonts to the
|
||||
ppd_file_t structure.
|
||||
- The text filter common code was freeing the PPD file data
|
||||
before it was used.
|
||||
- The text filter now embeds missing fonts.
|
||||
- The CGI interface now maps local access to the server to
|
||||
the localhost address.
|
||||
- The HP-GL/2 filter didn't use the specified (or default)
|
||||
color ranges, resulting in strange colors.
|
||||
- The HP-GL/2 filter didn't default to no input window, which
|
||||
caused unnecessary clipping of plots.
|
||||
- Integrated Xpdf's pdftops filter into CUPS, which is a
|
||||
lightweight and reliable replacement for Ghostscript's
|
||||
PDF support.
|
||||
- Removed all PDF support from Ghostscript.
|
||||
- Updated HP driver to set top margin; this seems to fix
|
||||
the offset problem seen on HP DeskJet printers.
|
||||
- Fixed dependencies on the ZLIB and JPEG libraries in
|
||||
pstoraster.
|
||||
- The lpr command wasn't using the lpoptions defined by
|
||||
the user.
|
||||
- The lpr command would segfault if the CUPS server was
|
||||
not running.
|
||||
- The top-level makefile was not installing the CUPS
|
||||
initialization script. It now does so if it sees there
|
||||
is an init.d directory in /sbin, /etc/rc.d, or /etc.
|
||||
- "lpstat -v all" didn't work.
|
||||
- pstoraster would crash on some platforms doing the
|
||||
setpagedevice operator.
|
||||
- The web administration interface now allows you to set
|
||||
the default banner pages.
|
||||
- Images can now be positioned on the page using the new
|
||||
"position" option.
|
||||
- The AccessLog, ErrorLog, and PageLog directives now
|
||||
support "%s" to insert the server name.
|
||||
- Added a new BrowseShortNames directive to allow for
|
||||
short remote printer names ("printer" instead of
|
||||
"printer@server") when possible.
|
||||
- The scheduler could crash if given an invalid PPD file
|
||||
with no PageSize attributes.
|
||||
- Updated the serial, parallel, and usb backends to do
|
||||
multiple writes and ignore ioctl() errors as needed;
|
||||
this should fix problems with serial printing on old
|
||||
serial drivers and with the UltraSPARC parallel port
|
||||
driver under Solaris 2.7.
|
||||
- Now propagate LD_LIBRARY_PATH to child processes from
|
||||
cupsd.
|
||||
- New DataDir directive for installing in alternate
|
||||
locations.
|
||||
- New CUPS_SERVERROOT and CUPS_DATADIR environment
|
||||
variables to specify installation directories as
|
||||
needed.
|
||||
- Queued remote jobs recreate remote printers as needed
|
||||
when the scheduler is started.
|
||||
- Deleting a printer also purges all jobs on that
|
||||
printer.
|
||||
- Old job and control files that don't belong to a
|
||||
printer are automatically deleted.
|
||||
- Wasn't updating time-at-processing and
|
||||
time-at-completed attributes in job.
|
||||
- Didn't send required multiple-operation-time-out
|
||||
attribute in response to a get-printer-attributes
|
||||
request.
|
||||
- cups-lpd now supports options set with lpoptions.
|
||||
- The job-hold-until attribute is now provided with all
|
||||
jobs. For jobs that are not currently held the value
|
||||
is "no-hold".
|
||||
- The scheduler was not sending "unknown" values in IPP
|
||||
responses.
|
||||
- The lpoptions command now accumulates options from
|
||||
previous runs rather than replacing all options for a
|
||||
printer.
|
||||
- The IPP backend now switches to IPP/1.0 if a 1.1
|
||||
request fails.
|
||||
- The lpadmin and admin.cgi programs now validate new
|
||||
printer and class names.
|
||||
- The access_log file now includes the number of IPP bytes
|
||||
received in a POST request.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1b5
|
||||
|
||||
- Documentation updates.
|
||||
- The pstoraster filter didn't compile without the JPEG library.
|
||||
- The cupsd server didn't support the HTTP OPTIONS request
|
||||
method.
|
||||
- Dropped the "CLOSE" method supported by the cupsd server.
|
||||
(not defined in HTTP specification)
|
||||
- Makefile/configure script fixes.
|
||||
- Missing the job-restart template.
|
||||
- Added IPP test suite for testing.
|
||||
- Missing IPP documentation from binary distributions.
|
||||
- Fixed multiple-document handling code when last-document
|
||||
not specified.
|
||||
- Added more checks to IPP requests to prevent bad requests
|
||||
from getting through.
|
||||
- Not all of the Ghostscript error output was being sent to
|
||||
stderr.
|
||||
- The PostScript filter now added PJL commands to set the
|
||||
job name and display string, if supported.
|
||||
- The scheduler would crash if the browse socket could not
|
||||
be bound. Now disables browsing if port 631 (reserved for
|
||||
IPP) is being used by a misbehaving daemon.
|
||||
- The USB backend now looks for the older Linux 2.2.x USB
|
||||
printer device filenames as well as the newer ones.
|
||||
- The IPP backend now uses the UTF-8 charset exclusively,
|
||||
since apparently only CUPS handles more than US-ASCII and
|
||||
UTF-8...
|
||||
- Wasn't quoting ( in PostScript banners...
|
||||
- Send-document requests with no document-format attribute
|
||||
could cause cupsd to crash.
|
||||
- Old jobs in the spool directory might cause cupsd to
|
||||
crash.
|
||||
- CUPS now supports all of the recommended job-hold-until
|
||||
keywords as well as name values of the form "HH:MM" and
|
||||
"HH:MM:SS".
|
||||
- Added placeholder pointer for TLS encryption to the HTTP
|
||||
connection structure.
|
||||
- Fixed the "fast poll" bug reported by DISA - the
|
||||
status pipe wasn't being closed for multi-file jobs.
|
||||
- Revamped put_params code in pstoraster to fix bitmap
|
||||
allocation bug with FrameMaker output.
|
||||
- Ripped out filename, etc. code from pstoraster as it
|
||||
is a potential security hole.
|
||||
- Added support for RIP_CACHE environment variable in the
|
||||
new pstoraster.
|
||||
- Fixed USB device filenames for Linux; now support new
|
||||
pre-2.4 devices (/dev/usb/lp#) and 2.2 devices
|
||||
(/dev/usblp#)
|
||||
- Fixed accept-jobs crash with classes.
|
||||
- Didn't include dot-matrix EPSON drivers in previous
|
||||
release.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1b4
|
||||
|
||||
- Documentation updates.
|
||||
- Many makefile and configuration script fixes (should
|
||||
now compile better under *BSD.)
|
||||
- The MediaPosition attribute was being mishandled by
|
||||
GhostScript, causing the RIP to fail whenever a paper
|
||||
tray was selected.
|
||||
- The scheduler now logs the final line of log information
|
||||
from a filter, even if it doesn't end with a newline; this
|
||||
primarily affects GhostScript error output.
|
||||
- The scheduler was saving implicit classes, so after a few
|
||||
restarts you'll end up with AnyPrinter, AnyAnyPrinter, etc.
|
||||
- The JPEG autodetection didn't work with some JPEG files that
|
||||
came from digital cameras (JPEG but not JFIF); the new
|
||||
magic types should work with all images that the JPEG library
|
||||
can handle.
|
||||
- Fixed a bug in the new contains() MIME type rule that could
|
||||
cause cupsd to crash.
|
||||
- Switched to using strtol() in the MIME type code so that you
|
||||
can use hex, octal, or decimal constants as desired in the
|
||||
mime.types file.
|
||||
- Banner files are now treated as templates, allowing any type
|
||||
of file to be used as a banner.
|
||||
- Added a 30-second timeout to backend device reports so that a
|
||||
hung backend will not prevent the scheduler from starting.
|
||||
- Backends are once again terminated when jobs are stopped; the
|
||||
CUPS-supplied backends will stay alive until the downstream
|
||||
filters have had a chance to clear out old page data.
|
||||
- The charset lookup in the CUPS localization support was wrong
|
||||
(iso8859-x instead of iso-8859-x)
|
||||
- Changed the "cpNNNN" code page files to "windows-NNNN" to match
|
||||
the IANA registrations.
|
||||
- New PostScript banner pages.
|
||||
- Added Windows BMP and Alias PIX image file support to the image
|
||||
filter.
|
||||
- The PNG reading coded didn't free all of its buffers.
|
||||
- Added Digest authentication support to the client and server
|
||||
code.
|
||||
- Added Solaris options to System V commands.
|
||||
- Now support the output-bin job template attribute.
|
||||
- Now log the job-billing attribute in the page_log file, and
|
||||
keep track of the total number of pages in the
|
||||
job-media-sheets-completed attribute.
|
||||
- The penwidth option is now in micrometers to support more
|
||||
accurate width specification.
|
||||
- The image filters now support interlaced and transparent PNG
|
||||
files.
|
||||
- Didn't handle Keep-Alive for HTTP/1.0 clients.
|
||||
- The BrowsePoll support didn't handle when BrowseInterval
|
||||
was set to 0 (now uses 30 seconds if BrowseInterval is 0)
|
||||
- The DeskJet driver now supports 600 DPI color for printers
|
||||
that support it.
|
||||
- New lpinfo and lpmove commands.
|
||||
- The lpq command now supports the Digital UNIX output format.
|
||||
- The LPD mini-daemon now supports all required LPD operations.
|
||||
- Implemented timeouts for multi-file documents.
|
||||
- New cupsPrintFiles() function in the CUPS API library to
|
||||
print multiple files using create-job and send-document
|
||||
requests (1 job ID for multiple files)
|
||||
- The lp command now sends multiple files as a single job,
|
||||
matching the behavior of the System V command.
|
||||
- The "cancel -a" command now purges job history files.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1b3
|
||||
|
||||
- Documentation updates.
|
||||
- The startup script redirected stderr before stdout,
|
||||
which caused problems with some versions of Bourne
|
||||
shell and Bash.
|
||||
- Fixed a bug in the scheduler's PPD language reading
|
||||
code.
|
||||
- Fixed a bug in the scheduler's check for the
|
||||
manufacturer in the PPD.
|
||||
- The pstoraster filter didn't allow some input and
|
||||
output attributes to be set.
|
||||
- Added banner page support.
|
||||
- Added missing PAM configuration file.
|
||||
- Configuration script fixes for Linux and *BSD.
|
||||
- The log file code was using the wrong sign for the
|
||||
timezone offset.
|
||||
- The default printcap file is now empty (no printcap
|
||||
file is generated).
|
||||
- The scheduler did not start jobs destined for remote
|
||||
printers when they became available.
|
||||
- The scheduler now sends jobs to remote printers
|
||||
immediately. (when sending jobs to a class, the remote
|
||||
printer is only used when it becomes available)
|
||||
- The scheduler now supports printing of banner pages
|
||||
via the job-sheets attribute (banner files go in
|
||||
/usr/share/cups/banners)
|
||||
- The cupsd process now forks itself into the background
|
||||
(override with -f)
|
||||
- Added several *BSD enhancements.
|
||||
- Added UNSUPPORTED libtool option to configuration
|
||||
script to allow the use of libtool. Note that this is
|
||||
UNSUPPORTED by us, but added by request of the *BSD
|
||||
folks.
|
||||
- The parallel, serial, and usb backends now retry the
|
||||
opening of their ports. This allows multiple print
|
||||
queues to be associated with a single physical port,
|
||||
and will allow CUPS to support several types of
|
||||
parallel port auto-switches in the near future.
|
||||
- Set-Job-Attributes now supports adding, changing, and
|
||||
deleting job template attributes, and no longer allows
|
||||
job-printer-uri to be set (see CUPS-Move-Job)
|
||||
- Added CUPS-Move-Job operation to support moving of jobs.
|
||||
- The CGI template functionality now supports multiple
|
||||
languages (still only have templates for English)
|
||||
- The CUPS-Get-Printers and CUPS-Get-Classes operations
|
||||
now support filtering as defined in the IDD.
|
||||
- The Get-Jobs, CUPS-Get-Printers, and CUPS-Get-Classes
|
||||
operations no longer limit themselves to 1000 jobs,
|
||||
printers, or classes (believe it or not, this is
|
||||
needed for some sites)
|
||||
- The web interfaces now support language-specific
|
||||
templates.
|
||||
- The web admin interface now supports class management.
|
||||
- The web admin interface now shows a list of
|
||||
manufacturers before selecting the PPD/driver for a
|
||||
specific printer.
|
||||
- The web admin interface now supports configuration of
|
||||
the default printer options in the PPD file.
|
||||
- The web interface now uses printer/class
|
||||
authentication for the test page instead of admin
|
||||
authentication.
|
||||
- Updated the RPM spec file for the current release.
|
||||
- Updated language support for Windows code pages.
|
||||
- 8-bit character set files can now use multiple fonts
|
||||
(needed for Arabic, Greek, Hebrew, etc.)
|
||||
- Added basic right-to-left text support in the text
|
||||
filter.
|
||||
- The POSIX locale now uses ISO-8859-1 instead of
|
||||
US-ASCII.
|
||||
- Fixed PDF printing problems.
|
||||
- Fixed PostScript RIP page device dictionary elements
|
||||
that weren't getting passed in cups_get_params().
|
||||
- Added a new "contains" rule for the magic file typing.
|
||||
- The "printable" rule now accepts characters from 128 to 255
|
||||
(needed for Microsoft character sets)
|
||||
- Added support for ~/.cupsrc as well as /etc/cups/client.conf
|
||||
so that the default server can be configured on a per-user
|
||||
basis without environment variables.
|
||||
- Added LPD mini-daemon to support incoming LPD jobs.
|
||||
|
||||
|
||||
CHANGES IN CUPS v1.1b2
|
||||
|
||||
- Documentation updates.
|
||||
@@ -1071,46 +233,67 @@ CHANGES IN CUPS v1.0.2
|
||||
CHANGES IN CUPS v1.0.1
|
||||
|
||||
- Documentation updates.
|
||||
|
||||
- Fixed a bunch of possible buffer-overflow conditions.
|
||||
|
||||
- The scheduler now supports authentication using PAM.
|
||||
|
||||
- Updated the Italian message file.
|
||||
|
||||
- httpEncode64() didn't add an extra "=" if there was
|
||||
only one byte in the last three-byte group.
|
||||
|
||||
- Now drop any trailing character set from the locale
|
||||
string (e.g. "en_US.ISO_8859-1" becomes "en_US")
|
||||
|
||||
- Fixed "timezone" vs "tm_gmtoff" usage for BSD-based
|
||||
operating systems.
|
||||
|
||||
- Updated IPP security so that "get" operations can be
|
||||
done from any resource name; this allows the CGIs to
|
||||
work with printer authentication enabled so long as
|
||||
authentication isn't turned on for the whole "site".
|
||||
|
||||
- The IPP code didn't properly handle the "unsupported"
|
||||
group; this caused problems with the HP JetDirect since
|
||||
it doesn't seem to support the "copies" attribute.
|
||||
|
||||
- The HTTP chunking code was missing a CR LF pair at the
|
||||
end of a 0-length chunk.
|
||||
|
||||
- The httpSeparate() function didn't handle embedded
|
||||
usernames and passwords in the URI properly.
|
||||
|
||||
- Doing "lpadmin -p printer -E" didn't restart printing
|
||||
if there were pending jobs.
|
||||
|
||||
- The cancel-job operation now requires either a
|
||||
requesting-user-name attribute or an authenticated
|
||||
username.
|
||||
|
||||
- The add-printer code did not report errors if the
|
||||
interface script or PPD file could not be renamed.
|
||||
|
||||
- Request files are now created without world read
|
||||
permissions.
|
||||
|
||||
- Added a cupsLastError() function to the CUPS API to
|
||||
retrieve the IPP error code from the last request.
|
||||
|
||||
- Options are now case-insensitive.
|
||||
|
||||
- The lpq command now provides 10 characters for the
|
||||
username instead of the original (Berkeley standard)
|
||||
7.
|
||||
|
||||
- The cancel command needed a local CUPS server to work
|
||||
(or the appropriate ServerName in cupsd.conf)
|
||||
|
||||
- The cancel and lprm commands didn't report the IPP
|
||||
error if the job could not be cancelled.
|
||||
|
||||
- The lp and lpr commands didn't intercept SIGTERM to
|
||||
remove temporary files when printing from stdin.
|
||||
|
||||
- The lp and lpr commands didn't report the IPP error if
|
||||
the job could not be printed.
|
||||
|
||||
@@ -1,133 +0,0 @@
|
||||
ENCRYPTION - CUPS v1.1.6 - 01/23/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.
|
||||
|
||||
|
||||
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
@@ -1,157 +0,0 @@
|
||||
INSTALL - CUPS v1.1.6 - 01/23/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.
|
||||
+13
-24
@@ -17,19 +17,19 @@ WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>
|
||||
|
||||
<H3>Introduction</H3>
|
||||
|
||||
<P>The Common UNIX Printing System<SUP>TM</SUP>, ("CUPS<SUP>TM</SUP>"),
|
||||
<P>The Common UNIX Printing System<SUP>TM</SUP>, or CUPS<SUP>TM</SUP>,
|
||||
is provided under the GNU General Public License ("GPL") and GNU
|
||||
Library General Public License ("LGPL"), Version 2. A copy of these
|
||||
licenses follow this introduction.
|
||||
|
||||
<P>The GNU LGPL applies to the CUPS API library, located in the "cups"
|
||||
subdirectory of the CUPS source distribution and in the
|
||||
"/usr/include/cups" directory and "libcups.a", "libcups.sl", or
|
||||
"libcups.so" files in the binary distributions.
|
||||
"/usr/include/cups" directory and "/usr/lib/libcups.so" or
|
||||
"/usr/lib32/libcups.so" files in the binary distributions.
|
||||
|
||||
<P>The GNU GPL applies to the remainder of the CUPS distribution,
|
||||
including the "pstoraster" filter which is based upon GNU Ghostscript
|
||||
5.50 and the "pdftops" filter which is based upon Xpdf 0.90.
|
||||
5.50.
|
||||
|
||||
<P>For those not familiar with the GNU GPL, the license basically
|
||||
allows you to:
|
||||
@@ -44,16 +44,15 @@ allows you to:
|
||||
<LI>Sell verbatim copies of the software for a media fee, or
|
||||
sell support for the software.
|
||||
|
||||
<LI>Distribute or sell printer drivers and filters that use
|
||||
CUPS so long as source code is made available under the GPL.
|
||||
<LI>Distribute or sell printer drivers and filters that use the
|
||||
CUPS API so long as source code is made available under the GPL.
|
||||
|
||||
</UL>
|
||||
|
||||
<P>What this license <B>does not</B> allow you to do is make changes or
|
||||
add features to CUPS and then sell a binary distribution without source
|
||||
code. You must provide source for any new drivers, changes, or
|
||||
additions to the software, and all code must be provided under the GPL
|
||||
or LGPL as appropriate.
|
||||
additions to the software, and all code must be provided under the GPL.
|
||||
|
||||
<P>The GNU LGPL relaxes the "link-to" restriction, allowing you to
|
||||
develop applications that use the CUPS API library under other licenses
|
||||
@@ -74,32 +73,22 @@ standards as the original.
|
||||
<P>Easy Software Products also sells rights to the CUPS source code
|
||||
under a binary distribution license for vendors that are unable to
|
||||
release source code for their drivers, additions, and modifications to
|
||||
CUPS under the GNU GPL and LGPL. For information please contact us at
|
||||
CUPS under the GNU GPL. For pricing information please contact us at
|
||||
the address shown above.
|
||||
|
||||
<P>The Common UNIX Printing System provides a "pstoraster" filter that
|
||||
utilizes the GNU GhostScript 5.50 core to convert PostScript files into
|
||||
a stream of raster images. For binary distribution licensing of this
|
||||
software, please contact:
|
||||
utilizes GNU GhostScript 5.50 to convert PostScript files into a stream
|
||||
of raster images. For binary distribution licensing of this software,
|
||||
please contact:
|
||||
|
||||
<BLOCKQUOTE>
|
||||
Miles Jones<BR>
|
||||
<BLOCKQUOTE>Miles Jones<BR>
|
||||
Director of Marketing<BR>
|
||||
Artifex Software Inc.<BR>
|
||||
454 Las Gallinas Ave., Suite 108<BR>
|
||||
San Rafael, CA 94903 USA<BR>
|
||||
Voice: +1.415.492.9861<BR>
|
||||
Fax: +1.415.492.9862<BR>
|
||||
EMail: <A HREF="mailto:info@arsoft.com">info@arsoft.com</A>
|
||||
</BLOCKQUOTE>
|
||||
|
||||
<P>The "pdftops" filter is based on the Xpdf 0.90 software. For binary
|
||||
distribution licensing of this software, please contact:
|
||||
|
||||
<BLOCKQUOTE>
|
||||
Derek B. Noonburg<BR>
|
||||
Email: <A HREF="mailto:derekn@foolabs.com">derekn@foolabs.com</A><BR>
|
||||
WWW: <A HREF="http://www.foolabs.com/xpdf/">http://www.foolabs.com/xpdf/</A>
|
||||
EMail: info@arsoft.com
|
||||
</BLOCKQUOTE>
|
||||
|
||||
<H3>Support</H3>
|
||||
|
||||
+4
-22
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Common makefile definitions for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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
|
||||
@@ -31,7 +31,6 @@ AWK = @AWK@
|
||||
CC = @LIBTOOL@ @CC@
|
||||
CHMOD = @CHMOD@
|
||||
CP = @CP@
|
||||
CXX = @LIBTOOL@ @CXX@
|
||||
DSO = @DSO@
|
||||
HTMLDOC = @HTMLDOC@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
@@ -49,6 +48,7 @@ SHELL = /bin/sh
|
||||
#
|
||||
|
||||
INSTALL_BIN = $(LIBTOOL) $(CP)
|
||||
INSTALL_CAT = @INSTALL_CAT@
|
||||
INSTALL_DATA = $(CP)
|
||||
INSTALL_LIB = $(LIBTOOL) $(CP)
|
||||
INSTALL_MAN = $(CP)
|
||||
@@ -62,7 +62,6 @@ INSTALL_SYSV = @INSTALL_SYSV@
|
||||
LIBCUPS = @LIBCUPS@
|
||||
LIBCUPSIMAGE = @LIBCUPSIMAGE@
|
||||
LIBJPEG = @LIBJPEG@
|
||||
LIBMALLOC = @LIBMALLOC@
|
||||
LIBPNG = @LIBPNG@
|
||||
LIBTIFF = @LIBTIFF@
|
||||
LIBZ = @LIBZ@
|
||||
@@ -77,7 +76,6 @@ LIBZ = @LIBZ@
|
||||
|
||||
ARFLAGS = crvs
|
||||
CFLAGS = @CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
|
||||
CXXFLAGS = @CXXFLAGS@ $(OPTIM) -I.. $(OPTIONS)
|
||||
DSOLIBS = @DSOLIBS@
|
||||
IMGLIBS = @IMGLIBS@ -lm
|
||||
LDFLAGS = @LDFLAGS@ $(OPTIM)
|
||||
@@ -87,7 +85,6 @@ LIBS = $(LINKCUPS) $(NETLIBS) @LIBS@
|
||||
NETLIBS = @NETLIBS@
|
||||
OPTIM = @OPTIM@
|
||||
OPTIONS =
|
||||
SSLLIBS = @SSLLIBS@
|
||||
|
||||
#
|
||||
# Directories...
|
||||
@@ -122,8 +119,6 @@ BINDIR = @bindir@
|
||||
DATADIR = @CUPS_DATADIR@
|
||||
DOCDIR = @CUPS_DOCROOT@
|
||||
INCLUDEDIR = $(includedir)
|
||||
INITDIR = @INITDIR@
|
||||
INITDDIR = @INITDDIR@
|
||||
LIBDIR = $(libdir)
|
||||
LOCALEDIR = @CUPS_LOCALEDIR@
|
||||
LOGDIR = @CUPS_LOGDIR@
|
||||
@@ -134,32 +129,19 @@ SBINDIR = @sbindir@
|
||||
SERVERBIN = @CUPS_SERVERBIN@
|
||||
SERVERROOT = @CUPS_SERVERROOT@
|
||||
|
||||
CAT1EXT = @CAT1EXT@
|
||||
CAT5EXT = @CAT5EXT@
|
||||
CAT8EXT = @CAT8EXT@
|
||||
|
||||
#
|
||||
# Rules...
|
||||
#
|
||||
|
||||
.SILENT:
|
||||
.SUFFIXES: .a .c .cxx .h .man .o .0 .1 .5 .8 .z
|
||||
.SUFFIXES: .a .c .h .man .o .1 .5 .8
|
||||
.c.o:
|
||||
echo Compiling $<...
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
.cxx.o:
|
||||
echo Compiling $<...
|
||||
$(CXX) $(CXXFLAGS) -c $<
|
||||
.man.0 .man.1 .man.5 .man.8:
|
||||
.man.1 .man.5 .man.8:
|
||||
echo Formatting $<...
|
||||
$(RM) $@
|
||||
$(NROFF) -man $< >$@
|
||||
.man.z:
|
||||
echo Formatting $<...
|
||||
$(RM) $@ t.z
|
||||
$(NROFF) -man $< >t
|
||||
pack -f t
|
||||
$(MV) t.z $@
|
||||
|
||||
#
|
||||
# End of "$Id$"
|
||||
|
||||
+17
-48
@@ -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-1999 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,7 +28,7 @@ include Makedefs
|
||||
# Directories to make...
|
||||
#
|
||||
|
||||
DIRS = cups backend berkeley cgi-bin filter man pdftops pstoraster \
|
||||
DIRS = cups backend berkeley cgi-bin filter man pstoraster \
|
||||
scheduler systemv
|
||||
|
||||
#
|
||||
@@ -38,7 +38,7 @@ DIRS = cups backend berkeley cgi-bin filter man pdftops pstoraster \
|
||||
all:
|
||||
for dir in $(DIRS); do\
|
||||
echo Making all in $$dir... ;\
|
||||
(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
|
||||
(cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\
|
||||
done
|
||||
|
||||
#
|
||||
@@ -48,7 +48,7 @@ all:
|
||||
clean:
|
||||
for dir in $(DIRS); do\
|
||||
echo Cleaning in $$dir... ;\
|
||||
(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
|
||||
(cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\
|
||||
done
|
||||
|
||||
#
|
||||
@@ -58,69 +58,38 @@ clean:
|
||||
install:
|
||||
for dir in $(DIRS); do\
|
||||
echo Installing in $$dir... ;\
|
||||
(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
|
||||
(cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\
|
||||
done
|
||||
echo Installing in conf...
|
||||
(cd conf; $(MAKE) $(MFLAGS) install)
|
||||
(cd conf; $(MAKE) -$(MAKEFLAGS) install)
|
||||
echo Installing in data...
|
||||
(cd data; $(MAKE) $(MFLAGS) install)
|
||||
(cd data; $(MAKE) -$(MAKEFLAGS) install)
|
||||
echo Installing in doc...
|
||||
(cd doc; $(MAKE) $(MFLAGS) install)
|
||||
(cd doc; $(MAKE) -$(MAKEFLAGS) install)
|
||||
echo Installing in fonts...
|
||||
(cd fonts; $(MAKE) $(MFLAGS) install)
|
||||
(cd fonts; $(MAKE) -$(MAKEFLAGS) install)
|
||||
(cd fonts; $(MAKE) -$(MAKEFLAGS) install)
|
||||
echo Installing in locale...
|
||||
(cd locale; $(MAKE) $(MFLAGS) install)
|
||||
echo Installing in ppd...
|
||||
(cd ppd; $(MAKE) $(MFLAGS) install)
|
||||
(cd ppd; $(MAKE) -$(MAKEFLAGS) install)
|
||||
echo Installing in templates...
|
||||
(cd templates; $(MAKE) $(MFLAGS) install)
|
||||
echo Installing startup script...
|
||||
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; \
|
||||
$(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \
|
||||
$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
|
||||
$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
|
||||
ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
|
||||
$(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
|
||||
(cd templates; $(MAKE) -$(MAKEFLAGS) install)
|
||||
|
||||
#
|
||||
# Make software distributions using EPM (http://www.easysw.com/epm)...
|
||||
# Make a software distribution...
|
||||
#
|
||||
|
||||
EPMFLAGS = -v \
|
||||
BINDIR=$(BINDIR) DATADIR=$(DATADIR) \
|
||||
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
|
||||
epm -v cups
|
||||
|
||||
rpm:
|
||||
epm $(EPMFLAGS) -f rpm cups
|
||||
epm -v -f rpm cups
|
||||
|
||||
deb:
|
||||
epm $(EPMFLAGS) -f deb cups
|
||||
|
||||
depot:
|
||||
epm $(EPMFLAGS) -f depot cups
|
||||
|
||||
pkg:
|
||||
epm $(EPMFLAGS) -f pkg cups
|
||||
epm -v -f deb cups
|
||||
|
||||
tardist:
|
||||
epm $(EPMFLAGS) -f tardist cups
|
||||
epm -v -f tardist cups
|
||||
|
||||
#
|
||||
# End of "$Id$".
|
||||
|
||||
+124
-147
@@ -1,59 +1,71 @@
|
||||
README - CUPS v1.1.6 - 01/23/2001
|
||||
README - CUPS v1.1b4 - 05/12/2000
|
||||
---------------------------------
|
||||
|
||||
Looking for compile instructions? Read the file "INSTALL.txt"
|
||||
instead...
|
||||
************************************************************************
|
||||
************************************************************************
|
||||
**** ****
|
||||
**** BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE ****
|
||||
**** ****
|
||||
************************************************************************
|
||||
************************************************************************
|
||||
|
||||
This is an official public beta release for the Common UNIX Printing
|
||||
System. Since this is a beta release, we do not recommend that you
|
||||
use this software on a production system. Instead, please use the
|
||||
current 1.0.x release for your production systems.
|
||||
|
||||
Please report all problems in the CUPS 1.1 beta releases to
|
||||
"cups-beta@cups.org" or to the CUPS mailing list.
|
||||
|
||||
Thanks for using CUPS!
|
||||
|
||||
|
||||
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 file "INSTALL.txt".
|
||||
If you are installing from source you'll need an ANSI-compliant C
|
||||
compiler 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".
|
||||
|
||||
|
||||
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
|
||||
@@ -62,106 +74,67 @@ one of the binary distributions from Easy Software Products:
|
||||
- Solaris 2.5 or higher (SPARC or Intel)
|
||||
|
||||
|
||||
INSTALLING "PORTABLE" CUPS DISTRIBUTIONS
|
||||
INSTALLING CUPS
|
||||
|
||||
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 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.
|
||||
|
||||
|
||||
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.
|
||||
After asking you a few yes/no questions the CUPS software will be
|
||||
installed and the scheduler will be started automatically.
|
||||
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
|
||||
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:
|
||||
|
||||
@@ -197,67 +170,72 @@ 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 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.
|
||||
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. If
|
||||
you are running a version of Linux, be sure to provide the Linux
|
||||
distribution you have, too.
|
||||
|
||||
|
||||
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.
|
||||
|
||||
|
||||
LEGAL STUFF
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
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", "cups.license" file
|
||||
for more information.
|
||||
|
||||
For commercial licensing information, please contact:
|
||||
|
||||
@@ -270,7 +248,6 @@ For commercial licensing information, please contact:
|
||||
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 license from Artifex
|
||||
Software Inc. which handles commercial licensing of the Ghostscript
|
||||
software.
|
||||
|
||||
+2
-4
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Backend makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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
|
||||
@@ -41,7 +41,7 @@ all: $(TARGETS)
|
||||
#
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(TARGETS) http
|
||||
$(RM) $(OBJS) $(TARGETS)
|
||||
|
||||
|
||||
#
|
||||
@@ -50,8 +50,6 @@ clean:
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(SERVERBIN)/backend
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)/backend
|
||||
$(INSTALL_BIN) $(BACKENDS) $(SERVERBIN)/backend
|
||||
$(RM) $(SERVERBIN)/backend/http
|
||||
$(LN) ipp $(SERVERBIN)/backend/http
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Backend test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
|
||||
+131
-124
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
@@ -54,6 +54,10 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
char *argv[]) /* I - Command-line arguments */
|
||||
{
|
||||
int i; /* Looping var */
|
||||
int n, n2; /* Attribute values */
|
||||
char *option, /* Name of option */
|
||||
*s; /* Pointer into option value */
|
||||
const char *val; /* Pointer to option value */
|
||||
int num_options; /* Number of printer options */
|
||||
cups_option_t *options; /* Printer options */
|
||||
char method[255], /* Method in URI */
|
||||
@@ -69,13 +73,9 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
FILE *fp; /* File to print */
|
||||
http_t *http; /* HTTP connection */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response, /* IPP response */
|
||||
*supported; /* get-printer-attributes response */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *job_id; /* job-id 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 */
|
||||
@@ -86,23 +86,10 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
struct sigaction action; /* Actions for POSIX signals */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
int version; /* IPP version */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
char *s;
|
||||
|
||||
if ((s = strrchr(argv[0], '/')) != NULL)
|
||||
s ++;
|
||||
else
|
||||
@@ -215,12 +202,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* don't support the copies attribute...
|
||||
*/
|
||||
|
||||
language = cupsLangDefault();
|
||||
charset_sup = NULL;
|
||||
copies_sup = NULL;
|
||||
format_sup = NULL;
|
||||
version = 1;
|
||||
supported = NULL;
|
||||
language = cupsLangDefault();
|
||||
copies_sup = NULL;
|
||||
|
||||
do
|
||||
{
|
||||
@@ -229,16 +212,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
request->request.op.version[1] = version;
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, "utf-8");
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL,
|
||||
language != NULL ? language->language : "en");
|
||||
language != NULL ? language->language : "C");
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
@@ -262,7 +244,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Do the request...
|
||||
*/
|
||||
|
||||
for (response = NULL, ipp_status = IPP_BAD_REQUEST;;)
|
||||
for (;;)
|
||||
{
|
||||
/*
|
||||
* POST the request, retrying as needed...
|
||||
@@ -299,15 +281,12 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
while ((status = httpUpdate(http)) == HTTP_CONTINUE);
|
||||
|
||||
if (supported)
|
||||
ippDelete(supported);
|
||||
|
||||
if (status == HTTP_OK)
|
||||
{
|
||||
supported = ippNew();
|
||||
ippRead(http, supported);
|
||||
response = ippNew();
|
||||
ippRead(http, response);
|
||||
|
||||
ipp_status = supported->request.status.status_code;
|
||||
ipp_status = response->request.status.status_code;
|
||||
|
||||
if (ipp_status > IPP_OK_CONFLICT)
|
||||
{
|
||||
@@ -317,24 +296,14 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
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(supported, "copies-supported",
|
||||
else if ((copies_sup = ippFindAttribute(response, "copies-supported",
|
||||
IPP_TAG_RANGE)) != NULL)
|
||||
{
|
||||
/*
|
||||
@@ -346,35 +315,22 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
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);
|
||||
}
|
||||
ippDelete(response);
|
||||
}
|
||||
else
|
||||
{
|
||||
supported = NULL;
|
||||
response = NULL;
|
||||
|
||||
if (status == HTTP_ERROR)
|
||||
{
|
||||
fprintf(stderr, "WARNING: Did not receive the IPP supported (%d)\n",
|
||||
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);
|
||||
fprintf(stderr, "ERROR: Validate request was not accepted (%d)!\n", status);
|
||||
ipp_status = IPP_FORBIDDEN;
|
||||
}
|
||||
}
|
||||
@@ -393,8 +349,6 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
return (1);
|
||||
}
|
||||
else if (ipp_status > IPP_OK_CONFLICT)
|
||||
httpReconnect(http);
|
||||
}
|
||||
while (ipp_status > IPP_OK_CONFLICT);
|
||||
|
||||
@@ -425,43 +379,6 @@ 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...
|
||||
*/
|
||||
@@ -473,16 +390,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
request->request.op.version[1] = version;
|
||||
request->request.op.operation_id = IPP_PRINT_JOB;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, charset);
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL,
|
||||
language != NULL ? language->language : "en");
|
||||
language != NULL ? language->language : "C");
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
@@ -506,23 +422,120 @@ 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 && 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 (i < format_sup->num_values)
|
||||
num_options = cupsAddOption("document-format", content_type,
|
||||
num_options, &options);
|
||||
}
|
||||
|
||||
cupsEncodeOptions(request, num_options, options);
|
||||
cupsFreeOptions(num_options, options);
|
||||
if (cupsGetOption("raw", num_options, options) ||
|
||||
((content_type = getenv("CONTENT_TYPE")) != NULL &&
|
||||
strcasecmp(content_type, "application/vnd.cups-raw") == 0))
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/vnd.cups-raw");
|
||||
else if ((val = cupsGetOption("document-format", num_options, options)) != NULL)
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, val);
|
||||
else
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/octet-stream");
|
||||
|
||||
if (copies_sup)
|
||||
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
|
||||
|
||||
for (i = 0; i < num_options; i ++)
|
||||
{
|
||||
/*
|
||||
* Skip the "raw" option - handled above...
|
||||
*/
|
||||
|
||||
if (strcasecmp(options[i].name, "raw") == 0 ||
|
||||
strcasecmp(options[i].name, "document-format") == 0)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* 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, and option=MxN.
|
||||
*/
|
||||
|
||||
option = options[i].name;
|
||||
val = options[i].value;
|
||||
|
||||
if (*val == '\0')
|
||||
val = NULL;
|
||||
|
||||
if (val != NULL)
|
||||
{
|
||||
if (strcasecmp(val, "true") == 0 ||
|
||||
strcasecmp(val, "on") == 0 ||
|
||||
strcasecmp(val, "yes") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - true...
|
||||
*/
|
||||
|
||||
n = 1;
|
||||
val = "";
|
||||
}
|
||||
else if (strcasecmp(val, "false") == 0 ||
|
||||
strcasecmp(val, "off") == 0 ||
|
||||
strcasecmp(val, "no") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - false...
|
||||
*/
|
||||
|
||||
n = 0;
|
||||
val = "";
|
||||
}
|
||||
|
||||
n = strtol(val, &s, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (strncasecmp(option, "no", 2) == 0)
|
||||
{
|
||||
option += 2;
|
||||
n = 0;
|
||||
}
|
||||
else
|
||||
n = 1;
|
||||
|
||||
s = "";
|
||||
}
|
||||
|
||||
if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
|
||||
/*
|
||||
* String value(s)...
|
||||
*/
|
||||
ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
|
||||
else if (val != NULL)
|
||||
{
|
||||
/*
|
||||
* Numeric value, range, or resolution...
|
||||
*/
|
||||
|
||||
if (*s == '-')
|
||||
{
|
||||
n2 = strtol(s + 1, NULL, 0);
|
||||
ippAddRange(request, IPP_TAG_JOB, option, n, n2);
|
||||
}
|
||||
else if (*s == 'x')
|
||||
{
|
||||
n2 = strtol(s + 1, &s, 0);
|
||||
|
||||
if (strcasecmp(s, "dpc") == 0)
|
||||
ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
|
||||
else if (strcasecmp(s, "dpi") == 0)
|
||||
ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_INCH, n, n2);
|
||||
else
|
||||
ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
|
||||
}
|
||||
else
|
||||
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, option, n);
|
||||
}
|
||||
else
|
||||
/*
|
||||
* Boolean value...
|
||||
*/
|
||||
ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
|
||||
}
|
||||
|
||||
/*
|
||||
* Now fill in the HTTP request stuff...
|
||||
*/
|
||||
@@ -616,11 +629,8 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
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);
|
||||
@@ -669,9 +679,6 @@ 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...
|
||||
*/
|
||||
|
||||
+8
-112
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
@@ -60,8 +60,7 @@ 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);
|
||||
char *user, int copies);
|
||||
|
||||
|
||||
/*
|
||||
@@ -80,27 +79,11 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
hostname[1024], /* Hostname */
|
||||
username[255], /* Username info (not used) */
|
||||
resource[1024], /* Resource info (printer name) */
|
||||
*options, /* Pointer to options */
|
||||
name[255], /* Name of option */
|
||||
value[255], /* Value of option */
|
||||
*ptr, /* Pointer into name or value */
|
||||
filename[1024]; /* File to print */
|
||||
int port; /* Port number (not used) */
|
||||
int status; /* Status of LPD job */
|
||||
int banner; /* Print banner page? */
|
||||
int format; /* Print format */
|
||||
|
||||
|
||||
/*
|
||||
* 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\"");
|
||||
@@ -159,83 +142,6 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
httpSeparate(argv[0], method, username, hostname, &port, resource);
|
||||
|
||||
/*
|
||||
* See if there are any options...
|
||||
*/
|
||||
|
||||
banner = 0;
|
||||
format = 'l';
|
||||
|
||||
if ((options = strchr(resource, '?')) != NULL)
|
||||
{
|
||||
/*
|
||||
* Yup, terminate the device name string and move to the first
|
||||
* character of the options...
|
||||
*/
|
||||
|
||||
*options++ = '\0';
|
||||
|
||||
/*
|
||||
* Parse options...
|
||||
*/
|
||||
|
||||
while (*options)
|
||||
{
|
||||
/*
|
||||
* Get the name...
|
||||
*/
|
||||
|
||||
for (ptr = name; *options && *options != '=';)
|
||||
*ptr++ = *options++;
|
||||
*ptr = '\0';
|
||||
|
||||
if (*options == '=')
|
||||
{
|
||||
/*
|
||||
* Get the value...
|
||||
*/
|
||||
|
||||
options ++;
|
||||
|
||||
for (ptr = value; *options && *options != '+';)
|
||||
*ptr++ = *options++;
|
||||
*ptr = '\0';
|
||||
|
||||
if (*options == '+')
|
||||
options ++;
|
||||
}
|
||||
else
|
||||
value[0] = '\0';
|
||||
|
||||
/*
|
||||
* Process the option...
|
||||
*/
|
||||
|
||||
if (strcasecmp(name, "banner") == 0)
|
||||
{
|
||||
/*
|
||||
* Set the banner...
|
||||
*/
|
||||
|
||||
banner = !value[0] ||
|
||||
strcasecmp(value, "on") == 0 ||
|
||||
strcasecmp(value, "yes") == 0 ||
|
||||
strcasecmp(value, "true") == 0;
|
||||
}
|
||||
else if (strcasecmp(name, "format") == 0 && value[0])
|
||||
{
|
||||
/*
|
||||
* Set output format...
|
||||
*/
|
||||
|
||||
if (strchr("cdfglnoprtv", value[0]) != NULL)
|
||||
format = value[0];
|
||||
else
|
||||
fprintf(stderr, "ERROR: Unknown format character \"%c\"\n", value[0]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Queue the job...
|
||||
*/
|
||||
@@ -243,16 +149,14 @@ 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 */, atoi(argv[4]) /* copies */);
|
||||
|
||||
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 */, 1);
|
||||
|
||||
/*
|
||||
* Remove the temporary file if necessary...
|
||||
@@ -327,10 +231,7 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
char *printer, /* I - Printer/queue name */
|
||||
char *filename, /* I - File to print */
|
||||
char *user, /* I - Requesting user */
|
||||
char *title, /* I - Job title */
|
||||
int copies, /* I - Number of copies */
|
||||
int banner, /* I - Print LPD banner? */
|
||||
int format) /* I - Format specifier */
|
||||
int copies) /* I - Number of copies */
|
||||
{
|
||||
FILE *fp; /* Job file */
|
||||
char localhost[255]; /* Local host name */
|
||||
@@ -453,18 +354,13 @@ lpd_queue(char *hostname, /* I - Host to connect to */
|
||||
gethostname(localhost, sizeof(localhost));
|
||||
localhost[31] = '\0'; /* RFC 1179, Section 7.2 - host name < 32 chars */
|
||||
|
||||
snprintf(control, sizeof(control), "H%s\nP%s\nJ%s\n", localhost, user, title);
|
||||
snprintf(control, sizeof(control), "H%s\nP%s\n", localhost, user);
|
||||
cptr = control + strlen(control);
|
||||
|
||||
if (banner)
|
||||
{
|
||||
snprintf(cptr, sizeof(control) - (cptr - control), "L%s\n", user);
|
||||
cptr += strlen(cptr);
|
||||
}
|
||||
|
||||
while (copies > 0)
|
||||
{
|
||||
snprintf(cptr, sizeof(control) - (cptr - control), "%cdfA%03d%s\n", format,
|
||||
|
||||
snprintf(cptr, sizeof(control) - (cptr - control), "ldfA%03d%s\n",
|
||||
getpid() % 1000, localhost);
|
||||
cptr += strlen(cptr);
|
||||
copies --;
|
||||
|
||||
+29
-78
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Parallel port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,27 +86,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
FILE *fp; /* Print file */
|
||||
int copies; /* Number of copies to print */
|
||||
int fd; /* Parallel device */
|
||||
int wbytes; /* Number of bytes written */
|
||||
size_t nbytes, /* Number of bytes read */
|
||||
size_t nbytes, /* Number of bytes written */
|
||||
tbytes; /* Total number of bytes written */
|
||||
char buffer[8192], /* Output buffer */
|
||||
*bufptr; /* Pointer into buffer */
|
||||
char buffer[8192]; /* Output buffer */
|
||||
struct termios opts; /* Parallel port options */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
struct sigaction action; /* Actions for POSIX signals */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -236,24 +224,13 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Write the print data to the printer...
|
||||
*/
|
||||
|
||||
tbytes += nbytes;
|
||||
bufptr = buffer;
|
||||
|
||||
while (nbytes > 0)
|
||||
if (write(fd, buffer, nbytes) < nbytes)
|
||||
{
|
||||
if ((wbytes = write(fd, bufptr, nbytes)) < 0)
|
||||
if (errno == ENOTTY)
|
||||
wbytes = write(fd, bufptr, nbytes);
|
||||
|
||||
if (wbytes < 0)
|
||||
{
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
|
||||
nbytes -= wbytes;
|
||||
bufptr += wbytes;
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
else
|
||||
tbytes += nbytes;
|
||||
|
||||
if (argc > 6)
|
||||
fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
|
||||
@@ -279,16 +256,13 @@ 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 */
|
||||
char device[255]; /* Device filename */
|
||||
FILE *probe; /* /proc/parport/n/autoprobe file */
|
||||
char line[1024], /* Line from file */
|
||||
*delim, /* Delimiter in file */
|
||||
@@ -298,41 +272,9 @@ list_devices(void)
|
||||
|
||||
for (i = 0; i < 4; i ++)
|
||||
{
|
||||
/*
|
||||
* 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)
|
||||
close(fd);
|
||||
else
|
||||
sprintf(device, "/proc/parport/%d/autoprobe", i);
|
||||
if ((probe = fopen(device, "r")) != NULL)
|
||||
{
|
||||
sprintf(device, "/dev/par%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
close(fd);
|
||||
}
|
||||
|
||||
/*
|
||||
* Then try looking at the probe file...
|
||||
*/
|
||||
|
||||
sprintf(probefile, "/proc/parport/%d/autoprobe", i);
|
||||
if ((probe = fopen(probefile, "r")) == NULL)
|
||||
{
|
||||
/*
|
||||
* Linux 2.4 kernel has different path...
|
||||
*/
|
||||
|
||||
sprintf(probefile, "/proc/sys/dev/parport/parport%d/autoprobe", i);
|
||||
probe = fopen(probefile, "r");
|
||||
}
|
||||
|
||||
if (probe != NULL)
|
||||
{
|
||||
/*
|
||||
* Found a probe file!
|
||||
*/
|
||||
|
||||
memset(make, 0, sizeof(make));
|
||||
memset(model, 0, sizeof(model));
|
||||
strcpy(model, "Unknown");
|
||||
@@ -369,13 +311,23 @@ list_devices(void)
|
||||
printf("direct parallel:/dev/lp%d \"%s\" \"Parallel Port #%d\"\n",
|
||||
i, model, i + 1);
|
||||
}
|
||||
else if (fd >= 0)
|
||||
else
|
||||
{
|
||||
/*
|
||||
* No probe file, but we know the port is there...
|
||||
*/
|
||||
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
sprintf(device, "/dev/lp%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(device, "/dev/par%d", i);
|
||||
if ((fd = open(device, O_WRONLY)) >= 0)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d\"\n", device, i + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#elif defined(__sgi)
|
||||
@@ -532,8 +484,7 @@ list_devices(void)
|
||||
{
|
||||
sprintf(device, "/dev/c%dt%dd0_lp", i, j);
|
||||
if (access(device, 0) == 0)
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n",
|
||||
device, i, j);
|
||||
printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d,%d\"\n", i, j);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -575,7 +526,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 */
|
||||
|
||||
+14
-178
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Serial port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,19 +38,12 @@
|
||||
#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 /* __linux */
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
#ifdef __sgi
|
||||
@@ -64,14 +57,6 @@
|
||||
# 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...
|
||||
@@ -104,29 +89,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
FILE *fp; /* Print file */
|
||||
int copies; /* Number of copies to print */
|
||||
int fd; /* Parallel device */
|
||||
int wbytes; /* Number of bytes written */
|
||||
size_t nbytes, /* Number of bytes read */
|
||||
size_t nbytes, /* Number of bytes written */
|
||||
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 */
|
||||
char buffer[8192]; /* Output buffer */
|
||||
struct termios opts; /* Parallel port options */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
struct sigaction action; /* Actions for POSIX signals */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -213,9 +184,6 @@ 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)
|
||||
{
|
||||
@@ -255,8 +223,6 @@ 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));
|
||||
@@ -287,18 +253,6 @@ 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;
|
||||
@@ -345,36 +299,6 @@ 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);
|
||||
@@ -401,9 +325,6 @@ 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 --;
|
||||
@@ -414,61 +335,20 @@ 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, bufsize, fp)) > 0)
|
||||
while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
|
||||
{
|
||||
/*
|
||||
* Write the print data to the printer...
|
||||
*/
|
||||
|
||||
tbytes += nbytes;
|
||||
bufptr = buffer;
|
||||
|
||||
while (nbytes > 0)
|
||||
if (write(fd, buffer, nbytes) < nbytes)
|
||||
{
|
||||
if ((wbytes = write(fd, bufptr, nbytes)) < 0)
|
||||
if (errno == ENOTTY)
|
||||
wbytes = write(fd, bufptr, nbytes);
|
||||
|
||||
if (wbytes < 0)
|
||||
{
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
|
||||
nbytes -= wbytes;
|
||||
bufptr += wbytes;
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
else
|
||||
tbytes += nbytes;
|
||||
|
||||
if (argc > 6)
|
||||
fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
|
||||
@@ -494,10 +374,8 @@ 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 */
|
||||
@@ -505,7 +383,7 @@ list_devices(void)
|
||||
char device[255]; /* Device filename */
|
||||
|
||||
|
||||
for (i = 0; i < 100; i ++)
|
||||
for (i = 0; i < 4; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/ttyS%d", i);
|
||||
if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
|
||||
@@ -542,7 +420,7 @@ list_devices(void)
|
||||
*/
|
||||
|
||||
for (n = 0; n < 6; n ++)
|
||||
printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"CDSIO Board %d Serial Port #%d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"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)
|
||||
@@ -557,7 +435,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=38400 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"EPC Serial Port %d, Ebus slot %d\"\n",
|
||||
n + i, n + 1, (int)inv->inv_controller);
|
||||
}
|
||||
else if (inv->inv_state > 1)
|
||||
@@ -567,7 +445,7 @@ list_devices(void)
|
||||
*/
|
||||
|
||||
for (n = 0; n < (int)inv->inv_state; n ++)
|
||||
printf("serial serial:/dev/ttyd%d?baud=38400 \"Unknown\" \"Onboard Serial Port %d\"\n",
|
||||
printf("serial serial:/dev/ttyd%d?baud=19200 \"Unknown\" \"Onboard Serial Port %d\"\n",
|
||||
n + (int)inv->inv_unit + 1, n + (int)inv->inv_unit + 1);
|
||||
}
|
||||
else
|
||||
@@ -626,13 +504,8 @@ 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 */
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -728,7 +601,7 @@ list_devices(void)
|
||||
printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
|
||||
device, i + 1);
|
||||
}
|
||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
#elif defined(FreeBSD) || defined(OpenBSD) || defined(NetBSD)
|
||||
int i, j; /* Looping vars */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
@@ -810,43 +683,6 @@ 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
|
||||
}
|
||||
|
||||
|
||||
+7
-21
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* AppSocket backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,7 +69,6 @@ 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 */
|
||||
@@ -86,16 +85,6 @@ 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\"");
|
||||
@@ -148,7 +137,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\n",
|
||||
fprintf(stderr, "ERROR: Unable to locate printer \'%s\' - %s",
|
||||
hostname, strerror(errno));
|
||||
return (1);
|
||||
}
|
||||
@@ -163,7 +152,7 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
|
||||
while (copies > 0)
|
||||
{
|
||||
for (delay = 5;;)
|
||||
for (;;)
|
||||
{
|
||||
if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
|
||||
{
|
||||
@@ -179,16 +168,13 @@ 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 %d seconds...\n",
|
||||
hostname, delay);
|
||||
sleep(delay);
|
||||
|
||||
if (delay < 30)
|
||||
delay += 5;
|
||||
fprintf(stderr, "INFO: Network host \'%s\' is busy; will retry in 30 seconds...\n",
|
||||
hostname);
|
||||
sleep(30);
|
||||
}
|
||||
else
|
||||
{
|
||||
perror("ERROR: Unable to connect to printer (retrying in 30 seconds)");
|
||||
perror("ERROR: Unable to connect to printer");
|
||||
sleep(30);
|
||||
}
|
||||
}
|
||||
|
||||
+13
-85
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* USB port backend for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,27 +75,15 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
FILE *fp; /* Print file */
|
||||
int copies; /* Number of copies to print */
|
||||
int fd; /* Parallel device */
|
||||
int wbytes; /* Number of bytes written */
|
||||
size_t nbytes, /* Number of bytes read */
|
||||
size_t nbytes, /* Number of bytes written */
|
||||
tbytes; /* Total number of bytes written */
|
||||
char buffer[8192], /* Output buffer */
|
||||
*bufptr; /* Pointer into buffer */
|
||||
char buffer[8192]; /* Output buffer */
|
||||
struct termios opts; /* Parallel port options */
|
||||
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
|
||||
struct sigaction action; /* Actions for POSIX signals */
|
||||
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
|
||||
|
||||
|
||||
/*
|
||||
* Make sure status messages are not buffered...
|
||||
*/
|
||||
|
||||
setbuf(stderr, NULL);
|
||||
|
||||
/*
|
||||
* Check command-line...
|
||||
*/
|
||||
|
||||
if (argc == 1)
|
||||
{
|
||||
list_devices();
|
||||
@@ -225,24 +213,13 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */
|
||||
* Write the print data to the printer...
|
||||
*/
|
||||
|
||||
tbytes += nbytes;
|
||||
bufptr = buffer;
|
||||
|
||||
while (nbytes > 0)
|
||||
if (write(fd, buffer, nbytes) < nbytes)
|
||||
{
|
||||
if ((wbytes = write(fd, bufptr, nbytes)) < 0)
|
||||
if (errno == ENOTTY)
|
||||
wbytes = write(fd, bufptr, nbytes);
|
||||
|
||||
if (wbytes < 0)
|
||||
{
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
|
||||
nbytes -= wbytes;
|
||||
bufptr += wbytes;
|
||||
perror("ERROR: Unable to send print file to printer");
|
||||
break;
|
||||
}
|
||||
else
|
||||
tbytes += nbytes;
|
||||
|
||||
if (argc > 6)
|
||||
fprintf(stderr, "INFO: Sending print file, %u bytes...\n", tbytes);
|
||||
@@ -272,35 +249,15 @@ list_devices(void)
|
||||
int i; /* Looping var */
|
||||
int fd; /* File descriptor */
|
||||
char device[255]; /* Device filename */
|
||||
FILE *probe; /* /proc/bus/usb/devices file */
|
||||
FILE *probe; /* /proc/parport/n/autoprobe file */
|
||||
char line[1024], /* Line from file */
|
||||
*delim, /* Delimiter in file */
|
||||
make[IPP_MAX_NAME], /* Make from file */
|
||||
model[IPP_MAX_NAME]; /* Model from file */
|
||||
|
||||
|
||||
/*
|
||||
* First try opening one of the USB devices to load the driver
|
||||
* module as needed...
|
||||
*/
|
||||
|
||||
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 */
|
||||
|
||||
/*
|
||||
* Then look at the device list for the USB bus...
|
||||
*/
|
||||
|
||||
if ((probe = fopen("/proc/bus/usb/devices", "r")) != NULL)
|
||||
{
|
||||
/*
|
||||
* Scan the device list...
|
||||
*/
|
||||
|
||||
i = 0;
|
||||
|
||||
memset(make, 0, sizeof(make));
|
||||
@@ -335,25 +292,15 @@ list_devices(void)
|
||||
strncpy(model, line + 12, sizeof(model) - 1);
|
||||
}
|
||||
else if (strncmp(line, "I:", 2) == 0 &&
|
||||
(strstr(line, "Driver=printer") != NULL ||
|
||||
strstr(line, "Driver=usblp") != NULL) &&
|
||||
strstr(line, "Driver=printer") != NULL &&
|
||||
make[0] && model[0])
|
||||
{
|
||||
/*
|
||||
* We were processing a printer device; send the info out...
|
||||
*/
|
||||
|
||||
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);
|
||||
printf("direct usb:/dev/usb/usblp%d \"%s %s\" \"USB Printer #%d\"\n",
|
||||
i, make, model, i + 1);
|
||||
|
||||
i ++;
|
||||
|
||||
@@ -366,44 +313,25 @@ list_devices(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Just probe manually for USB devices...
|
||||
*/
|
||||
|
||||
for (i = 0; i < 8; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/usb/lp%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/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)
|
||||
{
|
||||
close(fd);
|
||||
printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
#elif defined(__sgi)
|
||||
#elif defined(__sun)
|
||||
#elif defined(__hpux)
|
||||
#elif defined(__osf)
|
||||
#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 */
|
||||
|
||||
|
||||
for (i = 0; i < 3; i ++)
|
||||
{
|
||||
sprintf(device, "/dev/ulpt%d", i);
|
||||
|
||||
+1
-3
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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
|
||||
@@ -49,10 +49,8 @@ clean:
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(BINDIR)
|
||||
$(CHMOD) ugo+rx $(BINDIR)
|
||||
$(INSTALL_BIN) lpq lpr lprm $(BINDIR)
|
||||
-$(MKDIR) $(SBINDIR)
|
||||
$(CHMOD) ugo+rx $(SBINDIR)
|
||||
$(INSTALL_BIN) lpc $(SBINDIR)
|
||||
|
||||
|
||||
|
||||
+10
-25
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpc" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -216,8 +216,7 @@ 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 */
|
||||
*jattr; /* Current job attribute */
|
||||
ipp_attribute_t *attr; /* Current attribute */
|
||||
cups_lang_t *language; /* Default language */
|
||||
char *printer, /* Printer name */
|
||||
*device; /* Device URI */
|
||||
@@ -229,13 +228,6 @@ 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));
|
||||
@@ -258,15 +250,11 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
|
||||
language = cupsLangDefault();
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
|
||||
"attributes-charset", NULL, cupsLangEncoding(language));
|
||||
attr = 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);
|
||||
|
||||
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
|
||||
"requested-attributes", sizeof(requested) / sizeof(requested[0]),
|
||||
NULL, requested);
|
||||
attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
|
||||
"attributes-natural-language", NULL, language->language);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
@@ -424,16 +412,13 @@ show_status(http_t *http, /* I - HTTP connection to server */
|
||||
|
||||
snprintf(printer_uri, sizeof(printer_uri),
|
||||
"ipp://localhost/printers/%s", printer);
|
||||
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");
|
||||
attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, printer_uri);
|
||||
|
||||
if ((jobs = cupsDoRequest(http, request, "/jobs/")) != NULL)
|
||||
{
|
||||
for (jattr = jobs->attrs; jattr != NULL; jattr = jattr->next)
|
||||
if (jattr->name && strcmp(jattr->name, "job-id") == 0)
|
||||
for (attr = jobs->attrs; attr != NULL; attr = attr->next)
|
||||
if (strcmp(attr->name, "job-id") == 0)
|
||||
jobcount ++;
|
||||
|
||||
ippDelete(jobs);
|
||||
|
||||
+9
-43
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpq" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -39,7 +39,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <config.h>
|
||||
#include <cups/cups.h>
|
||||
#include <cups/language.h>
|
||||
#include <cups/debug.h>
|
||||
@@ -66,41 +65,26 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
http_t *http; /* Connection to server */
|
||||
const char *dest, /* Desired printer */
|
||||
*user; /* Desired user */
|
||||
char *instance; /* Printer instance */
|
||||
int id, /* Desired job ID */
|
||||
interval, /* Reporting interval */
|
||||
longstatus; /* Show file details */
|
||||
int num_dests; /* Number of destinations */
|
||||
cups_dest_t *dests; /* Destinations */
|
||||
http_encryption_t encryption; /* Encryption? */
|
||||
|
||||
|
||||
/*
|
||||
* Connect to the scheduler...
|
||||
*/
|
||||
|
||||
if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
|
||||
{
|
||||
fputs("lpq: Unable to contact server!\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
http = httpConnect(cupsServer(), ippPort());
|
||||
|
||||
/*
|
||||
* Check for command-line options...
|
||||
*/
|
||||
|
||||
dest = NULL;
|
||||
dest = cupsGetDefault();
|
||||
user = NULL;
|
||||
id = 0;
|
||||
interval = 0;
|
||||
longstatus = 0;
|
||||
|
||||
num_dests = cupsGetDests(&dests);
|
||||
|
||||
for (i = 0; i < num_dests; i ++)
|
||||
if (dests[i].is_default)
|
||||
dest = dests[i].name;
|
||||
|
||||
for (i = 1; i < argc; i ++)
|
||||
if (argv[i][0] == '+')
|
||||
interval = atoi(argv[i] + 1);
|
||||
@@ -108,18 +92,6 @@ 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;
|
||||
@@ -128,9 +100,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
i ++;
|
||||
dest = argv[i];
|
||||
}
|
||||
|
||||
if ((instance = strchr(dest, '/')) != NULL)
|
||||
*instance = '\0';
|
||||
break;
|
||||
|
||||
case 'l' : /* Long status */
|
||||
@@ -139,8 +108,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
default :
|
||||
fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
|
||||
httpClose(http);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
@@ -173,7 +140,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
* Close the connection to the server and return...
|
||||
*/
|
||||
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
|
||||
return (0);
|
||||
@@ -383,7 +349,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 File(s) Total Size");
|
||||
puts("Rank Owner Job Files Total Size");
|
||||
#endif /* __osf__ */
|
||||
|
||||
jobcount ++;
|
||||
@@ -396,7 +362,7 @@ show_jobs(http_t *http, /* I - HTTP connection to server */
|
||||
strcpy(rankstr, "active");
|
||||
else
|
||||
{
|
||||
snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
|
||||
sprintf(rankstr, "%d%s", rank, ranks[rank % 10]);
|
||||
rank ++;
|
||||
}
|
||||
|
||||
@@ -413,15 +379,15 @@ show_jobs(http_t *http, /* I - HTTP connection to server */
|
||||
namestr[sizeof(namestr) - 1] = '\0';
|
||||
}
|
||||
|
||||
printf("%s: %-34.34s[job %d localhost]\n", jobuser, rankstr, jobid);
|
||||
printf(" %-40.40s%d bytes\n", namestr, jobsize);
|
||||
printf("%s: %-31s [job %d localhost]\n", jobuser, rankstr, jobid);
|
||||
printf(" %-31.31s %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("%-7s %-8.8s%-8d%-32.32s%d bytes\n", rankstr, jobuser,
|
||||
printf("%-6s %-10.10s %-15d %-27.27s %d bytes\n", rankstr, jobuser,
|
||||
jobid, jobname, jobsize);
|
||||
#endif /* __osf */
|
||||
|
||||
@@ -486,7 +452,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);
|
||||
|
||||
snprintf(uri, sizeof(uri), "ipp://localhost/printers/%s", dest);
|
||||
sprintf(uri, "ipp://localhost/printers/%s", dest);
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
|
||||
"printer-uri", NULL, uri);
|
||||
|
||||
|
||||
+52
-105
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lpr" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -33,8 +33,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <config.h>
|
||||
#include <cups/cups.h>
|
||||
|
||||
|
||||
@@ -65,17 +63,12 @@ int
|
||||
main(int argc, /* I - Number of command-line arguments */
|
||||
char *argv[]) /* I - Command-line arguments */
|
||||
{
|
||||
int i, j; /* Looping var */
|
||||
int i; /* Looping var */
|
||||
int job_id; /* Job ID */
|
||||
char *printer, /* Destination printer or class */
|
||||
*instance; /* Instance */
|
||||
const char *dest; /* Destination printer */
|
||||
const char *title; /* Job title */
|
||||
int num_copies; /* Number of copies per file */
|
||||
int num_files; /* Number of files to print */
|
||||
const char *files[1000]; /* Files to print */
|
||||
int num_dests; /* Number of destinations */
|
||||
cups_dest_t *dests, /* Destinations */
|
||||
*dest; /* Selected destination */
|
||||
int num_files; /* Number of files printed */
|
||||
int num_options; /* Number of options */
|
||||
cups_option_t *options; /* Options */
|
||||
int deletefile; /* Delete file after print? */
|
||||
@@ -87,9 +80,7 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
|
||||
deletefile = 0;
|
||||
printer = NULL;
|
||||
num_dests = 0;
|
||||
dests = NULL;
|
||||
dest = cupsGetDefault();
|
||||
num_options = 0;
|
||||
options = NULL;
|
||||
num_files = 0;
|
||||
@@ -99,15 +90,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
if (argv[i][0] == '-')
|
||||
switch (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 'i' : /* indent */
|
||||
case 'w' : /* width */
|
||||
if (argv[i][2] == '\0')
|
||||
@@ -134,17 +116,14 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
break;
|
||||
|
||||
case 'l' : /* Literal/raw */
|
||||
num_options = cupsAddOption("raw", "", num_options, &options);
|
||||
num_options = cupsParseOptions("raw", num_options, &options);
|
||||
break;
|
||||
|
||||
case 'p' : /* Prettyprint */
|
||||
num_options = cupsAddOption("prettyprint", "", num_options, &options);
|
||||
num_options = cupsParseOptions("prettyprint", num_options, &options);
|
||||
break;
|
||||
|
||||
case 'h' : /* Suppress burst page */
|
||||
num_options = cupsAddOption("job-sheets", "none", num_options, &options);
|
||||
break;
|
||||
|
||||
case 's' : /* Don't use symlinks */
|
||||
break;
|
||||
|
||||
@@ -158,26 +137,11 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
case 'P' : /* Destination printer or class */
|
||||
if (argv[i][2] != '\0')
|
||||
printer = argv[i] + 2;
|
||||
dest = argv[i] + 2;
|
||||
else
|
||||
{
|
||||
i ++;
|
||||
printer = argv[i];
|
||||
}
|
||||
|
||||
if ((instance = strrchr(printer, '/')) != NULL)
|
||||
*instance++ = '\0';
|
||||
|
||||
if (num_dests == 0)
|
||||
num_dests = cupsGetDests(&dests);
|
||||
|
||||
if ((dest = cupsGetDest(printer, instance, num_dests, dests)) != NULL)
|
||||
{
|
||||
for (j = 0; j < dest->num_options; j ++)
|
||||
if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
|
||||
num_options = cupsAddOption(dest->options[j].name,
|
||||
dest->options[j].value,
|
||||
num_options, &options);
|
||||
dest = argv[i];
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -216,71 +180,54 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
fprintf(stderr, "lpr: Unknown option \'%c\'!\n", argv[i][1]);
|
||||
return (1);
|
||||
}
|
||||
else if (num_files < 1000)
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Print a file...
|
||||
*/
|
||||
|
||||
files[num_files] = argv[i];
|
||||
num_files ++;
|
||||
|
||||
if (title == NULL)
|
||||
if (dest == NULL)
|
||||
{
|
||||
if ((title = strrchr(argv[i], '/')) != NULL)
|
||||
title ++;
|
||||
else
|
||||
title = argv[i];
|
||||
fputs("lpr: error - no default destination available.\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
num_files ++;
|
||||
if (title)
|
||||
job_id = cupsPrintFile(dest, argv[i], title, num_options, options);
|
||||
else
|
||||
{
|
||||
char *filename;
|
||||
|
||||
if ((filename = strrchr(argv[i], '/')) != NULL)
|
||||
filename ++;
|
||||
else
|
||||
filename = argv[i];
|
||||
|
||||
job_id = cupsPrintFile(dest, argv[i], filename, num_options, options);
|
||||
}
|
||||
|
||||
if (job_id < 1)
|
||||
{
|
||||
fprintf(stderr, "lpr: unable to print file \'%s\' - %s.\n",
|
||||
argv[i], ippErrorString(cupsLastError()));
|
||||
return (1);
|
||||
}
|
||||
else if (deletefile)
|
||||
unlink(argv[i]);
|
||||
}
|
||||
else
|
||||
fprintf(stderr, "lpr: Too many files - \"%s\"\n", argv[i]);
|
||||
|
||||
/*
|
||||
* See if we have any files to print; if not, print from stdin...
|
||||
* See if we printed anything; if not, print from stdin...
|
||||
*/
|
||||
|
||||
if (printer == NULL)
|
||||
if (num_files == 0)
|
||||
{
|
||||
if (num_dests == 0)
|
||||
num_dests = cupsGetDests(&dests);
|
||||
|
||||
for (j = 0, dest = dests; j < num_dests; j ++, dest ++)
|
||||
if (dest->is_default)
|
||||
{
|
||||
printer = dests[j].name;
|
||||
|
||||
for (j = 0; j < dest->num_options; j ++)
|
||||
if (cupsGetOption(dest->options[j].name, num_options, options) == NULL)
|
||||
num_options = cupsAddOption(dest->options[j].name,
|
||||
dest->options[j].value,
|
||||
num_options, &options);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (printer == NULL)
|
||||
{
|
||||
fputs("lpr: error - no default destination available.\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (num_files > 0)
|
||||
{
|
||||
job_id = cupsPrintFiles(printer, num_files, files, title, num_options, options);
|
||||
|
||||
if (deletefile)
|
||||
if (dest == NULL)
|
||||
{
|
||||
/*
|
||||
* Delete print files after printing...
|
||||
*/
|
||||
|
||||
for (i = 0; i < num_files; i ++)
|
||||
unlink(files[i]);
|
||||
fputs("lpr: error - no default destination available.\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
num_files = 1;
|
||||
|
||||
#ifndef WIN32
|
||||
# if defined(HAVE_SIGSET)
|
||||
@@ -317,23 +264,23 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
if (i == 0)
|
||||
{
|
||||
fputs("lpr: stdin is empty, so no job has been sent.\n", stderr);
|
||||
fputs("lpr: standard input is empty, so no job has been sent.\n", stderr);
|
||||
return (1);
|
||||
}
|
||||
|
||||
if (title)
|
||||
job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
|
||||
job_id = cupsPrintFile(dest, tempfile, title, num_options, options);
|
||||
else
|
||||
job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
|
||||
job_id = cupsPrintFile(dest, tempfile, "(stdin)", num_options, options);
|
||||
|
||||
unlink(tempfile);
|
||||
}
|
||||
|
||||
if (job_id < 1)
|
||||
{
|
||||
fprintf(stderr, "lpr: unable to print file: %s\n",
|
||||
ippErrorString(cupsLastError()));
|
||||
return (1);
|
||||
if (job_id < 1)
|
||||
{
|
||||
fprintf(stderr, "lpr: unable to print standard input - %s.\n",
|
||||
ippErrorString(cupsLastError()));
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
return (0);
|
||||
|
||||
+6
-43
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* "lprm" command for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -50,33 +50,22 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
int i; /* Looping var */
|
||||
int job_id; /* Job ID */
|
||||
const char *dest; /* Destination printer */
|
||||
char *instance; /* Pointer to instance name */
|
||||
char uri[1024]; /* Printer or job URI */
|
||||
ipp_t *request; /* IPP request */
|
||||
ipp_t *response; /* IPP response */
|
||||
ipp_op_t op; /* Operation */
|
||||
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;
|
||||
encryption = cupsEncryption();
|
||||
|
||||
num_dests = cupsGetDests(&dests);
|
||||
|
||||
for (i = 0; i < num_dests; i ++)
|
||||
if (dests[i].is_default)
|
||||
dest = dests[i].name;
|
||||
op = IPP_CANCEL_JOB;
|
||||
job_id = 0;
|
||||
dest = cupsGetDefault();
|
||||
response = NULL;
|
||||
http = NULL;
|
||||
|
||||
/*
|
||||
* Open a connection to the server...
|
||||
@@ -85,12 +74,9 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
|
||||
{
|
||||
fputs("lprm: Unable to contact server!\n", stderr);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
return (1);
|
||||
}
|
||||
|
||||
httpEncryption(http, encryption);
|
||||
|
||||
/*
|
||||
* Process command-line arguments...
|
||||
*/
|
||||
@@ -99,17 +85,6 @@ 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;
|
||||
@@ -118,15 +93,10 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
i ++;
|
||||
dest = argv[i];
|
||||
}
|
||||
|
||||
if ((instance = strchr(dest, '/')) != NULL)
|
||||
*instance = '\0';
|
||||
break;
|
||||
|
||||
default :
|
||||
fprintf(stderr, "lprm: Unknown option \'%c\'!\n", argv[i][1]);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
return (1);
|
||||
}
|
||||
else
|
||||
@@ -226,8 +196,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
else
|
||||
{
|
||||
fputs("lprm: Unable to cancel job(s)!\n", stderr);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
@@ -241,14 +209,9 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
if (!cupsCancelJob(dest, 0))
|
||||
{
|
||||
fputs("lprm: Unable to cancel job(s)!\n", stderr);
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
return (1);
|
||||
}
|
||||
|
||||
cupsFreeDests(num_dests, dests);
|
||||
httpClose(http);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@@ -50,8 +50,6 @@ clean:
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(SERVERBIN)/cgi-bin
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)
|
||||
$(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin
|
||||
$(INSTALL_BIN) $(TARGETS) $(SERVERBIN)/cgi-bin
|
||||
|
||||
|
||||
|
||||
+47
-275
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Administration CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,15 +23,6 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* main() - Main entry for CGI.
|
||||
* do_am_class() - Add or modify a class.
|
||||
* do_am_printer() - Add or modify a printer.
|
||||
* do_config_printer() - Configure the default options for a printer.
|
||||
* do_delete_class() - Delete a class...
|
||||
* do_delete_printer() - Delete a printer...
|
||||
* do_job_op() - Do a job operation.
|
||||
* do_printer_op() - Do a printer operation.
|
||||
* get_line() - Get a line that is terminated by a LF, CR, or CR LF.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -201,8 +192,6 @@ do_am_class(http_t *http, /* I - HTTP connection */
|
||||
ipp_attribute_t *attr; /* member-uris attribute */
|
||||
ipp_status_t status; /* Request status */
|
||||
char uri[HTTP_MAX_URI]; /* Device or printer URI */
|
||||
const char *name, /* Pointer to class name */
|
||||
*ptr; /* Pointer to CGI variable */
|
||||
|
||||
|
||||
if (cgiGetVariable("PRINTER_LOCATION") == NULL)
|
||||
@@ -258,27 +247,8 @@ do_am_class(http_t *http, /* I - HTTP connection */
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "add-class.tmpl", getenv("LANG"));
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
name = cgiGetVariable("PRINTER_NAME");
|
||||
if (isdigit(*name))
|
||||
ptr = name;
|
||||
else
|
||||
for (ptr = name; *ptr; ptr ++)
|
||||
if (!isalnum(*ptr) && *ptr != '_')
|
||||
break;
|
||||
|
||||
if (*ptr || ptr == name)
|
||||
{
|
||||
cgiSetVariable("ERROR", "The class name may only contain letters, "
|
||||
"numbers, and the underscore.");
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
|
||||
return;
|
||||
}
|
||||
|
||||
if (cgiGetVariable("MEMBER_URIS") == NULL)
|
||||
else if (cgiGetVariable("MEMBER_URIS") == NULL)
|
||||
{
|
||||
/*
|
||||
* Build a CUPS_GET_PRINTERS request, which requires the
|
||||
@@ -486,16 +456,13 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
ipp_attribute_t *attr, /* Current attribute */
|
||||
*last; /* Last attribute */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response, /* IPP response */
|
||||
*oldinfo; /* Old printer information */
|
||||
*response; /* IPP response */
|
||||
ipp_status_t status; /* Request status */
|
||||
const char *var; /* CGI variable */
|
||||
char uri[HTTP_MAX_URI], /* Device or printer URI */
|
||||
*uriptr; /* Pointer into URI */
|
||||
int maxrate; /* Maximum baud rate */
|
||||
char baudrate[255]; /* Baud rate string */
|
||||
const char *name, /* Pointer to class name */
|
||||
*ptr; /* Pointer to CGI variable */
|
||||
static int baudrates[] = /* Baud rates */
|
||||
{
|
||||
1200,
|
||||
@@ -511,52 +478,48 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
};
|
||||
|
||||
|
||||
if (modify)
|
||||
{
|
||||
/*
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the
|
||||
* following attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
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(uri, sizeof(uri), "ipp://localhost/printers/%s",
|
||||
cgiGetVariable("PRINTER_NAME"));
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
oldinfo = cupsDoRequest(http, request, "/");
|
||||
}
|
||||
else
|
||||
oldinfo = NULL;
|
||||
|
||||
if ((name = cgiGetVariable("PRINTER_NAME")) == NULL)
|
||||
if (cgiGetVariable("PRINTER_LOCATION") == NULL)
|
||||
{
|
||||
if (modify)
|
||||
{
|
||||
/*
|
||||
* Update the location and description of an existing printer...
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the
|
||||
* following attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
*/
|
||||
|
||||
if (oldinfo)
|
||||
ippSetCGIVars(oldinfo, NULL, NULL);
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
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(uri, sizeof(uri), "ipp://localhost/printers/%s",
|
||||
cgiGetVariable("PRINTER_NAME"));
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
if ((response = cupsDoRequest(http, request, "/")) != NULL)
|
||||
{
|
||||
ippSetCGIVars(response, NULL, NULL);
|
||||
ippDelete(response);
|
||||
}
|
||||
|
||||
/*
|
||||
* Update the location and description of an existing printer...
|
||||
*/
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "modify-printer.tmpl", getenv("LANG"));
|
||||
}
|
||||
@@ -568,29 +531,8 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "add-printer.tmpl", getenv("LANG"));
|
||||
}
|
||||
|
||||
if (oldinfo)
|
||||
ippDelete(oldinfo);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (isdigit(*name))
|
||||
ptr = name;
|
||||
else
|
||||
for (ptr = name; *ptr; ptr ++)
|
||||
if (!isalnum(*ptr) && *ptr != '_')
|
||||
break;
|
||||
|
||||
if (*ptr || ptr == name)
|
||||
{
|
||||
cgiSetVariable("ERROR", "The printer name may only contain letters, "
|
||||
"numbers, and the underscore.");
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "error.tmpl", getenv("LANG"));
|
||||
return;
|
||||
}
|
||||
|
||||
if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
|
||||
else if ((var = cgiGetVariable("DEVICE_URI")) == NULL)
|
||||
{
|
||||
/*
|
||||
* Build a CUPS_GET_DEVICES request, which requires the following
|
||||
@@ -629,32 +571,10 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
* Let the user choose...
|
||||
*/
|
||||
|
||||
if (oldinfo &&
|
||||
(attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
strncpy(uri, attr->values[0].string.text, sizeof(uri) - 1);
|
||||
uri[sizeof(uri) - 1] = '\0';
|
||||
if ((uriptr = strchr(uri, ':')) != NULL && strncmp(uriptr, "://", 3) == 0)
|
||||
*uriptr = '\0';
|
||||
|
||||
cgiSetVariable("CURRENT_DEVICE_URI", uri);
|
||||
}
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "choose-device.tmpl", getenv("LANG"));
|
||||
}
|
||||
else if (strchr(var, '/') == NULL)
|
||||
{
|
||||
if (oldinfo &&
|
||||
(attr = ippFindAttribute(oldinfo, "device-uri", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Set the current device URI for the form to the old one...
|
||||
*/
|
||||
|
||||
if (strncmp(attr->values[0].string.text, var, strlen(var)) == 0)
|
||||
cgiSetVariable("DEVICE_URI", attr->values[0].string.text);
|
||||
}
|
||||
|
||||
/*
|
||||
* User needs to set the full URI...
|
||||
*/
|
||||
@@ -686,50 +606,6 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
}
|
||||
else if ((var = cgiGetVariable("PPD_NAME")) == NULL)
|
||||
{
|
||||
if (modify)
|
||||
{
|
||||
/*
|
||||
* Get the PPD file...
|
||||
*/
|
||||
|
||||
FILE *fp; /* PPD file */
|
||||
char filename[1024]; /* PPD filename */
|
||||
ppd_file_t *ppd; /* PPD information */
|
||||
char buffer[1024]; /* Buffer */
|
||||
int bytes; /* Number of bytes */
|
||||
|
||||
|
||||
snprintf(uri, sizeof(uri), "/printers/%s.ppd", name);
|
||||
cupsTempFile(filename, sizeof(filename));
|
||||
|
||||
if (httpGet(http, uri))
|
||||
httpGet(http, uri);
|
||||
|
||||
while (httpUpdate(http) == HTTP_CONTINUE);
|
||||
|
||||
if ((fp = fopen(filename, "w")) != NULL)
|
||||
{
|
||||
while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
|
||||
fwrite(buffer, 1, bytes, fp);
|
||||
|
||||
fclose(fp);
|
||||
|
||||
if ((ppd = ppdOpenFile(filename)) != NULL)
|
||||
{
|
||||
if (ppd->manufacturer)
|
||||
cgiSetVariable("CURRENT_MAKE", ppd->manufacturer);
|
||||
if (ppd->nickname)
|
||||
cgiSetVariable("CURRENT_MAKE_AND_MODEL", ppd->nickname);
|
||||
|
||||
ppdClose(ppd);
|
||||
}
|
||||
}
|
||||
else
|
||||
httpFlush(http);
|
||||
|
||||
unlink(filename);
|
||||
}
|
||||
|
||||
/*
|
||||
* Build a CUPS_GET_PPDS request, which requires the following
|
||||
* attributes:
|
||||
@@ -794,16 +670,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
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
|
||||
{
|
||||
@@ -847,8 +714,7 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "ppd-name",
|
||||
NULL, cgiGetVariable("PPD_NAME"));
|
||||
|
||||
strncpy(uri, cgiGetVariable("DEVICE_URI"), sizeof(uri) - 1);
|
||||
uri[sizeof(uri) - 1] = '\0';
|
||||
strcpy(uri, cgiGetVariable("DEVICE_URI"));
|
||||
if (strncmp(uri, "serial:", 7) == 0)
|
||||
{
|
||||
/*
|
||||
@@ -858,10 +724,9 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
if ((uriptr = strchr(uri, '?')) == NULL)
|
||||
uriptr = uri + strlen(uri);
|
||||
|
||||
snprintf(uriptr, sizeof(uri) - (uriptr - uri),
|
||||
"?baud=%s+bits=%s+parity=%s+flow=%s",
|
||||
cgiGetVariable("BAUDRATE"), cgiGetVariable("BITS"),
|
||||
cgiGetVariable("PARITY"), cgiGetVariable("FLOW"));
|
||||
sprintf(uriptr, "?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",
|
||||
@@ -894,9 +759,6 @@ do_am_printer(http_t *http, /* I - HTTP connection */
|
||||
else
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "printer-added.tmpl", getenv("LANG"));
|
||||
}
|
||||
|
||||
if (oldinfo)
|
||||
ippDelete(oldinfo);
|
||||
}
|
||||
|
||||
|
||||
@@ -912,7 +774,6 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
int have_options; /* Have options? */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *attr; /* IPP attribute */
|
||||
char uri[HTTP_MAX_URI]; /* Job URI */
|
||||
const char *var; /* Variable value */
|
||||
const char *printer; /* Printer printer name */
|
||||
@@ -955,14 +816,8 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
|
||||
ppd = ppdOpenFile(filename);
|
||||
|
||||
if (cgiGetVariable("job_sheets_start") != NULL ||
|
||||
cgiGetVariable("job_sheets_end") != NULL)
|
||||
have_options = 1;
|
||||
else
|
||||
have_options = 0;
|
||||
|
||||
for (i = ppd->num_groups, group = ppd->groups;
|
||||
i > 0 && !have_options;
|
||||
for (have_options = 0, i = ppd->num_groups, group = ppd->groups;
|
||||
i > 0;
|
||||
i --, group ++)
|
||||
for (j = group->num_options, option = group->options;
|
||||
j > 0;
|
||||
@@ -1030,80 +885,6 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
getenv("LANG"));
|
||||
}
|
||||
|
||||
/*
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the
|
||||
* following attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
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(uri, sizeof(uri), "ipp://localhost/printers/%s",
|
||||
cgiGetVariable("PRINTER_NAME"));
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
|
||||
if ((response = cupsDoRequest(http, request, "/")) != NULL)
|
||||
{
|
||||
if ((attr = ippFindAttribute(response, "job-sheets-supported", IPP_TAG_ZERO)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Add the job sheets options...
|
||||
*/
|
||||
|
||||
cgiSetVariable("GROUP", "Banners");
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "option-header.tmpl",
|
||||
getenv("LANG"));
|
||||
|
||||
cgiSetSize("CHOICES", attr->num_values);
|
||||
cgiSetSize("TEXT", attr->num_values);
|
||||
for (k = 0; k < attr->num_values; k ++)
|
||||
{
|
||||
cgiSetArray("CHOICES", k, attr->values[k].string.text);
|
||||
cgiSetArray("TEXT", k, attr->values[k].string.text);
|
||||
}
|
||||
|
||||
attr = ippFindAttribute(response, "job-sheets-default", IPP_TAG_ZERO);
|
||||
|
||||
cgiSetVariable("KEYWORD", "job_sheets_start");
|
||||
cgiSetVariable("KEYTEXT", "Starting Banner");
|
||||
cgiSetVariable("DEFCHOICE", attr == NULL ?
|
||||
"" : attr->values[0].string.text);
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "option-pickone.tmpl",
|
||||
getenv("LANG"));
|
||||
|
||||
cgiSetVariable("KEYWORD", "job_sheets_end");
|
||||
cgiSetVariable("KEYTEXT", "Ending Banner");
|
||||
cgiSetVariable("DEFCHOICE", attr == NULL && attr->num_values > 1 ?
|
||||
"" : attr->values[1].string.text);
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "option-pickone.tmpl",
|
||||
getenv("LANG"));
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "option-trailer.tmpl",
|
||||
getenv("LANG"));
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "config-printer2.tmpl",
|
||||
getenv("LANG"));
|
||||
}
|
||||
@@ -1128,8 +909,7 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
* Get default option name...
|
||||
*/
|
||||
|
||||
strncpy(keyword, line + 8, sizeof(keyword) - 1);
|
||||
keyword[sizeof(keyword) - 1] = '\0';
|
||||
strcpy(keyword, line + 8);
|
||||
|
||||
for (keyptr = keyword; *keyptr; keyptr ++)
|
||||
if (*keyptr == ':' || isspace(*keyptr))
|
||||
@@ -1159,7 +939,6 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
* job-sheets-default
|
||||
* [ppd file]
|
||||
*/
|
||||
|
||||
@@ -1179,11 +958,6 @@ do_config_printer(http_t *http, /* I - HTTP connection */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
|
||||
"job-sheets-default", 2, NULL, NULL);
|
||||
attr->values[0].string.text = strdup(cgiGetVariable("job_sheets_start"));
|
||||
attr->values[1].string.text = strdup(cgiGetVariable("job_sheets_end"));
|
||||
|
||||
/*
|
||||
* Do the request and get back a response...
|
||||
*/
|
||||
@@ -1450,8 +1224,6 @@ do_job_op(http_t *http, /* I - HTTP connection */
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "job-hold.tmpl", getenv("LANG"));
|
||||
else if (op == IPP_RELEASE_JOB)
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "job-release.tmpl", getenv("LANG"));
|
||||
else if (op == IPP_RESTART_JOB)
|
||||
cgiCopyTemplateLang(stdout, TEMPLATES, "job-restart.tmpl", getenv("LANG"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI support library definitions.
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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
-60
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Class status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -46,7 +46,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
http_t *http; /* Connection to the server */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *attr; /* IPP attribute */
|
||||
ipp_status_t status; /* Operation status... */
|
||||
char uri[HTTP_MAX_URI];
|
||||
/* Printer URI */
|
||||
@@ -99,64 +98,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
if (op == NULL || strcasecmp(op, "print-test-page") != 0)
|
||||
{
|
||||
/*
|
||||
* Get the default destination...
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
request->request.op.operation_id = CUPS_GET_DEFAULT;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
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 ((response = cupsDoRequest(http, request, "/")) != NULL)
|
||||
{
|
||||
if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
|
||||
cgiSetVariable("DEFAULT_NAME", attr->values[0].string.text);
|
||||
|
||||
if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
char method[HTTP_MAX_URI],
|
||||
username[HTTP_MAX_URI],
|
||||
hostname[HTTP_MAX_URI],
|
||||
resource[HTTP_MAX_URI],
|
||||
uri[HTTP_MAX_URI];
|
||||
int port; /* URI data */
|
||||
const char *server; /* Name of server */
|
||||
|
||||
|
||||
/*
|
||||
* Map localhost access to localhost...
|
||||
*/
|
||||
|
||||
server = getenv("SERVER_NAME");
|
||||
|
||||
httpSeparate(attr->values[0].string.text, method, username,
|
||||
hostname, &port, resource);
|
||||
|
||||
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");
|
||||
|
||||
/*
|
||||
* Rewrite URI with HTTP address...
|
||||
*/
|
||||
|
||||
snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
|
||||
resource);
|
||||
|
||||
cgiSetVariable("DEFAULT_URI", uri);
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the class info...
|
||||
*/
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI HTML functions.
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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
|
||||
|
||||
+14
-91
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP variable routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,7 +23,6 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* ippGetTemplateDir() - Get the templates directory...
|
||||
* ippSetServerVersion() - Set the server name and CUPS version...
|
||||
* ippSetCGIVars() - Set CGI variables from an IPP response.
|
||||
*/
|
||||
@@ -35,33 +34,6 @@
|
||||
#include "ipp-var.h"
|
||||
|
||||
|
||||
/*
|
||||
* 'ippGetTemplateDir()' - Get the templates directory...
|
||||
*/
|
||||
|
||||
char * /* O - Template directory */
|
||||
ippGetTemplateDir(void)
|
||||
{
|
||||
const char *datadir; /* CUPS_DATADIR env var */
|
||||
static char templates[1024] = ""; /* Template directory */
|
||||
|
||||
|
||||
if (!templates[0])
|
||||
{
|
||||
/*
|
||||
* Build the template directory pathname...
|
||||
*/
|
||||
|
||||
if ((datadir = getenv("CUPS_DATADIR")) == NULL)
|
||||
datadir = CUPS_DATADIR;
|
||||
|
||||
snprintf(templates, sizeof(templates), "%s/templates", datadir);
|
||||
}
|
||||
|
||||
return (templates);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ippSetServerVersion()' - Set the server name and CUPS version...
|
||||
*/
|
||||
@@ -96,15 +68,11 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
hostname[HTTP_MAX_URI],
|
||||
resource[HTTP_MAX_URI],
|
||||
uri[HTTP_MAX_URI];
|
||||
int port; /* URI data */
|
||||
const char *server; /* Name of server */
|
||||
struct tm *date; /* Date information */
|
||||
int port;
|
||||
|
||||
|
||||
ippSetServerVersion();
|
||||
|
||||
server = getenv("SERVER_NAME");
|
||||
|
||||
for (attr = response->attrs;
|
||||
attr && attr->group_tag == IPP_TAG_OPERATION;
|
||||
attr = attr->next);
|
||||
@@ -121,10 +89,6 @@ 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;
|
||||
|
||||
@@ -156,21 +120,6 @@ 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...
|
||||
*/
|
||||
@@ -189,14 +138,7 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
if (strncmp(name, "time_at_", 8) == 0)
|
||||
{
|
||||
date = localtime((time_t *)&(attr->values[i].integer));
|
||||
strftime(valptr, sizeof(value) - (valptr - value) - 1,
|
||||
NULL, date);
|
||||
}
|
||||
else
|
||||
sprintf(valptr, "%d", attr->values[i].integer);
|
||||
sprintf(valptr, "%d", attr->values[i].integer);
|
||||
break;
|
||||
|
||||
case IPP_TAG_BOOLEAN :
|
||||
@@ -220,39 +162,20 @@ ippSetCGIVars(ipp_t *response, /* I - Response data to be copied... */
|
||||
break;
|
||||
|
||||
case IPP_TAG_URI :
|
||||
if (strchr(attr->values[i].string.text, ':') != NULL)
|
||||
if (strncmp(attr->values[i].string.text, "ipp:", 4) == 0)
|
||||
{
|
||||
httpSeparate(attr->values[i].string.text, method, username,
|
||||
httpSeparate(attr->values[i].string.text, method, username,
|
||||
hostname, &port, resource);
|
||||
if (username[0])
|
||||
snprintf(uri, sizeof(uri), "http://%s@%s:%d%s", username,
|
||||
hostname, port, resource);
|
||||
else
|
||||
snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
|
||||
resource);
|
||||
|
||||
if (strcmp(method, "ipp") == 0 ||
|
||||
strcmp(method, "http") == 0)
|
||||
{
|
||||
/*
|
||||
* Map localhost access to localhost...
|
||||
*/
|
||||
|
||||
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");
|
||||
|
||||
/*
|
||||
* Rewrite URI with HTTP address...
|
||||
*/
|
||||
|
||||
if (username[0])
|
||||
snprintf(uri, sizeof(uri), "http://%s@%s:%d%s", username,
|
||||
hostname, port, resource);
|
||||
else
|
||||
snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
|
||||
resource);
|
||||
|
||||
strcat(valptr, uri);
|
||||
break;
|
||||
}
|
||||
}
|
||||
strcat(valptr, uri);
|
||||
break;
|
||||
}
|
||||
|
||||
case IPP_TAG_STRING :
|
||||
case IPP_TAG_TEXT :
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* IPP variable definitions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -38,14 +38,14 @@
|
||||
* Definitions...
|
||||
*/
|
||||
|
||||
#define TEMPLATES ippGetTemplateDir()
|
||||
/*#define TEMPLATES "/home/mike/c/cups/templates"*/
|
||||
#define TEMPLATES CUPS_DATADIR "/templates"
|
||||
|
||||
|
||||
/*
|
||||
* Prototype...
|
||||
*/
|
||||
|
||||
extern char *ippGetTemplateDir(void);
|
||||
extern void ippSetServerVersion(void);
|
||||
extern void ippSetCGIVars(ipp_t *, const char *, const char *);
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Job status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+1
-60
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Printer status CGI for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -46,7 +46,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
http_t *http; /* Connection to the server */
|
||||
ipp_t *request, /* IPP request */
|
||||
*response; /* IPP response */
|
||||
ipp_attribute_t *attr; /* IPP attribute */
|
||||
ipp_status_t status; /* Operation status... */
|
||||
char uri[HTTP_MAX_URI];
|
||||
/* Printer URI */
|
||||
@@ -99,64 +98,6 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
|
||||
if (op == NULL || strcasecmp(op, "print-test-page") != 0)
|
||||
{
|
||||
/*
|
||||
* Get the default destination...
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
request->request.op.operation_id = CUPS_GET_DEFAULT;
|
||||
request->request.op.request_id = 1;
|
||||
|
||||
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 ((response = cupsDoRequest(http, request, "/")) != NULL)
|
||||
{
|
||||
if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
|
||||
cgiSetVariable("DEFAULT_NAME", attr->values[0].string.text);
|
||||
|
||||
if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
char method[HTTP_MAX_URI],
|
||||
username[HTTP_MAX_URI],
|
||||
hostname[HTTP_MAX_URI],
|
||||
resource[HTTP_MAX_URI],
|
||||
uri[HTTP_MAX_URI];
|
||||
int port; /* URI data */
|
||||
const char *server; /* Name of server */
|
||||
|
||||
|
||||
/*
|
||||
* Map localhost access to localhost...
|
||||
*/
|
||||
|
||||
server = getenv("SERVER_NAME");
|
||||
|
||||
httpSeparate(attr->values[0].string.text, method, username,
|
||||
hostname, &port, resource);
|
||||
|
||||
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");
|
||||
|
||||
/*
|
||||
* Rewrite URI with HTTP address...
|
||||
*/
|
||||
|
||||
snprintf(uri, sizeof(uri), "http://%s:%d%s", hostname, port,
|
||||
resource);
|
||||
|
||||
cgiSetVariable("DEFAULT_URI", uri);
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the printer info...
|
||||
*/
|
||||
|
||||
+21
-65
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI template function.
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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...
|
||||
*/
|
||||
|
||||
snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
|
||||
sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
|
||||
if (access(filename, 0))
|
||||
{
|
||||
locale[2] = '\0';
|
||||
|
||||
snprintf(filename, sizeof(filename), "%s/%s/%s", directory, locale, tmpl);
|
||||
sprintf(filename, "%s/%s/%s", directory, locale, tmpl);
|
||||
if (access(filename, 0))
|
||||
snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
|
||||
sprintf(filename, "%s/%s", directory, tmpl);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -160,8 +160,7 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*s; /* String pointer */
|
||||
const char *value; /* Value of variable */
|
||||
const char *innerval; /* Inner value */
|
||||
const char *outptr; /* Output string pointer */
|
||||
char outval[1024], /* Formatted output string */
|
||||
char outval[1024], /* Output string */
|
||||
compare[1024]; /* Comparison string */
|
||||
int result; /* Result of comparison */
|
||||
|
||||
@@ -180,7 +179,7 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*/
|
||||
|
||||
for (s = name; (ch = getc(in)) != EOF;)
|
||||
if (strchr("}]<>=! \t\n", ch))
|
||||
if (strchr("}]<>=!", ch))
|
||||
break;
|
||||
else if (s > name && ch == '?')
|
||||
break;
|
||||
@@ -189,17 +188,6 @@ 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...
|
||||
*/
|
||||
@@ -215,20 +203,14 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*nameptr++ = '\0';
|
||||
|
||||
if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL)
|
||||
outptr = value;
|
||||
strcpy(outval, value);
|
||||
else
|
||||
{
|
||||
outval[0] = '\0';
|
||||
outptr = outval;
|
||||
}
|
||||
}
|
||||
if ((value = cgiGetArray(name + 1, element)) != NULL)
|
||||
outptr = value;
|
||||
strcpy(outval, value);
|
||||
else
|
||||
{
|
||||
outval[0] = '\0';
|
||||
outptr = outval;
|
||||
}
|
||||
}
|
||||
else if (name[0] == '#')
|
||||
{
|
||||
@@ -240,8 +222,6 @@ 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] == '[')
|
||||
{
|
||||
@@ -284,20 +264,14 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
{
|
||||
*nameptr++ = '\0';
|
||||
if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
|
||||
{
|
||||
snprintf(outval, sizeof(outval), "{%s}", name);
|
||||
outptr = outval;
|
||||
}
|
||||
sprintf(outval, "{%s}", name);
|
||||
else
|
||||
outptr = value;
|
||||
strcpy(outval, value);
|
||||
}
|
||||
else if ((value = cgiGetArray(name, element)) == NULL)
|
||||
{
|
||||
snprintf(outval, sizeof(outval), "{%s}", name);
|
||||
outptr = outval;
|
||||
}
|
||||
sprintf(outval, "{%s}", name);
|
||||
else
|
||||
outptr = value;
|
||||
strcpy(outval, value);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -311,7 +285,7 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
*/
|
||||
|
||||
if (out)
|
||||
cgi_puts(outptr, out);
|
||||
cgi_puts(outval, out);
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -345,8 +319,6 @@ 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);
|
||||
@@ -373,28 +345,19 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
|
||||
*s = '\0';
|
||||
else
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
strcpy(s, innerval);
|
||||
}
|
||||
else if (innername[0] == '?')
|
||||
{
|
||||
if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
|
||||
*s = '\0';
|
||||
else
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
strcpy(s, innerval);
|
||||
}
|
||||
else if ((innerval = cgiGetArray(innername, element)) == NULL)
|
||||
snprintf(s, sizeof(s), "{%s}", innername);
|
||||
sprintf(s, "{%s}", innername);
|
||||
else
|
||||
{
|
||||
strncpy(s, innerval, sizeof(compare) - (s - compare) - 1);
|
||||
compare[sizeof(compare) - 1] = '\0';
|
||||
}
|
||||
strcpy(s, innerval);
|
||||
|
||||
s += strlen(s);
|
||||
}
|
||||
@@ -415,16 +378,16 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
switch (op)
|
||||
{
|
||||
case '<' :
|
||||
result = strcasecmp(outptr, compare) < 0;
|
||||
result = strcasecmp(outval, compare) < 0;
|
||||
break;
|
||||
case '>' :
|
||||
result = strcasecmp(outptr, compare) > 0;
|
||||
result = strcasecmp(outval, compare) > 0;
|
||||
break;
|
||||
case '=' :
|
||||
result = strcasecmp(outptr, compare) == 0;
|
||||
result = strcasecmp(outval, compare) == 0;
|
||||
break;
|
||||
case '!' :
|
||||
result = strcasecmp(outptr, compare) != 0;
|
||||
result = strcasecmp(outval, compare) != 0;
|
||||
break;
|
||||
default :
|
||||
result = 1;
|
||||
@@ -460,13 +423,6 @@ cgi_copy(FILE *out, /* I - Output file */
|
||||
}
|
||||
else if (out)
|
||||
putc(ch, out);
|
||||
|
||||
/*
|
||||
* Flush any pending output...
|
||||
*/
|
||||
|
||||
if (out)
|
||||
fflush(out);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+13
-23
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* CGI form variable and array functions.
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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,8 +39,6 @@
|
||||
|
||||
/*#define DEBUG*/
|
||||
#include "cgi.h"
|
||||
#include <errno.h>
|
||||
#include <syslog.h>
|
||||
|
||||
|
||||
/*
|
||||
@@ -491,11 +489,10 @@ cgi_initialize_post(void)
|
||||
|
||||
for (tbytes = 0; tbytes < length; tbytes += nbytes)
|
||||
if ((nbytes = read(0, data + tbytes, length - tbytes)) < 0)
|
||||
if (errno != EAGAIN)
|
||||
{
|
||||
free(data);
|
||||
return (0);
|
||||
}
|
||||
{
|
||||
free(data);
|
||||
return (0);
|
||||
}
|
||||
|
||||
data[length] = '\0';
|
||||
|
||||
@@ -546,11 +543,11 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
* Get the variable name...
|
||||
*/
|
||||
|
||||
for (s = name; *data != '\0'; data ++)
|
||||
for (s = name; *data != '\0'; data ++, s ++)
|
||||
if (*data == '=')
|
||||
break;
|
||||
else if (*data >= ' ')
|
||||
*s++ = *data;
|
||||
else
|
||||
*s = *data;
|
||||
|
||||
*s = '\0';
|
||||
if (*data == '=')
|
||||
@@ -593,10 +590,7 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
break;
|
||||
|
||||
default : /* Other characters come straight through */
|
||||
if (*data < ' ')
|
||||
s --;
|
||||
else
|
||||
*s = *data;
|
||||
*s = *data;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -606,9 +600,7 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
* Remove trailing whitespace...
|
||||
*/
|
||||
|
||||
if (s > value)
|
||||
s --;
|
||||
|
||||
s --;
|
||||
while (s >= value && *s == ' ')
|
||||
*s-- = '\0';
|
||||
|
||||
@@ -619,8 +611,7 @@ cgi_initialize_string(const char *data) /* I - Form data string */
|
||||
if ((s = strrchr(name, '-')) != NULL && isdigit(s[1]))
|
||||
{
|
||||
*s++ = '\0';
|
||||
if (value[0])
|
||||
cgiSetArray(name, atoi(s) - 1, value);
|
||||
cgiSetArray(name, atoi(s) - 1, value);
|
||||
}
|
||||
else if (cgiGetVariable(name) != NULL)
|
||||
cgiSetArray(name, cgiGetSize(name), value);
|
||||
@@ -653,10 +644,9 @@ cgi_sort_variables(void)
|
||||
(int (*)(const void *, const void *))cgi_compare_variables);
|
||||
|
||||
#ifdef DEBUG
|
||||
puts("Sorted variable list is:");
|
||||
puts("New variable list is:");
|
||||
for (i = 0; i < form_count; i ++)
|
||||
printf("%d: %s (%d) = \"%s\" ...\n", i, form_vars[i].name,
|
||||
form_vars[i].nvalues, form_vars[i].values[0]);
|
||||
printf("%s = %s\n", form_vars[i].name, form_vars[i].value);
|
||||
#endif /* DEBUG */
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Configuration file makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -52,7 +52,6 @@ clean:
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(SERVERROOT)
|
||||
$(CHMOD) ugo+rx $(SERVERROOT)
|
||||
for file in $(KEEP); do \
|
||||
if test -r $(SERVERROOT)/$$file ; then \
|
||||
$(INSTALL_DATA) $$file $(SERVERROOT)/$$file.N ; \
|
||||
|
||||
+8
-2
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: classes.conf 1152 2000-06-22 18:25:29Z mike $"
|
||||
# "$Id: classes.conf 969 2000-03-10 16:56:46Z mike $"
|
||||
#
|
||||
# Sample class configuration file for the Common UNIX Printing System
|
||||
# (CUPS) scheduler.
|
||||
@@ -47,6 +47,12 @@
|
||||
|
||||
#Info Acme LaserPrint 1000 Printers
|
||||
|
||||
#
|
||||
# MoreInfo: a URL for more information on the printer.
|
||||
#
|
||||
|
||||
#MoreInfo http://www.acme.com/lp1000.html
|
||||
|
||||
#
|
||||
# Location: the location of the printer.
|
||||
#
|
||||
@@ -85,5 +91,5 @@
|
||||
#</Class>
|
||||
|
||||
#
|
||||
# End of "$Id: classes.conf 1152 2000-06-22 18:25:29Z mike $".
|
||||
# End of "$Id: classes.conf 969 2000-03-10 16:56:46Z mike $".
|
||||
#
|
||||
|
||||
+7
-22
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: client.conf 1485 2000-12-20 13:41:17Z mike $"
|
||||
# "$Id: client.conf 969 2000-03-10 16:56:46Z mike $"
|
||||
#
|
||||
# Sample client configuration file for the Common UNIX Printing System
|
||||
# (CUPS).
|
||||
@@ -27,39 +27,24 @@
|
||||
# #
|
||||
# This is the CUPS client configuration file. This file is used to #
|
||||
# define client-specific parameters, such as the default server or #
|
||||
# default encryption settings. #
|
||||
# default printer. #
|
||||
# #
|
||||
########################################################################
|
||||
|
||||
#
|
||||
# ServerName: the hostname of your server. By default CUPS will use the
|
||||
# hostname of the system or the value of the CUPS_SERVER environment
|
||||
# variable.
|
||||
# hostname of the system.
|
||||
#
|
||||
|
||||
#ServerName myhost.domain.com
|
||||
|
||||
#
|
||||
# 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: the default printer (or class) that clients should use.
|
||||
#
|
||||
|
||||
#Encryption Always
|
||||
#Encryption Never
|
||||
#Encryption Required
|
||||
#Encryption IfRequested
|
||||
|
||||
#DefaultPrinter myprinter
|
||||
#DefaultPrinter myprinter@host
|
||||
|
||||
#
|
||||
# End of "$Id: client.conf 1485 2000-12-20 13:41:17Z mike $".
|
||||
# End of "$Id: client.conf 969 2000-03-10 16:56:46Z mike $".
|
||||
#
|
||||
|
||||
+12
-113
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: cupsd.conf 1485 2000-12-20 13:41:17Z mike $"
|
||||
# "$Id: cupsd.conf 1054 2000-05-08 21:13:37Z mike $"
|
||||
#
|
||||
# Sample configuration file for the Common UNIX Printing System (CUPS)
|
||||
# scheduler.
|
||||
@@ -71,13 +71,6 @@
|
||||
|
||||
#AccessLog /var/log/cups/access_log
|
||||
|
||||
#
|
||||
# DataDir: the root directory for the CUPS data files.
|
||||
# By default /usr/share/cups.
|
||||
#
|
||||
|
||||
#DataDir /usr/share/cups
|
||||
|
||||
#
|
||||
# DefaultCharset: the default character set to use. If not specified,
|
||||
# defaults to utf-8. Note that this can also be overridden in
|
||||
@@ -111,19 +104,11 @@
|
||||
|
||||
#ErrorLog /var/log/cups/error_log
|
||||
|
||||
#
|
||||
# FontPath: the path to locate all font files (currently only for pstoraster)
|
||||
# By default /usr/share/cups/fonts.
|
||||
#
|
||||
|
||||
#FontPath /usr/share/cups/fonts
|
||||
|
||||
#
|
||||
# LogLevel: controls the number of messages logged to the ErrorLog
|
||||
# file and can be one of the following:
|
||||
#
|
||||
# debug2 Log everything.
|
||||
# debug Log almost everything.
|
||||
# debug Log everything.
|
||||
# info Log all requests and state changes.
|
||||
# warn Log errors and warnings.
|
||||
# error Log only errors.
|
||||
@@ -165,21 +150,7 @@ LogLevel info
|
||||
#PreserveJobFiles No
|
||||
|
||||
#
|
||||
# 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.
|
||||
# Printcap: the name of the printcap file. Default is no filename.
|
||||
# Leave blank to disable printcap file generation.
|
||||
#
|
||||
|
||||
@@ -192,13 +163,6 @@ LogLevel info
|
||||
|
||||
#RequestRoot /var/spool/cups
|
||||
|
||||
#
|
||||
# RemoteRoot: the name of the user assigned to unauthenticated accesses
|
||||
# from remote systems. By default "remroot".
|
||||
#
|
||||
|
||||
#RemoteRoot remroot
|
||||
|
||||
#
|
||||
# ServerBin: the root directory for the scheduler executables.
|
||||
# By default /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).
|
||||
@@ -214,25 +178,6 @@ 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
|
||||
########
|
||||
@@ -261,22 +206,12 @@ LogLevel info
|
||||
|
||||
#
|
||||
# TempDir: the directory to put temporary files in. This directory must be
|
||||
# writable by the user defined above! Defaults to "/var/spool/cups/tmp" or
|
||||
# the value of the TMPDIR environment variable.
|
||||
# writable by the user defined above! Defaults to "/var/tmp" or the value
|
||||
# of the TMPDIR environment variable.
|
||||
#
|
||||
|
||||
#TempDir /var/spool/cups/tmp
|
||||
#TempDir /var/tmp
|
||||
|
||||
#
|
||||
# FilterLimit: sets the maximum cost of all job filters that can be run
|
||||
# at the same time. A limit of 0 means no limit. A typical job may need
|
||||
# a filter limit of at least 200; limits less than the minimum required
|
||||
# by a job force a single job to be printed at any time.
|
||||
#
|
||||
# The default limit is 0 (unlimited).
|
||||
#
|
||||
|
||||
#FilterLimit 0
|
||||
|
||||
########
|
||||
######## Network Options
|
||||
@@ -297,13 +232,8 @@ 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
|
||||
|
||||
#
|
||||
@@ -353,37 +283,23 @@ Port 631
|
||||
########
|
||||
|
||||
#
|
||||
# Browsing: whether or not to broadcast and/or listen for CUPS printer
|
||||
# information on the network. Enabled by default.
|
||||
# Browsing: whether or not to broadcast printer information to
|
||||
# other CUPS servers. Enabled by default.
|
||||
#
|
||||
|
||||
#Browsing On
|
||||
|
||||
#
|
||||
# BrowseAddress: specifies a broadcast address to be used. By
|
||||
# default browsing information is not sent!
|
||||
# default browsing information is broadcast to all active interfaces.
|
||||
#
|
||||
# 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.
|
||||
# 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
|
||||
#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
|
||||
# default.
|
||||
#
|
||||
|
||||
#BrowseShortNames Yes
|
||||
|
||||
#
|
||||
# BrowseAllow: specifies an address mask to allow for incoming browser
|
||||
@@ -541,23 +457,8 @@ 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>
|
||||
@@ -619,10 +520,8 @@ AuthClass System
|
||||
Order Deny,Allow
|
||||
Deny From All
|
||||
Allow From 127.0.0.1
|
||||
|
||||
#Encryption Required
|
||||
</Location>
|
||||
|
||||
#
|
||||
# End of "$Id: cupsd.conf 1485 2000-12-20 13:41:17Z mike $".
|
||||
# End of "$Id: cupsd.conf 1054 2000-05-08 21:13:37Z mike $".
|
||||
#
|
||||
|
||||
+13
-27
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $"
|
||||
# "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $"
|
||||
#
|
||||
# MIME converts file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
@@ -41,38 +41,24 @@
|
||||
# PostScript filters
|
||||
#
|
||||
|
||||
#application/msword application/postscript 33 mswordtops
|
||||
application/pdf application/postscript 33 pdftops
|
||||
application/postscript application/vnd.cups-postscript 66 pstops
|
||||
application/vnd.hp-HPGL application/postscript 66 hpgltops
|
||||
image/* application/vnd.cups-postscript 66 imagetops
|
||||
#text/html application/postscript 33 htmltops
|
||||
application/x-cshell application/postscript 33 texttops
|
||||
application/x-perl application/postscript 33 texttops
|
||||
application/x-shell application/postscript 33 texttops
|
||||
text/html application/postscript 33 texttops
|
||||
text/plain application/postscript 33 texttops
|
||||
application/vnd.cups-form application/vnd.cups-postscript 33 formtops
|
||||
#application/msword application/postscript 50 mswordtops
|
||||
application/pdf application/postscript 50 pdftops
|
||||
application/postscript application/vnd.cups-postscript 50 pstops
|
||||
application/vnd.hp-HPGL application/postscript 50 hpgltops
|
||||
image/* application/vnd.cups-postscript 50 imagetops
|
||||
#text/html application/postscript 50 htmltops
|
||||
text/html application/postscript 50 texttops
|
||||
text/plain application/postscript 50 texttops
|
||||
application/vnd.cups-form application/vnd.cups-postscript 50 formtops
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# Raster filters...
|
||||
#
|
||||
|
||||
image/* application/vnd.cups-raster 100 imagetoraster
|
||||
application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# Raw filter...
|
||||
#
|
||||
# Uncomment the following filter and the application/octet-stream type
|
||||
# in mime.types to allow printing of arbitrary files without the -oraw
|
||||
# option.
|
||||
#
|
||||
|
||||
#*/* application/vnd.cups-raw 0 -
|
||||
image/* application/vnd.cups-raster 50 imagetoraster
|
||||
application/vnd.cups-postscript application/vnd.cups-raster 50 pstoraster
|
||||
|
||||
#
|
||||
# End of "$Id: mime.convs 1340 2000-09-06 13:53:00Z mike $".
|
||||
# End of "$Id: mime.convs 1019 2000-04-18 19:41:12Z mike $".
|
||||
#
|
||||
|
||||
+6
-30
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: mime.types 1501 2001-01-11 21:58:52Z mike $"
|
||||
# "$Id: mime.types 1042 2000-04-30 22:03:57Z mike $"
|
||||
#
|
||||
# MIME types file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
@@ -39,7 +39,7 @@
|
||||
# ascii(offset,length) True if bytes are valid printable ASCII
|
||||
# (CR, NL, TAB, BS, 32-126)
|
||||
# printable(offset,length) True if bytes are printable 8-bit chars
|
||||
# (CR, NL, TAB, BS, 32-126, 128-254)
|
||||
# (CR, NL, TAB, BS, 32-126, 160-254)
|
||||
# string(offset,"string") True if bytes are identical to string
|
||||
# char(offset,value) True if byte is identical
|
||||
# short(offset,value) True if 16-bit integer is identical
|
||||
@@ -60,7 +60,7 @@
|
||||
# accepts 8-bit characters in the range 128-255.
|
||||
#
|
||||
# String constants must be surrounded by "" if they contain whitespace.
|
||||
# To insert binary data into a string, use the <hex> notation.
|
||||
# To instead binary data into a string, use the <hex> notation.
|
||||
#
|
||||
|
||||
########################################################################
|
||||
@@ -110,13 +110,6 @@ image/x-bitmap bmp string(0,BM) && !printable(2,14)
|
||||
|
||||
text/html html htm printable(0,1024) +\
|
||||
(string(0,"<HTML>") string(0,"<!DOCTYPE"))
|
||||
application/x-cshell csh printable(0,1024) + string(0,#!) +\
|
||||
(contains(2,80,/csh) contains(2,80,/tcsh))
|
||||
application/x-perl pl printable(0,1024) + string(0,#!) +\
|
||||
contains(2,80,/perl)
|
||||
application/x-shell sh printable(0,1024) + string(0,#!) +\
|
||||
(contains(2,80,/bash) contains(2,80,/ksh)\
|
||||
contains(2,80,/sh) contains(2,80,/zsh))
|
||||
text/plain txt printable(0,1024)
|
||||
|
||||
########################################################################
|
||||
@@ -125,27 +118,10 @@ text/plain txt printable(0,1024)
|
||||
#
|
||||
|
||||
application/vnd.cups-form string(0,"<CUPSFORM>")
|
||||
application/vnd.cups-postscript string(0,<1B>%-12345X) + \
|
||||
(contains(9,512,"LANGUAGE=POSTSCRIPT") \
|
||||
contains(9,512,"LANGUAGE = POSTSCRIPT"))
|
||||
application/vnd.cups-postscript string(0,<1B>%-12345X)
|
||||
application/vnd.cups-raster string(0,"RaSt") string(0,"tSaR")
|
||||
application/vnd.cups-raw string(0,<1B>E) \
|
||||
string(0,<1B>@) \
|
||||
(string(0,<1B>%-12345X) + \
|
||||
(contains(9,512,"LANGUAGE=PCL")) \
|
||||
contains(9,512,"LANGUAGE = PCL")))
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# Raw print file support...
|
||||
#
|
||||
# Uncomment the following type and the application/octet-stream
|
||||
# filter line in mime.convs to allow raw file printing without the
|
||||
# -oraw option.
|
||||
#
|
||||
|
||||
#application/octet-stream
|
||||
application/vnd.cups-raw
|
||||
|
||||
#
|
||||
# End of "$Id: mime.types 1501 2001-01-11 21:58:52Z mike $".
|
||||
# End of "$Id: mime.types 1042 2000-04-30 22:03:57Z mike $".
|
||||
#
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: printers.conf 1152 2000-06-22 18:25:29Z mike $"
|
||||
# "$Id: printers.conf 969 2000-03-10 16:56:46Z mike $"
|
||||
#
|
||||
# Sample printer configuration file for the Common UNIX Printing System
|
||||
# (CUPS) scheduler.
|
||||
@@ -47,6 +47,12 @@
|
||||
|
||||
#Info Acme LaserPrint 1000
|
||||
|
||||
#
|
||||
# MoreInfo: a URL for more information on the printer.
|
||||
#
|
||||
|
||||
#MoreInfo http://www.acme.com/lp1000.html
|
||||
|
||||
#
|
||||
# Location: the location of the printer.
|
||||
#
|
||||
@@ -92,5 +98,5 @@
|
||||
#</Printer>
|
||||
|
||||
#
|
||||
# End of "$Id: printers.conf 1152 2000-06-22 18:25:29Z mike $".
|
||||
# End of "$Id: printers.conf 969 2000-03-10 16:56:46Z mike $".
|
||||
#
|
||||
|
||||
+1
-21
@@ -28,7 +28,7 @@
|
||||
* Version of software...
|
||||
*/
|
||||
|
||||
#define CUPS_SVERSION "CUPS v1.1.6"
|
||||
#define CUPS_SVERSION "CUPS v1.1b4"
|
||||
|
||||
/*
|
||||
* Where are files stored?
|
||||
@@ -41,7 +41,6 @@
|
||||
#define CUPS_REQUESTS "/var/spool/cups"
|
||||
#define CUPS_LOGDIR "/var/logs/cups"
|
||||
#define CUPS_DATADIR "/usr/share/cups"
|
||||
#define CUPS_FONTPATH "/usr/share/cups/fonts"
|
||||
|
||||
|
||||
/*
|
||||
@@ -123,25 +122,6 @@
|
||||
#undef HAVE_WAITPID
|
||||
#undef HAVE_WAIT3
|
||||
|
||||
/*
|
||||
* Do we have the mallinfo function and malloc.h?
|
||||
*/
|
||||
|
||||
#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$".
|
||||
*/
|
||||
|
||||
+57
-240
@@ -3,7 +3,7 @@ dnl "$Id$"
|
||||
dnl
|
||||
dnl Configuration script for the Common UNIX Printing System (CUPS).
|
||||
dnl
|
||||
dnl Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
dnl Copyright 1997-2000 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
|
||||
@@ -24,7 +24,7 @@ dnl
|
||||
|
||||
AC_INIT(cups/cups.h)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_PREFIX_DEFAULT(/)
|
||||
AC_PREFIX_DEFAULT(/usr)
|
||||
|
||||
dnl Get the operating system and version number...
|
||||
|
||||
@@ -41,16 +41,14 @@ OPTIM=""
|
||||
AC_SUBST(OPTIM)
|
||||
PICFLAG=1
|
||||
CFLAGS="${CFLAGS:=}"
|
||||
CXXFLAGS="${CXXFLAGS:=}"
|
||||
|
||||
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
|
||||
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"
|
||||
LIBTOOL="$enable_libtool"
|
||||
enable_shared=no
|
||||
echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
|
||||
echo " WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
|
||||
@@ -114,17 +112,13 @@ fi
|
||||
|
||||
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="")
|
||||
|
||||
dnl Checks for programs...
|
||||
AC_PROG_AWK
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CPP
|
||||
AC_PROG_RANLIB
|
||||
AC_PATH_PROG(AR,ar)
|
||||
AC_PATH_PROG(CHMOD,chmod)
|
||||
AC_PATH_PROG(CHOWN,chown)
|
||||
AC_PATH_PROG(CP,cp)
|
||||
AC_PATH_PROG(MV,mv)
|
||||
AC_PATH_PROG(NROFF,nroff)
|
||||
@@ -145,23 +139,9 @@ dnl Architecture checks...
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
dnl Check for libraries...
|
||||
AC_CHECK_LIB(c,crypt,LIBS="$LIBS")
|
||||
if test "$ac_cv_lib_c_crypt" = "no"; then
|
||||
AC_CHECK_LIB(crypt,crypt)
|
||||
fi
|
||||
AC_CHECK_LIB(c,crypt,LIBS="$LIBS",AC_CHECK_LIB(crypt,crypt))
|
||||
AC_CHECK_HEADER(crypt.h, AC_DEFINE(HAVE_CRYPT_H))
|
||||
AC_CHECK_LIB(sec,getspent)
|
||||
|
||||
LIBMALLOC=""
|
||||
AC_CHECK_LIB(c,mallinfo,LIBS="$LIBS"; AC_DEFINE(HAVE_MALLINFO),LIBS="$LIBS")
|
||||
if test "$ac_cv_lib_c_mallinfo" = "no"; then
|
||||
AC_CHECK_LIB(malloc,mallinfo,
|
||||
LIBS="$LIBS"
|
||||
LIBMALLOC="-lmalloc"
|
||||
AC_DEFINE(HAVE_MALLINFO),
|
||||
LIBS="$LIBS")
|
||||
fi
|
||||
AC_SUBST(LIBMALLOC)
|
||||
|
||||
if test "$enable_pam" != "no"; then
|
||||
OLDLIBS="$LIBS"
|
||||
AC_CHECK_LIB(dl,dlopen)
|
||||
@@ -190,40 +170,6 @@ 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"
|
||||
@@ -244,7 +190,7 @@ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
||||
LIBJPEG="-ljpeg"
|
||||
LIBS="$LIBS -ljpeg")
|
||||
|
||||
AC_CHECK_LIB(z, gzgets,
|
||||
AC_CHECK_LIB(z, deflate,
|
||||
AC_DEFINE(HAVE_LIBZ)
|
||||
LIBZ="-lz"
|
||||
LIBS="$LIBS -lz")
|
||||
@@ -266,12 +212,7 @@ LIBS="$SAVELIBS"
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_DIRENT
|
||||
AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
|
||||
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)
|
||||
@@ -296,10 +237,8 @@ AC_CHECK_FUNCS(wait3)
|
||||
|
||||
dnl Update compiler options...
|
||||
if test -n "$GCC"; then
|
||||
GXX="gcc"
|
||||
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-O2"
|
||||
OPTIM="-O2 -g3"
|
||||
fi
|
||||
if test $PICFLAG = 1; then
|
||||
OPTIM="-fPIC $OPTIM"
|
||||
@@ -309,7 +248,7 @@ else
|
||||
case $uname in
|
||||
IRIX*)
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-O2"
|
||||
OPTIM="-O2 -g3"
|
||||
fi
|
||||
if test $uversion -ge 62; then
|
||||
OPTIM="$OPTIM -n32 -mips3"
|
||||
@@ -325,7 +264,7 @@ else
|
||||
SunOS*)
|
||||
# Solaris
|
||||
if test -z "$OPTIM"; then
|
||||
OPTIM="-xO4"
|
||||
OPTIM="-O -g3"
|
||||
fi
|
||||
if test $PICFLAG = 1; then
|
||||
OPTIM="-KPIC $OPTIM"
|
||||
@@ -372,6 +311,19 @@ else
|
||||
IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
|
||||
fi
|
||||
|
||||
# Figure out how to install "cat" pages...
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
INSTALL_CAT="install-bsdcat"
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
INSTALL_CAT="install-cat"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(INSTALL_CAT)
|
||||
|
||||
AC_SUBST(DSO)
|
||||
AC_SUBST(DSOLIBS)
|
||||
AC_SUBST(IMGLIBS)
|
||||
@@ -381,180 +333,48 @@ AC_SUBST(LIBTOOL)
|
||||
AC_SUBST(LINKCUPS)
|
||||
AC_SUBST(LINKCUPSIMAGE)
|
||||
|
||||
dnl Fix "prefix" variable if it hasn't been specified...
|
||||
if test "$prefix" = "NONE"; then
|
||||
prefix="/"
|
||||
fi
|
||||
|
||||
dnl Fix "exec_prefix" variable if it hasn't been specified...
|
||||
if test "$exec_prefix" = "NONE"; then
|
||||
if test "$prefix" = "/"; then
|
||||
exec_prefix="/usr"
|
||||
else
|
||||
exec_prefix="$prefix"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Fix "sharedstatedir" variable if it hasn't been specified...
|
||||
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"; then
|
||||
if test "$prefix" = "/"; then
|
||||
datadir="/usr/share"
|
||||
else
|
||||
datadir="$prefix/share"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Fix "includedir" variable if it hasn't been specified...
|
||||
if test "$includedir" = "\${prefix}/include" -a "$prefix" = "/"; then
|
||||
includedir="/usr/include"
|
||||
fi
|
||||
|
||||
dnl Fix "localstatedir" variable if it hasn't been specified...
|
||||
if test "$localstatedir" = "\${prefix}/var"; then
|
||||
if test "$prefix" = "/"; then
|
||||
localstatedir="/var"
|
||||
else
|
||||
localstatedir="$prefix/var"
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Fix "sysconfdir" variable if it hasn't been specified...
|
||||
if test "$sysconfdir" = "\${prefix}/etc"; then
|
||||
if test "$prefix" = "/"; then
|
||||
sysconfdir="/etc"
|
||||
else
|
||||
sysconfdir="$prefix/etc"
|
||||
fi
|
||||
dnl Fix prefix as needed..
|
||||
if test "$prefix" = "NONE" ; then
|
||||
prefix="/usr"
|
||||
fi
|
||||
|
||||
dnl Fix "libdir" variable for IRIX 6.x...
|
||||
if test "$uname" = "IRIX" -a $uversion -ge 62; then
|
||||
libdir="$exec_prefix/lib32"
|
||||
if test "$uname" = "IRIX" -a $uversion -ge 65; then
|
||||
libdir="${prefix}/lib32"
|
||||
fi
|
||||
|
||||
dnl Fix "mandir" variable...
|
||||
if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
mandir="/usr/share/man"
|
||||
;;
|
||||
IRIX*)
|
||||
# SGI IRIX
|
||||
mandir="/usr/share/catman"
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
mandir="/usr/man"
|
||||
;;
|
||||
esac
|
||||
dnl Need special attention for the default location...
|
||||
if test "$prefix" = "/usr" ; then
|
||||
CUPS_SERVERROOT="/etc/cups"
|
||||
CUPS_LOGDIR="/var/log/cups"
|
||||
CUPS_REQUESTS="/var/spool/cups"
|
||||
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR")
|
||||
AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$CUPS_REQUESTS")
|
||||
else
|
||||
CUPS_SERVERROOT='${prefix}/etc/cups'
|
||||
CUPS_LOGDIR='${prefix}/log/cups'
|
||||
CUPS_REQUESTS='${prefix}/spool/cups'
|
||||
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/log/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/spool/cups")
|
||||
fi
|
||||
|
||||
dnl Fix "fontpath" variable...
|
||||
if test "x$fontpath" = "x"; then
|
||||
fontpath="$datadir/cups/fonts"
|
||||
fi
|
||||
|
||||
dnl Setup manpage extensions...
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
CAT1EXT=0
|
||||
CAT5EXT=0
|
||||
CAT8EXT=0
|
||||
;;
|
||||
IRIX*)
|
||||
# SGI IRIX
|
||||
CAT1EXT=z
|
||||
CAT5EXT=z
|
||||
CAT8EXT=z
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
CAT1EXT=1
|
||||
CAT5EXT=5
|
||||
CAT8EXT=8
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(CAT1EXT)
|
||||
AC_SUBST(CAT5EXT)
|
||||
AC_SUBST(CAT8EXT)
|
||||
|
||||
dnl Setup init.d locations...
|
||||
case "$uname" in
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
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=".."
|
||||
else
|
||||
if test -d /etc/rc.d; then
|
||||
# RedHat
|
||||
INITDIR="/etc/rc.d"
|
||||
INITDDIR="../init.d"
|
||||
else
|
||||
# Others
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
OSF1* | HP-UX*)
|
||||
INITDIR="/sbin"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
|
||||
*)
|
||||
INITDIR="/etc"
|
||||
INITDDIR="../init.d"
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
AC_SUBST(INITDIR)
|
||||
AC_SUBST(INITDDIR)
|
||||
|
||||
dnl Setup default locations...
|
||||
CUPS_SERVERROOT='${sysconfdir}/cups'
|
||||
CUPS_LOGDIR='${localstatedir}/log/cups'
|
||||
CUPS_REQUESTS='${localstatedir}/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
|
||||
FreeBSD* | NetBSD* | OpenBSD*)
|
||||
# *BSD
|
||||
INSTALL_SYSV=""
|
||||
CUPS_SERVERBIN='${exec_prefix}/libexec/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
|
||||
CUPS_SERVERBIN='${prefix}/libexec/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$prefix/libexec/cups")
|
||||
;;
|
||||
*)
|
||||
# All others
|
||||
INSTALL_SYSV="install-sysv"
|
||||
CUPS_SERVERBIN='${exec_prefix}/lib/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
|
||||
CUPS_SERVERBIN='${prefix}/lib/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$prefix/lib/cups")
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -567,19 +387,19 @@ AC_SUBST(CUPS_REQUESTS)
|
||||
dnl Set the CUPS_LOCALE directory...
|
||||
case "$uname" in
|
||||
Linux* | FreeBSD* | NetBSD* | OpenBSD*)
|
||||
CUPS_LOCALEDIR='${datadir}/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
|
||||
CUPS_LOCALEDIR='${prefix}/share/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/share/locale")
|
||||
;;
|
||||
|
||||
OSF1*)
|
||||
CUPS_LOCALEDIR='${exec_prefix}/lib/nls/msg'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
|
||||
CUPS_LOCALEDIR='${prefix}/lib/nls/msg'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/lib/nls/msg")
|
||||
;;
|
||||
|
||||
*)
|
||||
# This is the standard System V location...
|
||||
CUPS_LOCALEDIR='${exec_prefix}/lib/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
|
||||
CUPS_LOCALEDIR='${prefix}/lib/locale'
|
||||
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$prefix/lib/locale")
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -587,18 +407,15 @@ AC_SUBST(CUPS_LOCALEDIR)
|
||||
|
||||
dnl Set the CUPS_DATADIR directory...
|
||||
CUPS_DATADIR='${datadir}/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$prefix/share/cups")
|
||||
AC_SUBST(CUPS_DATADIR)
|
||||
|
||||
dnl Set the CUPS_DOCROOT directory...
|
||||
CUPS_DOCROOT='${datadir}/doc/cups'
|
||||
AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
|
||||
AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$prefix/share/doc/cups")
|
||||
AC_SUBST(CUPS_DOCROOT)
|
||||
|
||||
dnl Set the CUPS_FONTPATH directory...
|
||||
AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
|
||||
|
||||
AC_OUTPUT(Makedefs cups.sh)
|
||||
AC_OUTPUT(Makedefs)
|
||||
|
||||
dnl
|
||||
dnl End of "$Id$".
|
||||
|
||||
+99
@@ -15,6 +15,105 @@ 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>
|
||||
|
||||
+393
-252
@@ -1,10 +1,10 @@
|
||||
#
|
||||
# "$Id: cups.list 1533 2001-01-25 16:43:15Z mike $"
|
||||
# "$Id: cups.list 1084 2000-05-16 19:18:59Z mike $"
|
||||
#
|
||||
# ESP Package Manager (EPM) file list for the Common UNIX Printing
|
||||
# System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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,298 +23,439 @@
|
||||
# WWW: http://www.cups.org
|
||||
#
|
||||
|
||||
# Product information
|
||||
%product Common UNIX Printing System
|
||||
%copyright 1993-2001 by Easy Software Products, All Rights Reserved.
|
||||
%copyright 1993-2000 by Easy Software Products, All Rights Reserved.
|
||||
%vendor Easy Software Products
|
||||
%license LICENSE.txt
|
||||
%readme README.txt
|
||||
%version 1.1.6
|
||||
%version 1.1b4
|
||||
%incompat printpro
|
||||
|
||||
# Server programs
|
||||
%system all
|
||||
# Server files
|
||||
f 0555 root sys $SBINDIR/cupsd scheduler/cupsd
|
||||
|
||||
d 0555 root sys $SERVERBIN -
|
||||
d 0555 root sys $SERVERBIN/backend -
|
||||
f 0555 root sys $SERVERBIN/backend/ipp backend/ipp
|
||||
l 0555 root sys $SERVERBIN/backend/http ipp
|
||||
f 0555 root sys $SERVERBIN/backend/lpd backend/lpd
|
||||
f 0555 root sys $SERVERBIN/backend/parallel backend/parallel
|
||||
f 0555 root sys $SERVERBIN/backend/serial backend/serial
|
||||
f 0555 root sys $SERVERBIN/backend/socket backend/socket
|
||||
f 0555 root sys $SERVERBIN/backend/usb backend/usb
|
||||
d 0555 root sys $SERVERBIN/cgi-bin -
|
||||
f 0555 root sys $SERVERBIN/cgi-bin/admin.cgi cgi-bin/admin.cgi
|
||||
f 0555 root sys $SERVERBIN/cgi-bin/classes.cgi cgi-bin/classes.cgi
|
||||
f 0555 root sys $SERVERBIN/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
|
||||
f 0555 root sys $SERVERBIN/cgi-bin/printers.cgi cgi-bin/printers.cgi
|
||||
d 0555 root sys $SERVERBIN/daemon -
|
||||
f 0555 root sys $SERVERBIN/daemon/cups-lpd scheduler/cups-lpd
|
||||
f 0555 root sys $SERVERBIN/daemon/cups-polld scheduler/cups-polld
|
||||
d 0555 root sys $SERVERBIN/filter -
|
||||
f 0555 root sys $SERVERBIN/filter/pstoraster pstoraster/pstoraster
|
||||
f 0555 root sys $SERVERBIN/filter/pdftops pdftops/pdftops
|
||||
f 0555 root sys $SERVERBIN/filter/imagetops filter/imagetops
|
||||
f 0555 root sys $SERVERBIN/filter/pstops filter/pstops
|
||||
f 0555 root sys $SERVERBIN/filter/texttops filter/texttops
|
||||
f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
|
||||
f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
|
||||
f 0555 root sys $SERVERBIN/filter/hpgltops filter/hpgltops
|
||||
f 0555 root sys $SERVERBIN/filter/imagetoraster filter/imagetoraster
|
||||
f 0500 root sys /usr/sbin/cupsd scheduler/cupsd
|
||||
f 0555 root sys /usr/lib/cups/backend/ipp backend/ipp
|
||||
l 0555 root sys /usr/lib/cups/backend/http ipp
|
||||
f 0555 root sys /usr/lib/cups/backend/lpd backend/lpd
|
||||
f 0555 root sys /usr/lib/cups/backend/parallel backend/parallel
|
||||
f 0555 root sys /usr/lib/cups/backend/serial backend/serial
|
||||
f 0555 root sys /usr/lib/cups/backend/socket backend/socket
|
||||
f 0555 root sys /usr/lib/cups/backend/usb backend/usb
|
||||
f 0555 root sys /usr/lib/cups/cgi-bin/admin.cgi cgi-bin/admin.cgi
|
||||
f 0555 root sys /usr/lib/cups/cgi-bin/classes.cgi cgi-bin/classes.cgi
|
||||
f 0555 root sys /usr/lib/cups/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
|
||||
f 0555 root sys /usr/lib/cups/cgi-bin/printers.cgi cgi-bin/printers.cgi
|
||||
f 0555 root sys /usr/lib/cups/daemon/cups-lpd scheduler/cups-lpd
|
||||
f 0555 root sys /usr/lib/cups/daemon/cups-polld scheduler/cups-polld
|
||||
f 0555 root sys /usr/lib/cups/filter/pstoraster pstoraster/pstoraster
|
||||
l 0555 root sys /usr/lib/cups/filter/pdftops pstoraster
|
||||
f 0555 root sys /usr/lib/cups/filter/imagetops filter/imagetops
|
||||
f 0555 root sys /usr/lib/cups/filter/pstops filter/pstops
|
||||
f 0555 root sys /usr/lib/cups/filter/texttops filter/texttops
|
||||
f 0555 root sys /usr/lib/cups/filter/rastertoepson filter/rastertoepson
|
||||
f 0555 root sys /usr/lib/cups/filter/rastertohp filter/rastertohp
|
||||
f 0555 root sys /usr/lib/cups/filter/hpgltops filter/hpgltops
|
||||
f 0555 root sys /usr/lib/cups/filter/imagetoraster filter/imagetoraster
|
||||
|
||||
# Admin commands
|
||||
l 0555 root sys $BINDIR/disable $SBINDIR/accept
|
||||
l 0555 root sys $BINDIR/enable $SBINDIR/accept
|
||||
l 0555 root sys $LIBDIR/accept $SBINDIR/accept
|
||||
l 0555 root sys $LIBDIR/lpadmin $SBINDIR/lpadmin
|
||||
l 0555 root sys $LIBDIR/reject accept
|
||||
f 0555 root sys $SBINDIR/accept systemv/accept
|
||||
f 0555 root sys $SBINDIR/lpadmin systemv/lpadmin
|
||||
f 0555 root sys $SBINDIR/lpc berkeley/lpc
|
||||
f 0555 root sys $SBINDIR/lpinfo systemv/lpinfo
|
||||
f 0555 root sys $SBINDIR/lpmove systemv/lpmove
|
||||
l 0555 root sys $SBINDIR/reject accept
|
||||
|
||||
%system irix
|
||||
l 0555 root sys /usr/etc/lpc $SBINDIR/lpc
|
||||
%system all
|
||||
l 0555 root sys /usr/bin/disable /usr/sbin/accept
|
||||
l 0555 root sys /usr/bin/enable /usr/sbin/accept
|
||||
l 0555 root sys /usr/lib/accept /usr/sbin/accept
|
||||
l 0555 root sys /usr/lib/lpadmin /usr/sbin/lpadmin
|
||||
l 0555 root sys /usr/lib/reject accept
|
||||
f 0555 root sys /usr/sbin/accept systemv/accept
|
||||
f 0555 root sys /usr/sbin/lpadmin systemv/lpadmin
|
||||
f 0555 root sys /usr/sbin/lpc berkeley/lpc
|
||||
f 0555 root sys /usr/sbin/lpinfo systemv/lpinfo
|
||||
f 0555 root sys /usr/sbin/lpmove systemv/lpmove
|
||||
l 0555 root sys /usr/sbin/reject accept
|
||||
|
||||
# User commands
|
||||
f 0555 root sys $BINDIR/cancel systemv/cancel
|
||||
f 0555 root sys $BINDIR/lp systemv/lp
|
||||
f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
|
||||
f 4555 root sys $BINDIR/lppasswd systemv/lppasswd
|
||||
f 0555 root sys $BINDIR/lpq berkeley/lpq
|
||||
f 0555 root sys $BINDIR/lpr berkeley/lpr
|
||||
f 0555 root sys $BINDIR/lprm berkeley/lprm
|
||||
f 0555 root sys $BINDIR/lpstat systemv/lpstat
|
||||
|
||||
%system irix
|
||||
l 0555 root sys /usr/bsd/lpq $BINDIR/lpq
|
||||
l 0555 root sys /usr/bsd/lpr $BINDIR/lpr
|
||||
l 0555 root sys /usr/bsd/lprm $BINDIR/lprm
|
||||
%system all
|
||||
f 0555 root sys /usr/bin/cancel systemv/cancel
|
||||
f 0555 root sys /usr/bin/lp systemv/lp
|
||||
f 0555 root sys /usr/bin/lpoptions systemv/lpoptions
|
||||
f 4555 root sys /usr/bin/lppasswd systemv/lppasswd
|
||||
f 0555 root sys /usr/bin/lpq berkeley/lpq
|
||||
f 0555 root sys /usr/bin/lpr berkeley/lpr
|
||||
f 0555 root sys /usr/bin/lprm berkeley/lprm
|
||||
f 0555 root sys /usr/bin/lpstat systemv/lpstat
|
||||
|
||||
# DSOs
|
||||
%system hpux
|
||||
f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2
|
||||
l 0555 root sys $LIBDIR/libcups.sl libcups.sl.2
|
||||
f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2
|
||||
l 0555 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
|
||||
%system !hpux
|
||||
f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2
|
||||
l 0555 root sys $LIBDIR/libcups.so libcups.so.2
|
||||
f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2
|
||||
l 0555 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2
|
||||
f 0555 root sys /usr/lib/libcups.sl.2 cups/libcups.sl.2
|
||||
l 0555 root sys /usr/lib/libcups.sl libcups.sl.2
|
||||
f 0555 root sys /usr/lib/libcupsimage.sl.2 filter/libcupsimage.sl.2
|
||||
l 0555 root sys /usr/lib/libcupsimage.sl libcupsimage.sl.2
|
||||
%system irix-6.5
|
||||
f 0555 root sys /usr/lib32/libcups.so.2 cups/libcups.so.2
|
||||
l 0555 root sys /usr/lib32/libcups.so libcups.so.2
|
||||
f 0555 root sys /usr/lib32/libcupsimage.so.2 filter/libcupsimage.so.2
|
||||
l 0555 root sys /usr/lib32/libcupsimage.so libcupsimage.so.2
|
||||
%system !irix-6.5 !hpux
|
||||
f 0555 root sys /usr/lib/libcups.so.2 cups/libcups.so.2
|
||||
l 0555 root sys /usr/lib/libcups.so libcups.so.2
|
||||
f 0555 root sys /usr/lib/libcupsimage.so.2 filter/libcupsimage.so.2
|
||||
l 0555 root sys /usr/lib/libcupsimage.so libcupsimage.so.2
|
||||
%system all
|
||||
|
||||
# Directories
|
||||
d 0755 root sys $LOGDIR -
|
||||
d 0700 lp sys $REQUESTS -
|
||||
d 1700 lp sys $REQUESTS/tmp -
|
||||
d 0711 root sys /etc/cups/certs
|
||||
d 0755 root sys /etc/cups/interfaces
|
||||
d 0755 root sys /etc/cups/ppd
|
||||
d 0755 root sys /var/log/cups
|
||||
d 0755 root sys /var/spool/cups
|
||||
|
||||
# Data files
|
||||
f 0444 root sys $LOCALEDIR/C/cups_C locale/C/cups_C
|
||||
f 0444 root sys $LOCALEDIR/de/cups_de locale/de/cups_de
|
||||
f 0444 root sys $LOCALEDIR/en/cups_en locale/en/cups_en
|
||||
f 0444 root sys $LOCALEDIR/es/cups_es locale/es/cups_es
|
||||
f 0444 root sys $LOCALEDIR/fr/cups_fr locale/fr/cups_fr
|
||||
f 0444 root sys $LOCALEDIR/it/cups_it locale/it/cups_it
|
||||
%system linux
|
||||
f 0444 root sys /usr/share/locale/C/cups_C locale/C/cups_C
|
||||
f 0444 root sys /usr/share/locale/de/cups_de locale/de/cups_de
|
||||
f 0444 root sys /usr/share/locale/en/cups_en locale/en/cups_en
|
||||
f 0444 root sys /usr/share/locale/es/cups_es locale/es/cups_es
|
||||
f 0444 root sys /usr/share/locale/fr/cups_fr locale/fr/cups_fr
|
||||
f 0444 root sys /usr/share/locale/it/cups_it locale/it/cups_it
|
||||
|
||||
d 0555 root sys $DATADIR -
|
||||
%system dunix
|
||||
f 0444 root sys /usr/lib/nls/msg/C/cups_C locale/C/cups_C
|
||||
f 0444 root sys /usr/lib/nls/msg/de/cups_de locale/de/cups_de
|
||||
f 0444 root sys /usr/lib/nls/msg/en/cups_en locale/en/cups_en
|
||||
f 0444 root sys /usr/lib/nls/msg/es/cups_es locale/es/cups_es
|
||||
f 0444 root sys /usr/lib/nls/msg/fr/cups_fr locale/fr/cups_fr
|
||||
f 0444 root sys /usr/lib/nls/msg/it/cups_it locale/it/cups_it
|
||||
|
||||
d 0555 root sys $DATADIR/banners -
|
||||
f 0444 root sys $DATADIR/banners/classified data/classified
|
||||
f 0444 root sys $DATADIR/banners/confidential data/confidential
|
||||
f 0444 root sys $DATADIR/banners/secret data/secret
|
||||
f 0444 root sys $DATADIR/banners/standard data/standard
|
||||
f 0444 root sys $DATADIR/banners/topsecret data/topsecret
|
||||
f 0444 root sys $DATADIR/banners/unclassified data/unclassified
|
||||
%system !linux dunix
|
||||
f 0444 root sys /usr/lib/locale/C/cups_C locale/C/cups_C
|
||||
f 0444 root sys /usr/lib/locale/de/cups_de locale/de/cups_de
|
||||
f 0444 root sys /usr/lib/locale/en/cups_en locale/en/cups_en
|
||||
f 0444 root sys /usr/lib/locale/es/cups_es locale/es/cups_es
|
||||
f 0444 root sys /usr/lib/locale/fr/cups_fr locale/fr/cups_fr
|
||||
f 0444 root sys /usr/lib/locale/it/cups_it locale/it/cups_it
|
||||
|
||||
d 0555 root sys $DATADIR/charsets -
|
||||
f 0444 root sys $DATADIR/charsets/windows-874 data/windows-874
|
||||
f 0444 root sys $DATADIR/charsets/windows-1250 data/windows-1250
|
||||
f 0444 root sys $DATADIR/charsets/windows-1251 data/windows-1251
|
||||
f 0444 root sys $DATADIR/charsets/windows-1252 data/windows-1252
|
||||
f 0444 root sys $DATADIR/charsets/windows-1253 data/windows-1253
|
||||
f 0444 root sys $DATADIR/charsets/windows-1254 data/windows-1254
|
||||
f 0444 root sys $DATADIR/charsets/windows-1255 data/windows-1255
|
||||
f 0444 root sys $DATADIR/charsets/windows-1256 data/windows-1256
|
||||
f 0444 root sys $DATADIR/charsets/windows-1257 data/windows-1257
|
||||
f 0444 root sys $DATADIR/charsets/windows-1258 data/windows-1258
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-1 data/iso-8859-1
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-14 data/iso-8859-14
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-15 data/iso-8859-15
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-2 data/iso-8859-2
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-3 data/iso-8859-3
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-4 data/iso-8859-4
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-5 data/iso-8859-5
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-6 data/iso-8859-6
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-7 data/iso-8859-7
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-8 data/iso-8859-8
|
||||
f 0444 root sys $DATADIR/charsets/iso-8859-9 data/iso-8859-9
|
||||
f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8
|
||||
%system all
|
||||
f 0444 root sys /usr/share/cups/banners/classified data/classified
|
||||
f 0444 root sys /usr/share/cups/banners/confidential data/confidential
|
||||
f 0444 root sys /usr/share/cups/banners/secret data/secret
|
||||
f 0444 root sys /usr/share/cups/banners/standard data/standard
|
||||
f 0444 root sys /usr/share/cups/banners/topsecret data/topsecret
|
||||
f 0444 root sys /usr/share/cups/banners/unclassified data/unclassified
|
||||
|
||||
d 0555 root sys $DATADIR/data -
|
||||
f 0444 root sys $DATADIR/data/HPGLprolog data/HPGLprolog
|
||||
f 0444 root sys $DATADIR/data/psglyphs data/psglyphs
|
||||
f 0444 root sys $DATADIR/data/testprint.ps data/testprint.ps
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-874 data/windows-874
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1250 data/windows-1250
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1251 data/windows-1251
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1252 data/windows-1252
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1253 data/windows-1253
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1254 data/windows-1254
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1255 data/windows-1255
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1256 data/windows-1256
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1257 data/windows-1257
|
||||
f 0444 root sys /usr/share/cups/charsets/windows-1258 data/windows-1258
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-1 data/iso-8859-1
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-14 data/iso-8859-14
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-15 data/iso-8859-15
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-2 data/iso-8859-2
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-3 data/iso-8859-3
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-4 data/iso-8859-4
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-5 data/iso-8859-5
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-6 data/iso-8859-6
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-7 data/iso-8859-7
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-8 data/iso-8859-8
|
||||
f 0444 root sys /usr/share/cups/charsets/iso-8859-9 data/iso-8859-9
|
||||
f 0444 root sys /usr/share/cups/charsets/utf-8 data/utf-8
|
||||
|
||||
d 0555 root sys $DATADIR/fonts -
|
||||
f 0444 root sys $DATADIR/fonts fonts/*
|
||||
f 0444 root sys /usr/share/cups/data/HPGLprolog data/HPGLprolog
|
||||
f 0444 root sys /usr/share/cups/data/psglyphs data/psglyphs
|
||||
f 0444 root sys /usr/share/cups/data/testprint.ps data/testprint.ps
|
||||
|
||||
d 0555 root sys $DATADIR/pstoraster -
|
||||
f 0444 root sys $DATADIR/pstoraster/Fontmap pstoraster/Fontmap
|
||||
f 0444 root sys $DATADIR/pstoraster pstoraster/gs*.ps
|
||||
f 0444 root sys /usr/share/cups/fonts/AvantGarde-Book fonts/AvantGarde-Book
|
||||
f 0444 root sys /usr/share/cups/fonts/AvantGarde-BookOblique fonts/AvantGarde-BookOblique
|
||||
f 0444 root sys /usr/share/cups/fonts/AvantGarde-Demi fonts/AvantGarde-Demi
|
||||
f 0444 root sys /usr/share/cups/fonts/AvantGarde-DemiOblique fonts/AvantGarde-DemiOblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Bookman-Demi fonts/Bookman-Demi
|
||||
f 0444 root sys /usr/share/cups/fonts/Bookman-DemiItalic fonts/Bookman-DemiItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Bookman-Light fonts/Bookman-Light
|
||||
f 0444 root sys /usr/share/cups/fonts/Bookman-LightItalic fonts/Bookman-LightItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Charter-Bold fonts/Charter-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Charter-BoldItalic fonts/Charter-BoldItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Charter-Italic fonts/Charter-Italic
|
||||
f 0444 root sys /usr/share/cups/fonts/Charter-Roman fonts/Charter-Roman
|
||||
f 0444 root sys /usr/share/cups/fonts/Courier fonts/Courier
|
||||
f 0444 root sys /usr/share/cups/fonts/Courier-Bold fonts/Courier-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Courier-BoldOblique fonts/Courier-BoldOblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Courier-Oblique fonts/Courier-Oblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica fonts/Helvetica
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Bold fonts/Helvetica-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-BoldOblique fonts/Helvetica-BoldOblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow fonts/Helvetica-Narrow
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Bold fonts/Helvetica-Narrow-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-BoldOblique fonts/Helvetica-Narrow-BoldOblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Oblique fonts/Helvetica-Narrow-Oblique
|
||||
f 0444 root sys /usr/share/cups/fonts/Helvetica-Oblique fonts/Helvetica-Oblique
|
||||
f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Bold fonts/NewCenturySchlbk-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-BoldItalic fonts/NewCenturySchlbk-BoldItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Italic fonts/NewCenturySchlbk-Italic
|
||||
f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Roman fonts/NewCenturySchlbk-Roman
|
||||
f 0444 root sys /usr/share/cups/fonts/Palatino-Bold fonts/Palatino-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Palatino-BoldItalic fonts/Palatino-BoldItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Palatino-Italic fonts/Palatino-Italic
|
||||
f 0444 root sys /usr/share/cups/fonts/Palatino-Roman fonts/Palatino-Roman
|
||||
f 0444 root sys /usr/share/cups/fonts/Symbol fonts/Symbol
|
||||
f 0444 root sys /usr/share/cups/fonts/Times-Bold fonts/Times-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Times-BoldItalic fonts/Times-BoldItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Times-Italic fonts/Times-Italic
|
||||
f 0444 root sys /usr/share/cups/fonts/Times-Roman fonts/Times-Roman
|
||||
f 0444 root sys /usr/share/cups/fonts/Utopia-Bold fonts/Utopia-Bold
|
||||
f 0444 root sys /usr/share/cups/fonts/Utopia-BoldItalic fonts/Utopia-BoldItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/Utopia-Italic fonts/Utopia-Italic
|
||||
f 0444 root sys /usr/share/cups/fonts/Utopia-Regular fonts/Utopia-Regular
|
||||
f 0444 root sys /usr/share/cups/fonts/ZapfChancery-MediumItalic fonts/ZapfChancery-MediumItalic
|
||||
f 0444 root sys /usr/share/cups/fonts/ZapfDingbats fonts/ZapfDingbats
|
||||
|
||||
d 0555 root sys $DATADIR/model -
|
||||
f 0444 root sys $DATADIR/model ppd/*.ppd
|
||||
f 0444 root sys /usr/share/cups/pstoraster/Fontmap pstoraster/Fontmap
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_btokn.ps pstoraster/gs_btokn.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_ccfnt.ps pstoraster/gs_ccfnt.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_cff.ps pstoraster/gs_cff.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_cidfn.ps pstoraster/gs_cidfn.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_cmap.ps pstoraster/gs_cmap.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_cmdl.ps pstoraster/gs_cmdl.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_dbt_e.ps pstoraster/gs_dbt_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_diskf.ps pstoraster/gs_diskf.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_dpnxt.ps pstoraster/gs_dpnxt.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_dps1.ps pstoraster/gs_dps1.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_dps2.ps pstoraster/gs_dps2.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_dps.ps pstoraster/gs_dps.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_epsf.ps pstoraster/gs_epsf.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_fform.ps pstoraster/gs_fform.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_fonts.ps pstoraster/gs_fonts.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_init.ps pstoraster/gs_init.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_iso_e.ps pstoraster/gs_iso_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_kanji.ps pstoraster/gs_kanji.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_ksb_e.ps pstoraster/gs_ksb_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_l2img.ps pstoraster/gs_l2img.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_lev2.ps pstoraster/gs_lev2.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_ll3.ps pstoraster/gs_ll3.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_mex_e.ps pstoraster/gs_mex_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_mro_e.ps pstoraster/gs_mro_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_pdfwr.ps pstoraster/gs_pdfwr.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_pdf_e.ps pstoraster/gs_pdf_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_pfile.ps pstoraster/gs_pfile.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_res.ps pstoraster/gs_res.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_setpd.ps pstoraster/gs_setpd.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_statd.ps pstoraster/gs_statd.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_std_e.ps pstoraster/gs_std_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_sym_e.ps pstoraster/gs_sym_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_ttf.ps pstoraster/gs_ttf.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_typ32.ps pstoraster/gs_typ32.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_typ42.ps pstoraster/gs_typ42.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_type1.ps pstoraster/gs_type1.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_wan_e.ps pstoraster/gs_wan_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_wl1_e.ps pstoraster/gs_wl1_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_wl2_e.ps pstoraster/gs_wl2_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/gs_wl5_e.ps pstoraster/gs_wl5_e.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf2dsc.ps pstoraster/pdf2dsc.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_base.ps pstoraster/pdf_base.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_draw.ps pstoraster/pdf_draw.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_font.ps pstoraster/pdf_font.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_main.ps pstoraster/pdf_main.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_ops.ps pstoraster/pdf_ops.ps
|
||||
f 0444 root sys /usr/share/cups/pstoraster/pdf_sec.ps pstoraster/pdf_sec.ps
|
||||
|
||||
d 0555 root sys $DATADIR/templates -
|
||||
f 0444 root sys $DATADIR/templates templates/*.tmpl
|
||||
f 0444 root sys /usr/share/cups/model/deskjet.ppd ppd/deskjet.ppd
|
||||
f 0444 root sys /usr/share/cups/model/laserjet.ppd ppd/laserjet.ppd
|
||||
#f 0444 root sys /usr/share/cups/model/epson9.ppd ppd/epson9.ppd
|
||||
#f 0444 root sys /usr/share/cups/model/epson24.ppd ppd/epson24.ppd
|
||||
f 0444 root sys /usr/share/cups/model/stcolor.ppd ppd/stcolor.ppd
|
||||
f 0444 root sys /usr/share/cups/model/stphoto.ppd ppd/stphoto.ppd
|
||||
|
||||
f 0444 root sys /usr/share/cups/templates/add-class.tmpl templates/add-class.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/add-printer.tmpl templates/add-printer.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/admin-op.tmpl templates/admin-op.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/admin.tmpl templates/admin.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-device.tmpl templates/choose-device.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-make.tmpl templates/choose-make.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-members.tmpl templates/choose-members.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-model.tmpl templates/choose-model.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-serial.tmpl templates/choose-serial.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/choose-uri.tmpl templates/choose-uri.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/class-added.tmpl templates/class-added.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/class-confirm.tmpl templates/class-confirm.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/class-deleted.tmpl templates/class-deleted.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/class-modified.tmpl templates/class-modified.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/classes.tmpl templates/classes.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/config-printer.tmpl templates/config-printer.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/config-printer2.tmpl templates/config-printer2.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/error.tmpl templates/error.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/job-cancel.tmpl templates/job-cancel.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/job-hold.tmpl templates/job-hold.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/job-release.tmpl templates/job-release.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/jobs.tmpl templates/jobs.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/modify-class.tmpl templates/modify-class.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/modify-printer.tmpl templates/modify-printer.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/option-boolean.tmpl templates/option-boolean.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/option-header.tmpl templates/option-header.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/option-pickmany.tmpl templates/option-pickmany.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/option-pickone.tmpl templates/option-pickone.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/option-trailer.tmpl templates/option-trailer.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-accept.tmpl templates/printer-accept.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-added.tmpl templates/printer-added.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-configured.tmpl templates/printer-configured.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-confirm.tmpl templates/printer-confirm.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-deleted.tmpl templates/printer-deleted.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-modified.tmpl templates/printer-modified.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-reject.tmpl templates/printer-reject.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-start.tmpl templates/printer-start.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printer-stop.tmpl templates/printer-stop.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/printers.tmpl templates/printers.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/test-page.tmpl templates/test-page.tmpl
|
||||
|
||||
f 0444 root sys /usr/share/cups/templates/header.tmpl templates/header.tmpl
|
||||
f 0444 root sys /usr/share/cups/templates/trailer.tmpl templates/trailer.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 conf/*.conf
|
||||
f 0644 root sys $SERVERROOT/mime.convs conf/mime.convs
|
||||
f 0644 root sys $SERVERROOT/mime.types conf/mime.types
|
||||
|
||||
%system linux
|
||||
d 0555 root sys $PAMDIR -
|
||||
c 0644 root sys $PAMDIR/cups data/cups.pam
|
||||
c 0644 root sys $PAMDIR/cups.suse data/cups.suse
|
||||
%install if test -f /lib/security/pam_unix.so; then
|
||||
%install mv $PAMDIR/cups.suse $PAMDIR/cups
|
||||
%install fi
|
||||
%system all
|
||||
c 0644 root sys /etc/cups/classes.conf conf/classes.conf
|
||||
c 0644 root sys /etc/cups/cupsd.conf conf/cupsd.conf
|
||||
f 0644 root sys /etc/cups/mime.convs conf/mime.convs
|
||||
f 0644 root sys /etc/cups/mime.types conf/mime.types
|
||||
c 0644 root sys /etc/cups/printers.conf conf/printers.conf
|
||||
c 0644 root sys /etc/pam.d/cups data/cups.pam
|
||||
|
||||
# Developer files
|
||||
d 0555 root sys $INCLUDEDIR/cups -
|
||||
f 0444 root sys $INCLUDEDIR/cups/cups.h cups/cups.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/http.h cups/http.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/image.h filter/image.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/ipp.h cups/ipp.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/language.h cups/language.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/md5.h cups/md5.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/ppd.h cups/ppd.h
|
||||
f 0444 root sys $INCLUDEDIR/cups/raster.h filter/raster.h
|
||||
f 0444 root sys /usr/include/cups/cups.h cups/cups.h
|
||||
f 0444 root sys /usr/include/cups/http.h cups/http.h
|
||||
f 0444 root sys /usr/include/cups/image.h filter/image.h
|
||||
f 0444 root sys /usr/include/cups/ipp.h cups/ipp.h
|
||||
f 0444 root sys /usr/include/cups/language.h cups/language.h
|
||||
f 0444 root sys /usr/include/cups/md5.h cups/md5.h
|
||||
f 0444 root sys /usr/include/cups/ppd.h cups/ppd.h
|
||||
f 0444 root sys /usr/include/cups/raster.h filter/raster.h
|
||||
|
||||
f 0444 root sys $LIBDIR/libcups.a cups/libcups.a
|
||||
%system irix-6.5
|
||||
f 0444 root sys /usr/lib32/libcups.a cups/libcups.a
|
||||
%system !irix-6.5
|
||||
f 0444 root sys /usr/lib/libcups.a cups/libcups.a
|
||||
%system all
|
||||
|
||||
# Documentation files
|
||||
d 0555 root sys $DOCDIR -
|
||||
f 0444 root sys $DOCDIR/cups.css doc/cups.css
|
||||
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 doc/images/*.gif
|
||||
f 0444 root sys /usr/share/doc/cups/cups.css doc/cups.css
|
||||
f 0444 root sys /usr/share/doc/cups/documentation.html doc/documentation.html
|
||||
f 0444 root sys /usr/share/doc/cups/index.html doc/index.html
|
||||
|
||||
f 0444 root sys /usr/share/doc/cups/images/accept-jobs.gif doc/images/accept-jobs.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/add-class.gif doc/images/add-class.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/add-printer.gif doc/images/add-printer.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cancel-job.gif doc/images/cancel-job.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cancel-jobs.gif doc/images/cancel-jobs.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cancel.gif doc/images/cancel.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/classes.gif doc/images/classes.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/continue.gif doc/images/continue.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/config-printer.gif doc/images/config-printer.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cups-bar.gif doc/images/cups-bar.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cups-block-diagram.gif doc/images/cups-block-diagram.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cups-large.gif doc/images/cups-large.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cups-medium.gif doc/images/cups-medium.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/cups-small.gif doc/images/cups-small.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/delete-class.gif doc/images/delete-class.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/delete-printer.gif doc/images/delete-printer.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/hold-job.gif doc/images/hold-job.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/left.gif doc/images/left.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/logo.gif doc/images/logo.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/manage-classes.gif doc/images/manage-classes.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/manage-jobs.gif doc/images/manage-jobs.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/manage-printers.gif doc/images/manage-printers.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/modify-class.gif doc/images/modify-class.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/modify-printer.gif doc/images/modify-printer.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/navbar.gif doc/images/navbar.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/print-test-page.gif doc/images/print-test-page.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/printer-idle.gif doc/images/printer-idle.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/printer-processing.gif doc/images/printer-processing.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/printer-stopped.gif doc/images/printer-stopped.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/reject-jobs.gif doc/images/reject-jobs.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/release-job.gif doc/images/release-job.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/restart-job.gif doc/images/restart-job.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/right.gif doc/images/right.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/show-active.gif doc/images/show-active.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/show-completed.gif doc/images/show-completed.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/start-class.gif doc/images/start-class.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/start-printer.gif doc/images/start-printer.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/stop-class.gif doc/images/stop-class.gif
|
||||
f 0444 root sys /usr/share/doc/cups/images/stop-printer.gif doc/images/stop-printer.gif
|
||||
|
||||
f 0444 root sys /usr/share/doc/cups/cmp.html doc/cmp.html
|
||||
f 0444 root sys /usr/share/doc/cups/cmp.pdf doc/cmp.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/cupsdoc.css doc/cupsdoc.css
|
||||
f 0444 root sys /usr/share/doc/cups/idd.html doc/idd.html
|
||||
f 0444 root sys /usr/share/doc/cups/idd.pdf doc/idd.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/overview.html doc/overview.html
|
||||
f 0444 root sys /usr/share/doc/cups/overview.pdf doc/overview.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/sam.html doc/sam.html
|
||||
f 0444 root sys /usr/share/doc/cups/sam.pdf doc/sam.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/sdd.html doc/sdd.html
|
||||
f 0444 root sys /usr/share/doc/cups/sdd.pdf doc/sdd.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/spm.html doc/spm.html
|
||||
f 0444 root sys /usr/share/doc/cups/spm.pdf doc/spm.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/ssr.html doc/ssr.html
|
||||
f 0444 root sys /usr/share/doc/cups/ssr.pdf doc/ssr.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/sum.html doc/sum.html
|
||||
f 0444 root sys /usr/share/doc/cups/sum.pdf doc/sum.pdf
|
||||
f 0444 root sys /usr/share/doc/cups/svd.html doc/svd.html
|
||||
f 0444 root sys /usr/share/doc/cups/svd.pdf doc/svd.pdf
|
||||
|
||||
# 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 -
|
||||
|
||||
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
|
||||
|
||||
%system solaris hpux
|
||||
d 0555 root sys $MANDIR/man1 -
|
||||
d 0555 root sys $MANDIR/man5 -
|
||||
d 0555 root sys $MANDIR/man1m -
|
||||
|
||||
f 0444 root sys $MANDIR/man1m/accept.1m man/accept.man
|
||||
l 0444 root sys $MANDIR/man1m/reject.1m accept.1m
|
||||
f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
|
||||
f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
|
||||
f 0444 root sys $MANDIR/man1m/cups-lpd.1m man/cups-lpd.man
|
||||
f 0444 root sys $MANDIR/man1m/cups-polld.1m man/cups-polld.man
|
||||
f 0444 root sys $MANDIR/man1m/cupsd.1m man/cupsd.man
|
||||
f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
|
||||
f 0444 root sys $MANDIR/man1m/enable.1m man/enable.man
|
||||
l 0444 root sys $MANDIR/man1m/disable.1m enable.1m
|
||||
f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
|
||||
f 0444 root sys $MANDIR/man1m/lpadmin.1m man/lpadmin.man
|
||||
f 0444 root sys $MANDIR/man1m/lpc.1m man/lpc.man
|
||||
f 0444 root sys $MANDIR/man1m/lpinfo.1m man/lpinfo.man
|
||||
f 0444 root sys $MANDIR/man1m/lpmove.1m man/lpmove.man
|
||||
f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.man
|
||||
f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.man
|
||||
f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.man
|
||||
f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.man
|
||||
f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.man
|
||||
f 0444 root sys $MANDIR/man1/lp.1 man/lp.man
|
||||
l 0444 root sys $MANDIR/man1/cancel.1 lp.1
|
||||
f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.man
|
||||
f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.man
|
||||
f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
|
||||
|
||||
%system !irix !solaris !hpux
|
||||
d 0555 root sys $MANDIR/man1 -
|
||||
d 0555 root sys $MANDIR/man5 -
|
||||
d 0555 root sys $MANDIR/man8 -
|
||||
|
||||
f 0444 root sys $MANDIR/man8/accept.8 man/accept.man
|
||||
l 0444 root sys $MANDIR/man8/reject.8 accept.8
|
||||
f 0444 root sys $MANDIR/man1/backend.1 man/backend.man
|
||||
f 0444 root sys $MANDIR/man1/classes.conf.5 man/classes.conf.man
|
||||
f 0444 root sys $MANDIR/man8/cups-lpd.8 man/cups-lpd.man
|
||||
f 0444 root sys $MANDIR/man8/cups-polld.8 man/cups-polld.man
|
||||
f 0444 root sys $MANDIR/man8/cupsd.8 man/cupsd.man
|
||||
f 0444 root sys $MANDIR/man5/cupsd.conf.5 man/cupsd.conf.man
|
||||
f 0444 root sys $MANDIR/man8/enable.8 man/enable.man
|
||||
l 0444 root sys $MANDIR/man8/disable.8 enable.8
|
||||
f 0444 root sys $MANDIR/man1/filter.1 man/filter.man
|
||||
f 0444 root sys $MANDIR/man8/lpadmin.8 man/lpadmin.man
|
||||
f 0444 root sys $MANDIR/man8/lpc.8 man/lpc.man
|
||||
f 0444 root sys $MANDIR/man8/lpinfo.8 man/lpinfo.man
|
||||
f 0444 root sys $MANDIR/man8/lpmove.8 man/lpmove.man
|
||||
f 0444 root sys $MANDIR/man1/lpoptions.1 man/lpoptions.man
|
||||
f 0444 root sys $MANDIR/man1/lpq.1 man/lpq.man
|
||||
f 0444 root sys $MANDIR/man1/lprm.1 man/lprm.man
|
||||
f 0444 root sys $MANDIR/man1/lpr.1 man/lpr.man
|
||||
f 0444 root sys $MANDIR/man1/lpstat.1 man/lpstat.man
|
||||
f 0444 root sys $MANDIR/man1/lp.1 man/lp.man
|
||||
l 0444 root sys $MANDIR/man1/cancel.1 lp.1
|
||||
f 0444 root sys $MANDIR/man5/mime.convs.5 man/mime.convs.man
|
||||
f 0444 root sys $MANDIR/man5/mime.types.5 man/mime.types.man
|
||||
f 0444 root sys $MANDIR/man5/printers.conf.5 man/printers.conf.man
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/accept.1 man/accept.8
|
||||
l 0444 root sys /usr/share/catman/a_man/cat1/reject.1 accept.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/backend.1 man/backend.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat5/classes.conf.5 man/classes.conf.5
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/cups-lpd.1 man/cups-lpd.8
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/cups-polld.1 man/cups-polld.8
|
||||
f 0444 root sys /usr/share/catman/u_man/cat5/cupsd.conf.5 man/cupsd.conf.5
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/cupsd.1 man/cupsd.8
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/enable.1 man/enable.8
|
||||
l 0444 root sys /usr/share/catman/a_man/cat1/disable.1 enable.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/filter.1 man/filter.1
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/lpadmin.1 man/lpadmin.8
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/lpc.1 man/lpc.8
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/lpinfo.1 man/lpinfo.8
|
||||
f 0444 root sys /usr/share/catman/a_man/cat1/lpmove.1 man/lpmove.8
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lpoptions.1 man/lpoptions.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lpq.1 man/lpq.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lprm.1 man/lprm.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lpr.1 man/lpr.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lpstat.1 man/lpstat.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat1/lp.1 man/lp.1
|
||||
l 0444 root sys /usr/share/catman/u_man/cat1/cancel.1 lp.1
|
||||
f 0444 root sys /usr/share/catman/u_man/cat5/mime.convs.5 man/mime.convs.5
|
||||
f 0444 root sys /usr/share/catman/u_man/cat5/mime.types.5 man/mime.types.5
|
||||
f 0444 root sys /usr/share/catman/u_man/cat5/printers.conf.5 man/printers.conf.5
|
||||
%system !irix
|
||||
f 0444 root sys /usr/man/man8/accept.8 man/accept.man
|
||||
l 0444 root sys /usr/man/man8/reject.8 accept.man
|
||||
f 0444 root sys /usr/man/man1/backend.1 man/backend.man
|
||||
f 0444 root sys /usr/man/man1/classes.conf.5 man/classes.conf.man
|
||||
f 0444 root sys /usr/man/man8/cups-lpd.8 man/cups-lpd.man
|
||||
f 0444 root sys /usr/man/man8/cups-polld.8 man/cups-polld.man
|
||||
f 0444 root sys /usr/man/man8/cupsd.8 man/cupsd.man
|
||||
f 0444 root sys /usr/man/man5/cupsd.conf.5 man/cupsd.conf.man
|
||||
f 0444 root sys /usr/man/man8/enable.8 man/enable.man
|
||||
l 0444 root sys /usr/man/man8/disable.8 enable.man
|
||||
f 0444 root sys /usr/man/man1/filter.1 man/filter.man
|
||||
f 0444 root sys /usr/man/man8/lpadmin.8 man/lpadmin.man
|
||||
f 0444 root sys /usr/man/man8/lpc.8 man/lpc.man
|
||||
f 0444 root sys /usr/man/man8/lpinfo.8 man/lpinfo.man
|
||||
f 0444 root sys /usr/man/man8/lpmove.8 man/lpmove.man
|
||||
f 0444 root sys /usr/man/man1/lpoptions.1 man/lpoptions.man
|
||||
f 0444 root sys /usr/man/man1/lpq.1 man/lpq.man
|
||||
f 0444 root sys /usr/man/man1/lprm.1 man/lprm.man
|
||||
f 0444 root sys /usr/man/man1/lpr.1 man/lpr.man
|
||||
f 0444 root sys /usr/man/man1/lpstat.1 man/lpstat.man
|
||||
f 0444 root sys /usr/man/man1/lp.1 man/lp.man
|
||||
l 0444 root sys /usr/man/man1/cancel.1 lp.man
|
||||
f 0444 root sys /usr/man/man5/mime.convs.5 man/mime.convs.man
|
||||
f 0444 root sys /usr/man/man5/mime.types.5 man/mime.types.man
|
||||
f 0444 root sys /usr/man/man5/printers.conf.5 man/printers.conf.man
|
||||
|
||||
# Startup script
|
||||
%system all
|
||||
i 0555 root sys cups cups.sh
|
||||
|
||||
#
|
||||
# End of "$Id: cups.list 1533 2001-01-25 16:43:15Z mike $".
|
||||
# End of "$Id: cups.list 1084 2000-05-16 19:18:59Z mike $".
|
||||
#
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
#
|
||||
# Linux chkconfig stuff:
|
||||
#
|
||||
# chkconfig: 0235 99 00
|
||||
# chkconfig: 02345 99 00
|
||||
# description: Startup/shutdown script for the Common UNIX \
|
||||
# Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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
|
||||
@@ -77,9 +77,7 @@ case $1 in
|
||||
fi
|
||||
else
|
||||
if $IS_ON cups; then
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
@sbindir@/cupsd
|
||||
/usr/sbin/cupsd
|
||||
$ECHO "cups: scheduler started."
|
||||
fi
|
||||
fi
|
||||
+19
-89
@@ -1,11 +1,11 @@
|
||||
#
|
||||
# "$Id: cups.spec 1533 2001-01-25 16:43:15Z mike $"
|
||||
# "$Id: cups.spec 1052 2000-05-04 21:17:20Z mike $"
|
||||
#
|
||||
# RPM "spec" file for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Original version by Jason McMullan <jmcc@ontv.com>.
|
||||
#
|
||||
# Copyright 1999-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1999-2000 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,16 +26,16 @@
|
||||
|
||||
Summary: Common Unix Printing System
|
||||
Name: cups
|
||||
Version: 1.1.6
|
||||
Version: 1.1b4
|
||||
Release: 0
|
||||
Copyright: GPL
|
||||
Group: System Environment/Daemons
|
||||
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
|
||||
Source: ftp://ftp.easysw.com/pub/cups/beta/cups-1.1b4-source.tar.gz
|
||||
Url: http://www.cups.org
|
||||
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
|
||||
BuildRoot: /tmp/rpmbuild
|
||||
Conflicts: lpr
|
||||
|
||||
%package devel
|
||||
@@ -67,110 +67,40 @@ make
|
||||
# RPM_BUILD_ROOT exists
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc0.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc3.d
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc5.d
|
||||
|
||||
make prefix=$RPM_BUILD_ROOT \
|
||||
exec_prefix=$RPM_BUILD_ROOT/usr \
|
||||
BINDIR=$RPM_BUILD_ROOT/usr/bin \
|
||||
DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
|
||||
DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
|
||||
INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
|
||||
LIBDIR=$RPM_BUILD_ROOT/usr/lib \
|
||||
LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
|
||||
MANDIR=$RPM_BUILD_ROOT/usr/man \
|
||||
PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
|
||||
make prefix=$RPM_BUILD_ROOT/usr LOGDIR=$RPM_BUILD_ROOT/var/log/cups \
|
||||
REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
|
||||
SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
|
||||
SERVERBIN=$RPM_BUILD_ROOT/usr/lib/cups \
|
||||
SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
|
||||
install
|
||||
SERVERROOT=$RPM_BUILD_ROOT/etc/cups install
|
||||
|
||||
install -m 755 -o root -g root cups.sh $RPM_BUILD_ROOT/etc/rc.d/init.d/cups
|
||||
|
||||
%post
|
||||
if test -x /sbin/chkconfig; then
|
||||
/sbin/chkconfig --add cups
|
||||
/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
|
||||
/sbin/chkconfig --add cups
|
||||
/sbin/chkconfig cups on
|
||||
/etc/rc.d/init.d/cups start
|
||||
|
||||
%preun
|
||||
if test -f /sbin/init.d/cups; then
|
||||
/sbin/init.d/cups stop
|
||||
fi
|
||||
if test -f /etc/rc.d/init.d/cups; then
|
||||
/etc/rc.d/init.d/cups stop
|
||||
fi
|
||||
if test -f /etc/init.d/cups; then
|
||||
/etc/init.d/cups stop
|
||||
fi
|
||||
|
||||
if test -x /sbin/chkconfig; then
|
||||
/sbin/chkconfig --del cups
|
||||
fi
|
||||
/etc/rc.d/init.d/cups stop
|
||||
/sbin/chkconfig --del cups
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir /etc/cups
|
||||
%config /etc/cups/*.conf
|
||||
%dir /etc/cups/certs
|
||||
%dir /etc/cups/interfaces
|
||||
/etc/cups/mime.types
|
||||
/etc/cups/mime.convs
|
||||
%dir /etc/cups/ppd
|
||||
%dir /etc/pam.d
|
||||
/etc/pam.d/*
|
||||
|
||||
# RC dirs are a pain under Linux... Uncomment the appropriate ones if you
|
||||
# don't use Red Hat or Mandrake...
|
||||
|
||||
/etc/rc.d/init.d/*
|
||||
/etc/rc.d/rc0.d/*
|
||||
/etc/rc.d/rc3.d/*
|
||||
/etc/rc.d/rc5.d/*
|
||||
|
||||
#/etc/init.d/*
|
||||
#/etc/rc0.d/*
|
||||
#/etc/rc3.d/*
|
||||
#/etc/rc5.d/*
|
||||
|
||||
#/sbin/rc.d/*
|
||||
#/sbin/rc.d/rc0.d/*
|
||||
#/sbin/rc.d/rc3.d/*
|
||||
#/sbin/rc.d/rc5.d/*
|
||||
|
||||
/etc/*
|
||||
/usr/bin/*
|
||||
/usr/lib/*.so*
|
||||
%dir /usr/lib/cups
|
||||
/usr/lib/cups/*
|
||||
/usr/man/*
|
||||
/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
|
||||
/usr/share/*
|
||||
/usr/lib/cups/*
|
||||
/var/*
|
||||
|
||||
%files devel
|
||||
%dir /usr/include/cups
|
||||
/usr/include/cups/*
|
||||
/usr/lib/*.a
|
||||
|
||||
#
|
||||
# End of "$Id: cups.spec 1533 2001-01-25 16:43:15Z mike $".
|
||||
# End of "$Id: cups.spec 1052 2000-05-04 21:17:20Z mike $".
|
||||
#
|
||||
|
||||
+7
-11
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Support library Makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
# Copyright 1997-2000 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
|
||||
@@ -59,7 +59,7 @@ all: $(TARGETS)
|
||||
#
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(TARGETS) `basename $(LIBCUPS) .2`
|
||||
$(RM) $(OBJS) $(TARGETS)
|
||||
|
||||
|
||||
#
|
||||
@@ -68,16 +68,13 @@ clean:
|
||||
|
||||
install: all
|
||||
-$(MKDIR) $(INCLUDEDIR)/cups
|
||||
$(CHMOD) ugo+rx $(INCLUDEDIR)
|
||||
$(CHMOD) ugo+rx $(INCLUDEDIR)/cups
|
||||
$(INSTALL_DATA) $(HEADERS) $(INCLUDEDIR)/cups
|
||||
-$(MKDIR) $(LIBDIR)
|
||||
$(CHMOD) ugo+rx $(LIBDIR)
|
||||
$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
|
||||
if test $(LIBCUPS) != "libcups.a" -a $(LIBCUPS) != "libcups.la"; then \
|
||||
$(INSTALL_LIB) libcups.a $(LIBDIR); \
|
||||
$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
||||
$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
|
||||
$(RM) `basename $(LIBCUPS) .2`; \
|
||||
$(LN) $(LIBCUPS) `basename $(LIBCUPS) .2`; \
|
||||
fi
|
||||
|
||||
|
||||
@@ -87,7 +84,7 @@ install: all
|
||||
|
||||
libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
|
||||
echo Linking $@...
|
||||
$(DSO) $@ $(LIBOBJS) $(SSLLIBS)
|
||||
$(DSO) $@ $(LIBOBJS)
|
||||
$(RM) `basename $@ .2`
|
||||
$(LN) $@ `basename $@ .2`
|
||||
|
||||
@@ -98,8 +95,7 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs
|
||||
|
||||
libcups.la: $(LIBOBJS) ../Makedefs
|
||||
echo Linking $@...
|
||||
$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
|
||||
-version-info 2:0 $(SSLLIBS) $(LIBS)
|
||||
$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
|
||||
|
||||
|
||||
#
|
||||
@@ -144,7 +140,7 @@ util.o: cups.h http.h ipp.h
|
||||
|
||||
testhttp: testhttp.o libcups.a
|
||||
echo Linking $@...
|
||||
$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS)
|
||||
$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)
|
||||
|
||||
testhttp.o: http.h
|
||||
|
||||
|
||||
+10
-18
@@ -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=.\dest.c
|
||||
SOURCE=.\emit.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\emit.c
|
||||
SOURCE=.\filter.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -109,11 +109,7 @@ SOURCE=.\mark.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\md5.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\md5passwd.c
|
||||
SOURCE=.\mime.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -129,6 +125,10 @@ 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=.\usersys.c
|
||||
SOURCE=.\type.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -153,14 +153,6 @@ 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
|
||||
@@ -173,7 +165,7 @@ SOURCE=.\language.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\md5.h
|
||||
SOURCE=.\mime.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -181,7 +173,7 @@ SOURCE=.\ppd.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\string.h
|
||||
SOURCE=.\raster.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
|
||||
+4
-12
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* API definitions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -29,8 +29,8 @@
|
||||
* Include necessary headers...
|
||||
*/
|
||||
|
||||
# include "ipp.h"
|
||||
# include "ppd.h"
|
||||
# include <cups/ipp.h>
|
||||
# include <cups/ppd.h>
|
||||
|
||||
|
||||
/*
|
||||
@@ -46,7 +46,7 @@ extern "C" {
|
||||
* Constants...
|
||||
*/
|
||||
|
||||
# define CUPS_VERSION 1.0103
|
||||
# define CUPS_VERSION 1.0
|
||||
# define CUPS_DATE_ANY -1
|
||||
|
||||
|
||||
@@ -75,7 +75,6 @@ enum /* Not a typedef'd enum so we can OR */
|
||||
CUPS_PRINTER_LARGE = 0x4000, /* Can do D/E/A1/A0 */
|
||||
CUPS_PRINTER_VARIABLE = 0x8000, /* Can do variable sizes */
|
||||
CUPS_PRINTER_IMPLICIT = 0x10000, /* Implicit class */
|
||||
CUPS_PRINTER_DEFAULT = 0x20000, /* Default printer on network */
|
||||
CUPS_PRINTER_OPTIONS = 0xfffc /* ~(CLASS | REMOTE | IMPLICIT) */
|
||||
};
|
||||
|
||||
@@ -103,7 +102,6 @@ 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 int cupsGetClasses(char ***classes);
|
||||
extern const char *cupsGetDefault(void);
|
||||
extern const char *cupsGetPPD(const char *printer);
|
||||
@@ -127,8 +125,6 @@ extern void cupsSetDests(int num_dests, cups_dest_t *dests);
|
||||
|
||||
extern int cupsAddOption(const char *name, const char *value,
|
||||
int num_options, cups_option_t **options);
|
||||
extern void cupsEncodeOptions(ipp_t *ipp, int num_options,
|
||||
cups_option_t *options);
|
||||
extern void cupsFreeOptions(int num_options, cups_option_t *options);
|
||||
extern const char *cupsGetOption(const char *name, int num_options,
|
||||
cups_option_t *options);
|
||||
@@ -139,10 +135,6 @@ 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);
|
||||
extern const char *cupsUser(void);
|
||||
|
||||
# ifdef __cplusplus
|
||||
|
||||
+1
-2
@@ -18,7 +18,7 @@
|
||||
"Cyan",
|
||||
"Magenta",
|
||||
"Yellow",
|
||||
"Copyright 1993-2001 by Easy Software Products, All Rights Reserved.",
|
||||
"Copyright 1993-2000 by Easy Software Products, All Rights Reserved.",
|
||||
"General",
|
||||
"Printer",
|
||||
"Image",
|
||||
@@ -124,7 +124,6 @@
|
||||
"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-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+7
-34
@@ -4,7 +4,7 @@
|
||||
* User-defined destination (and option) support for the Common UNIX
|
||||
* Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -87,8 +87,9 @@ cupsAddDest(const char *name, /* I - Name of destination */
|
||||
for (i = num_dests; i > 0; i --, dest ++)
|
||||
if (strcasecmp(name, dest->name) < 0)
|
||||
break;
|
||||
else if (strcasecmp(name, dest->name) == 0 &&
|
||||
instance != NULL && dest->instance != NULL &&
|
||||
else if (instance == NULL && dest->instance != NULL)
|
||||
break;
|
||||
else if (instance != NULL && dest->instance != NULL &&
|
||||
strcasecmp(instance, dest->instance) < 0)
|
||||
break;
|
||||
|
||||
@@ -260,13 +261,7 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */
|
||||
* Load the /etc/cups/lpoptions and ~/.lpoptions files...
|
||||
*/
|
||||
|
||||
if ((home = getenv("CUPS_SERVERROOT")) != NULL)
|
||||
{
|
||||
snprintf(filename, sizeof(filename), "%s/lpoptions", home);
|
||||
num_dests = cups_get_dests(filename, num_dests, dests);
|
||||
}
|
||||
else
|
||||
num_dests = cups_get_dests(CUPS_SERVERROOT "/lpoptions", num_dests, dests);
|
||||
num_dests = cups_get_dests(CUPS_SERVERROOT "/lpoptions", num_dests, dests);
|
||||
|
||||
if ((home = getenv("HOME")) != NULL)
|
||||
{
|
||||
@@ -302,24 +297,12 @@ 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)
|
||||
home = CUPS_SERVERROOT;
|
||||
|
||||
snprintf(filename, sizeof(filename), "%s/lpoptions", home);
|
||||
}
|
||||
strcpy(filename, CUPS_SERVERROOT "/lpoptions");
|
||||
else if ((home = getenv("HOME")) != NULL)
|
||||
snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
|
||||
else
|
||||
return;
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Try to open the file...
|
||||
@@ -376,18 +359,8 @@ 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...
|
||||
*/
|
||||
@@ -497,7 +470,7 @@ cups_get_dests(const char *filename, /* I - File to read from */
|
||||
* Set this as default if needed...
|
||||
*/
|
||||
|
||||
if (strncasecmp(line, "default", 7) == 0 && printer == NULL)
|
||||
if (strncasecmp(line, "default", 7) == 0)
|
||||
{
|
||||
for (i = 0; i < num_dests; i ++)
|
||||
(*dests)[i].is_default = 0;
|
||||
|
||||
+172
-207
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD code emission routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
@@ -25,10 +25,8 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* 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.
|
||||
* ppd_sort() - Sort options by ordering numbers...
|
||||
* ppdEmit() - Emit code for marked options to a file.
|
||||
* ppdEmitFd() - Emit code for marked options to a file.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -51,17 +49,180 @@
|
||||
*/
|
||||
|
||||
static int ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2);
|
||||
static int ppd_collect(ppd_file_t *ppd, ppd_section_t section,
|
||||
ppd_choice_t ***choices);
|
||||
|
||||
|
||||
/*
|
||||
* 'ppdCollect()' - Collect all marked options that reside in the specified
|
||||
* section.
|
||||
* 'ppdEmit()' - Emit code for marked options to a file.
|
||||
*/
|
||||
|
||||
int /* O - Number of options marked */
|
||||
ppdCollect(ppd_file_t *ppd, /* I - PPD file data */
|
||||
ppd_section_t section, /* I - Section to collect */
|
||||
ppd_choice_t ***choices) /* O - Pointers to choices */
|
||||
int /* O - 0 on success, -1 on failure */
|
||||
ppdEmit(ppd_file_t *ppd, /* I - PPD file record */
|
||||
FILE *fp, /* I - File to write to */
|
||||
ppd_section_t section) /* I - Section to write */
|
||||
{
|
||||
int i, /* Looping var */
|
||||
count; /* Number of choices */
|
||||
ppd_choice_t **choices; /* Choices */
|
||||
ppd_size_t *size; /* Custom page size */
|
||||
|
||||
|
||||
if ((count = ppd_collect(ppd, section, &choices)) == 0)
|
||||
return (0);
|
||||
|
||||
for (i = 0; i < count; i ++)
|
||||
if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
|
||||
{
|
||||
/*
|
||||
* Send DSC comments with option...
|
||||
*/
|
||||
|
||||
if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
|
||||
((ppd_option_t *)choices[i]->option)->keyword,
|
||||
choices[i]->choice) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
|
||||
strcasecmp(choices[i]->choice, "Custom") == 0)
|
||||
{
|
||||
/*
|
||||
* Variable size; write out standard size options (this should
|
||||
* eventually be changed to use the parameter positions defined
|
||||
* in the PPD file...)
|
||||
*/
|
||||
|
||||
size = ppdPageSize(ppd, "Custom");
|
||||
fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
|
||||
|
||||
if (choices[i]->code == NULL)
|
||||
{
|
||||
/*
|
||||
* This can happen with certain buggy PPD files that don't include
|
||||
* a CustomPageSize command sequence... We just use a generic
|
||||
* Level 2 command sequence...
|
||||
*/
|
||||
|
||||
fputs("pop pop pop\n", fp);
|
||||
fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
|
||||
}
|
||||
}
|
||||
|
||||
if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
|
||||
{
|
||||
if (fputs(choices[i]->code, fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
|
||||
putc('\n', fp);
|
||||
}
|
||||
|
||||
if (fputs("%%EndFeature\n", fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
else if (fputs(choices[i]->code, fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
free(choices);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppdEmitFd()' - Emit code for marked options to a file.
|
||||
*/
|
||||
|
||||
int /* O - 0 on success, -1 on failure */
|
||||
ppdEmitFd(ppd_file_t *ppd, /* I - PPD file record */
|
||||
int fd, /* I - File to write to */
|
||||
ppd_section_t section) /* I - Section to write */
|
||||
{
|
||||
int i, /* Looping var */
|
||||
count; /* Number of choices */
|
||||
ppd_choice_t **choices; /* Choices */
|
||||
char buf[1024]; /* Output buffer for feature */
|
||||
|
||||
|
||||
if ((count = ppd_collect(ppd, section, &choices)) == 0)
|
||||
return (0);
|
||||
|
||||
for (i = 0; i < count; i ++)
|
||||
if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
|
||||
{
|
||||
/*
|
||||
* Send DSC comments with option...
|
||||
*/
|
||||
|
||||
sprintf(buf, "%%%%BeginFeature: %s %s\n",
|
||||
((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
|
||||
|
||||
if (write(fd, buf, strlen(buf)) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (write(fd, "%%EndFeature\n", 13) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
free(choices);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppd_sort()' - Sort options by ordering numbers...
|
||||
*/
|
||||
|
||||
static int /* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
|
||||
ppd_sort(ppd_choice_t **c1, /* I - First choice */
|
||||
ppd_choice_t **c2) /* I - Second choice */
|
||||
{
|
||||
if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
|
||||
return (-1);
|
||||
else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
|
||||
return (1);
|
||||
else
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppd_collect()' - Collect all marked options that reside in the specified
|
||||
* section.
|
||||
*/
|
||||
|
||||
static int /* O - Number of options marked */
|
||||
ppd_collect(ppd_file_t *ppd, /* I - PPD file data */
|
||||
ppd_section_t section, /* I - Section to collect */
|
||||
ppd_choice_t ***choices) /* O - Pointers to choices */
|
||||
{
|
||||
int i, j, k, m; /* Looping vars */
|
||||
ppd_group_t *g, /* Current group */
|
||||
@@ -135,202 +296,6 @@ ppdCollect(ppd_file_t *ppd, /* I - PPD file data */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppdEmit()' - Emit code for marked options to a file.
|
||||
*/
|
||||
|
||||
int /* O - 0 on success, -1 on failure */
|
||||
ppdEmit(ppd_file_t *ppd, /* I - PPD file record */
|
||||
FILE *fp, /* I - File to write to */
|
||||
ppd_section_t section) /* I - Section to write */
|
||||
{
|
||||
int i, /* Looping var */
|
||||
count; /* Number of choices */
|
||||
ppd_choice_t **choices; /* Choices */
|
||||
ppd_size_t *size; /* Custom page size */
|
||||
|
||||
|
||||
if ((count = ppdCollect(ppd, section, &choices)) == 0)
|
||||
return (0);
|
||||
|
||||
for (i = 0; i < count; i ++)
|
||||
if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
|
||||
{
|
||||
/*
|
||||
* Send wrapper commands to prevent printer errors for unsupported
|
||||
* options...
|
||||
*/
|
||||
|
||||
if (fputs("[{\n", fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Send DSC comments with option...
|
||||
*/
|
||||
|
||||
if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
|
||||
((ppd_option_t *)choices[i]->option)->keyword,
|
||||
choices[i]->choice) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (strcasecmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
|
||||
strcasecmp(choices[i]->choice, "Custom") == 0)
|
||||
{
|
||||
/*
|
||||
* Variable size; write out standard size options (this should
|
||||
* eventually be changed to use the parameter positions defined
|
||||
* in the PPD file...)
|
||||
*/
|
||||
|
||||
size = ppdPageSize(ppd, "Custom");
|
||||
fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
|
||||
|
||||
if (choices[i]->code == NULL)
|
||||
{
|
||||
/*
|
||||
* This can happen with certain buggy PPD files that don't include
|
||||
* a CustomPageSize command sequence... We just use a generic
|
||||
* Level 2 command sequence...
|
||||
*/
|
||||
|
||||
fputs("pop pop pop\n", fp);
|
||||
fputs("<</PageSize[5 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
|
||||
}
|
||||
}
|
||||
|
||||
if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
|
||||
{
|
||||
if (fputs(choices[i]->code, fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
|
||||
putc('\n', fp);
|
||||
}
|
||||
|
||||
if (fputs("%%EndFeature\n", fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (fputs("} stopped cleartomark\n", fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
else if (fputs(choices[i]->code, fp) < 0)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
free(choices);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppdEmitFd()' - Emit code for marked options to a file.
|
||||
*/
|
||||
|
||||
int /* O - 0 on success, -1 on failure */
|
||||
ppdEmitFd(ppd_file_t *ppd, /* I - PPD file record */
|
||||
int fd, /* I - File to write to */
|
||||
ppd_section_t section) /* I - Section to write */
|
||||
{
|
||||
int i, /* Looping var */
|
||||
count; /* Number of choices */
|
||||
ppd_choice_t **choices; /* Choices */
|
||||
char buf[1024]; /* Output buffer for feature */
|
||||
|
||||
|
||||
if ((count = ppdCollect(ppd, section, &choices)) == 0)
|
||||
return (0);
|
||||
|
||||
for (i = 0; i < count; i ++)
|
||||
if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
|
||||
{
|
||||
/*
|
||||
* Send wrapper commands to prevent printer errors for unsupported
|
||||
* options...
|
||||
*/
|
||||
|
||||
if (write(fd, "[{\n", 3) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Send DSC comments with option...
|
||||
*/
|
||||
|
||||
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)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (write(fd, "%%EndFeature\n", 13) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (write(fd, "} stopped cleartomark\n", 22) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
|
||||
{
|
||||
free(choices);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
free(choices);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ppd_sort()' - Sort options by ordering numbers...
|
||||
*/
|
||||
|
||||
static int /* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
|
||||
ppd_sort(ppd_choice_t **c1, /* I - First choice */
|
||||
ppd_choice_t **c2) /* I - Second choice */
|
||||
{
|
||||
if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
|
||||
return (-1);
|
||||
else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
|
||||
return (1);
|
||||
else
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* End of "$Id$".
|
||||
*/
|
||||
|
||||
+42
-379
@@ -3,9 +3,9 @@
|
||||
*
|
||||
* HTTP routines for the Common UNIX Printing System (CUPS) scheduler.
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 by Easy Software Products, all rights reserved.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* These statusd 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,7 +29,6 @@
|
||||
* 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.
|
||||
@@ -57,7 +56,6 @@
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -80,13 +78,6 @@
|
||||
# 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"...
|
||||
@@ -104,7 +95,6 @@
|
||||
static http_field_t http_field(const char *name);
|
||||
static int http_send(http_t *http, http_state_t request,
|
||||
const char *uri);
|
||||
static int http_upgrade(http_t *http);
|
||||
|
||||
|
||||
/*
|
||||
@@ -176,12 +166,6 @@ 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? */
|
||||
@@ -205,24 +189,6 @@ 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 */
|
||||
}
|
||||
|
||||
|
||||
@@ -268,29 +234,9 @@ httpCheck(http_t *http) /* I - HTTP connection */
|
||||
void
|
||||
httpClose(http_t *http) /* I - Connection to close */
|
||||
{
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_CTX *context; /* Context for encryption */
|
||||
SSL *conn; /* Connection for encryption */
|
||||
#endif /* HAVE_LIBSSL */
|
||||
|
||||
|
||||
if (!http)
|
||||
if (http == NULL)
|
||||
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
|
||||
@@ -349,18 +295,6 @@ 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);
|
||||
@@ -371,36 +305,6 @@ 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...
|
||||
*/
|
||||
@@ -408,25 +312,9 @@ httpEncryption(http_t *http, /* I - HTTP data */
|
||||
int /* O - 0 on success, non-zero on failure */
|
||||
httpReconnect(http_t *http) /* I - HTTP data */
|
||||
{
|
||||
int val; /* Socket option value */
|
||||
#ifdef HAVE_LIBSSL
|
||||
SSL_CTX *context; /* Context for encryption */
|
||||
SSL *conn; /* Connection for encryption */
|
||||
int val; /* Socket option value */
|
||||
|
||||
|
||||
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...
|
||||
*/
|
||||
@@ -492,44 +380,6 @@ httpReconnect(http_t *http) /* I - HTTP data */
|
||||
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);
|
||||
}
|
||||
|
||||
@@ -547,9 +397,7 @@ 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... */
|
||||
const char *atsign, /* @ sign */
|
||||
*slash; /* Separator */
|
||||
char *ptr; /* Pointer into string... */
|
||||
|
||||
|
||||
if (uri == NULL || method == NULL || username == NULL || host == NULL ||
|
||||
@@ -642,49 +490,44 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */
|
||||
}
|
||||
|
||||
/*
|
||||
* Grab the usenname, if any...
|
||||
* Grab the hostname...
|
||||
*/
|
||||
|
||||
while (*uri == '/')
|
||||
uri ++;
|
||||
|
||||
if ((slash = strchr(uri, '/')) == NULL)
|
||||
slash = uri + strlen(uri);
|
||||
|
||||
if ((atsign = strchr(uri, '@')) != NULL && atsign < slash)
|
||||
{
|
||||
/*
|
||||
* Got a username:password combo...
|
||||
*/
|
||||
|
||||
for (ptr = username;
|
||||
uri < atsign && ptr < (username + sizeof(username) - 1);
|
||||
*ptr++ = *uri++);
|
||||
|
||||
*ptr = '\0';
|
||||
|
||||
uri = atsign + 1;
|
||||
}
|
||||
else
|
||||
username[0] = '\0';
|
||||
|
||||
/*
|
||||
* Grab the hostname...
|
||||
*/
|
||||
|
||||
ptr = host;
|
||||
while (*uri != ':' && *uri != '/' && *uri != '\0')
|
||||
while (!(*uri == ':' && isdigit(uri[1])) && *uri != '@' && *uri != '/' && *uri != '\0')
|
||||
*ptr ++ = *uri ++;
|
||||
|
||||
*ptr = '\0';
|
||||
|
||||
if (*uri == '@')
|
||||
{
|
||||
/*
|
||||
* Got a username...
|
||||
*/
|
||||
|
||||
strncpy(username, host, 31);
|
||||
username[31] = '\0';
|
||||
|
||||
ptr = host;
|
||||
uri ++;
|
||||
while (*uri != ':' && *uri != '/' && *uri != '\0')
|
||||
*ptr ++ = *uri ++;
|
||||
|
||||
*ptr = '\0';
|
||||
}
|
||||
else
|
||||
username[0] = '\0';
|
||||
|
||||
if (*uri != ':')
|
||||
{
|
||||
if (strcasecmp(method, "http") == 0)
|
||||
*port = 80;
|
||||
else if (strcasecmp(method, "https") == 0)
|
||||
*port = 443;
|
||||
else if (strcasecmp(method, "ipp") == 0)
|
||||
else if (strcasecmp(method, "ipp") == 0) /* Not registered yet... */
|
||||
*port = ippPort();
|
||||
else if (strcasecmp(method, "socket") == 0) /* Not registered yet... */
|
||||
*port = 9100;
|
||||
@@ -1035,10 +878,6 @@ 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));
|
||||
@@ -1121,13 +960,7 @@ 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");
|
||||
@@ -1207,21 +1040,13 @@ httpGets(char *line, /* I - Line to read into */
|
||||
else
|
||||
bufptr ++;
|
||||
|
||||
if (bufptr >= bufend && http->used < HTTP_MAX_BUFFER)
|
||||
if (bufptr >= bufend)
|
||||
{
|
||||
/*
|
||||
* No newline; see if there is more data to be read...
|
||||
*/
|
||||
|
||||
#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)
|
||||
if ((bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0)) < 0)
|
||||
{
|
||||
/*
|
||||
* Nope, can't get a line this time...
|
||||
@@ -1263,7 +1088,7 @@ httpGets(char *line, /* I - Line to read into */
|
||||
bufend += bytes;
|
||||
}
|
||||
}
|
||||
while (bufptr >= bufend && http->used < HTTP_MAX_BUFFER);
|
||||
while (bufptr >= bufend);
|
||||
|
||||
http->activity = time(NULL);
|
||||
|
||||
@@ -1274,7 +1099,6 @@ httpGets(char *line, /* I - Line to read into */
|
||||
lineptr = line;
|
||||
bufptr = http->buffer;
|
||||
bytes = 0;
|
||||
length --;
|
||||
|
||||
while (bufptr < bufend && bytes < length)
|
||||
{
|
||||
@@ -1283,7 +1107,14 @@ httpGets(char *line, /* I - Line to read into */
|
||||
if (*bufptr == 0x0a)
|
||||
{
|
||||
bufptr ++;
|
||||
break;
|
||||
*lineptr = '\0';
|
||||
|
||||
http->used -= bytes;
|
||||
if (http->used > 0)
|
||||
memcpy(http->buffer, bufptr, http->used);
|
||||
|
||||
DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
|
||||
return (line);
|
||||
}
|
||||
else if (*bufptr == 0x0d)
|
||||
bufptr ++;
|
||||
@@ -1291,18 +1122,6 @@ 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);
|
||||
@@ -1333,17 +1152,8 @@ httpPrintf(http_t *http, /* I - HTTP data */
|
||||
DEBUG_printf(("httpPrintf: %s", buf));
|
||||
|
||||
for (tbytes = 0, bufptr = buf; tbytes < bytes; tbytes += nbytes, bufptr += nbytes)
|
||||
{
|
||||
#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)
|
||||
if ((nbytes = send(http->fd, bufptr, bytes - tbytes, 0)) < 0)
|
||||
return (-1);
|
||||
}
|
||||
|
||||
return (bytes);
|
||||
}
|
||||
@@ -1358,10 +1168,6 @@ 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 :
|
||||
@@ -1384,8 +1190,6 @@ 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 :
|
||||
@@ -1408,9 +1212,9 @@ httpGetDateString(time_t t) /* I - UNIX time */
|
||||
|
||||
|
||||
tdate = gmtime(&t);
|
||||
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);
|
||||
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);
|
||||
|
||||
return (datetime);
|
||||
}
|
||||
@@ -1464,10 +1268,6 @@ 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));
|
||||
@@ -1501,43 +1301,6 @@ 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)
|
||||
@@ -1867,14 +1630,6 @@ 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;
|
||||
@@ -1905,98 +1660,6 @@ 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$".
|
||||
*/
|
||||
|
||||
+1
-19
@@ -4,7 +4,7 @@
|
||||
* Hyper-Text Transport Protocol definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,19 +126,6 @@ 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...
|
||||
*/
|
||||
@@ -163,7 +150,6 @@ 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 */
|
||||
@@ -196,7 +182,6 @@ 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 */
|
||||
@@ -275,8 +260,6 @@ typedef struct
|
||||
char nonce[HTTP_MAX_VALUE];
|
||||
/* Nonce value */
|
||||
int nonce_count; /* Nonce count */
|
||||
void *tls; /* TLS state information */
|
||||
http_encryption_t encryption; /* Encryption requirements */
|
||||
} http_t;
|
||||
|
||||
|
||||
@@ -291,7 +274,6 @@ 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);
|
||||
|
||||
+23
-82
@@ -4,7 +4,7 @@
|
||||
* Internet Printing Protocol support functions for the Common UNIX
|
||||
* Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
@@ -41,10 +41,8 @@
|
||||
* ippErrorString() - Return a textual message for the given error message.
|
||||
* ippFindAttribute() - Find a named attribute in a request...
|
||||
* ippLength() - Compute the length of an IPP request.
|
||||
* ippNew() - Allocate a new IPP request.
|
||||
* ippPort() - Return the default IPP port number.
|
||||
* ippRead() - Read data for an IPP request.
|
||||
* ippSetPort() - Set the default port number.
|
||||
* ippTimeToDate() - Convert from UNIX time to RFC 1903 format.
|
||||
* ippWrite() - Write data for an IPP request.
|
||||
* _ipp_add_attr() - Add a new attribute to the request.
|
||||
@@ -63,14 +61,6 @@
|
||||
|
||||
#include "ipp.h"
|
||||
#include "debug.h"
|
||||
#include <ctype.h>
|
||||
|
||||
|
||||
/*
|
||||
* Local globals...
|
||||
*/
|
||||
|
||||
static int ipp_port = 0;
|
||||
|
||||
|
||||
/*
|
||||
@@ -93,7 +83,7 @@ ippAddBoolean(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddBoolean(%p, %02x, \'%s\', %d)\n", ipp, group, name, value));
|
||||
DEBUG_printf(("ippAddBoolean(%08x, %02x, \'%s\', %d)\n", ipp, group, name, value));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
return (NULL);
|
||||
@@ -125,7 +115,7 @@ ippAddBooleans(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddBooleans(%p, %02x, \'%s\', %d, %p)\n", ipp,
|
||||
DEBUG_printf(("ippAddBooleans(%08x, %02x, \'%s\', %d, %08x)\n", ipp,
|
||||
group, name, num_values, values));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
@@ -159,7 +149,7 @@ ippAddDate(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddDate(%p, %02x, \'%s\', %p)\n", ipp, group, name,
|
||||
DEBUG_printf(("ippAddDate(%08x, %02x, \'%s\', %08x)\n", ipp, group, name,
|
||||
value));
|
||||
|
||||
if (ipp == NULL || name == NULL || value == NULL)
|
||||
@@ -191,7 +181,7 @@ ippAddInteger(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddInteger(%p, %d, \'%s\', %d)\n", ipp, group, name,
|
||||
DEBUG_printf(("ippAddInteger(%08x, %d, \'%s\', %d)\n", ipp, group, name,
|
||||
value));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
@@ -268,24 +258,7 @@ 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 = value ? strdup(value) : NULL;
|
||||
|
||||
if ((type == IPP_TAG_LANGUAGE || type == IPP_TAG_CHARSET) &&
|
||||
attr->values[0].string.text)
|
||||
{
|
||||
/*
|
||||
* Convert to lowercase and change _ to - as needed...
|
||||
*/
|
||||
|
||||
char *p;
|
||||
|
||||
|
||||
for (p = attr->values[0].string.text; *p; p ++)
|
||||
if (*p == '_')
|
||||
*p = '-';
|
||||
else
|
||||
*p = tolower(*p);
|
||||
}
|
||||
attr->values[0].string.text = strdup(value);
|
||||
|
||||
return (attr);
|
||||
}
|
||||
@@ -481,7 +454,7 @@ ippAddSeparator(ipp_t *ipp) /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippAddSeparator(%p)\n", ipp));
|
||||
DEBUG_printf(("ippAddSeparator(%08x)\n", ipp));
|
||||
|
||||
if (ipp == NULL)
|
||||
return (NULL);
|
||||
@@ -556,8 +529,6 @@ ippDelete(ipp_t *ipp) /* I - IPP request */
|
||||
*next; /* Next attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippNew(): %p\n", ipp));
|
||||
|
||||
if (ipp == NULL)
|
||||
return;
|
||||
|
||||
@@ -659,26 +630,23 @@ 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_tag_t value_tag; /* Value tag */
|
||||
ipp_attribute_t *attr; /* Current atttribute */
|
||||
|
||||
|
||||
DEBUG_printf(("ippFindAttribute(%p, \'%s\')\n", ipp, name));
|
||||
DEBUG_printf(("ippFindAttribute(%08x, \'%s\')\n", ipp, name));
|
||||
|
||||
if (ipp == NULL || name == NULL)
|
||||
return (NULL);
|
||||
|
||||
for (attr = ipp->attrs; attr != NULL; attr = attr->next)
|
||||
{
|
||||
DEBUG_printf(("ippFindAttribute: attr = %p, name = \'%s\'\n", attr,
|
||||
DEBUG_printf(("ippFindAttribute: attr = %08x, name = \'%s\'\n", attr,
|
||||
attr->name));
|
||||
|
||||
value_tag = attr->value_tag & ~IPP_TAG_COPY;
|
||||
|
||||
if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
|
||||
(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)))
|
||||
(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)))
|
||||
return (attr);
|
||||
}
|
||||
|
||||
@@ -733,7 +701,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 & ~IPP_TAG_COPY)
|
||||
switch (attr->value_tag)
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
@@ -814,8 +782,6 @@ ippNew(void)
|
||||
temp->request.any.version[1] = 1;
|
||||
}
|
||||
|
||||
DEBUG_printf(("ippNew(): %p\n", temp));
|
||||
|
||||
return (temp);
|
||||
}
|
||||
|
||||
@@ -835,7 +801,7 @@ ippRead(http_t *http, /* I - HTTP data */
|
||||
ipp_tag_t tag; /* Current tag */
|
||||
|
||||
|
||||
DEBUG_printf(("ippRead(%p, %p)\n", http, ipp));
|
||||
DEBUG_printf(("ippRead(%08x, %08x)\n", http, ipp));
|
||||
|
||||
if (http == NULL || ipp == NULL)
|
||||
return (IPP_ERROR);
|
||||
@@ -881,10 +847,6 @@ 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...
|
||||
*/
|
||||
@@ -1219,10 +1181,6 @@ 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...
|
||||
*/
|
||||
@@ -1268,7 +1226,7 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
memcpy(bufptr, attr->name, n);
|
||||
bufptr += n;
|
||||
|
||||
switch (attr->value_tag & ~IPP_TAG_COPY)
|
||||
switch (attr->value_tag)
|
||||
{
|
||||
case IPP_TAG_INTEGER :
|
||||
case IPP_TAG_ENUM :
|
||||
@@ -1463,7 +1421,7 @@ ippWrite(http_t *http, /* I - HTTP data */
|
||||
|
||||
n = strlen(attr->values[i].string.charset) +
|
||||
strlen(attr->values[i].string.text) +
|
||||
4;
|
||||
2;
|
||||
|
||||
if ((sizeof(buffer) - (bufptr - buffer)) < (n + 2))
|
||||
{
|
||||
@@ -1601,25 +1559,12 @@ ippPort(void)
|
||||
struct servent *port; /* Port number info */
|
||||
|
||||
|
||||
if (ipp_port)
|
||||
return (ipp_port);
|
||||
else if ((server_port = getenv("IPP_PORT")) != NULL)
|
||||
return (ipp_port = atoi(server_port));
|
||||
if ((server_port = getenv("IPP_PORT")) != NULL)
|
||||
return (atoi(server_port));
|
||||
else if ((port = getservbyname("ipp", NULL)) == NULL)
|
||||
return (ipp_port = IPP_PORT);
|
||||
return (IPP_PORT);
|
||||
else
|
||||
return (ipp_port = ntohs(port->s_port));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'ippSetPort()' - Set the default port number.
|
||||
*/
|
||||
|
||||
void
|
||||
ippSetPort(int p) /* I - Port number to use */
|
||||
{
|
||||
ipp_port = p;
|
||||
return (ntohs(port->s_port));
|
||||
}
|
||||
|
||||
|
||||
@@ -1634,7 +1579,7 @@ _ipp_add_attr(ipp_t *ipp, /* I - IPP request */
|
||||
ipp_attribute_t *attr; /* New attribute */
|
||||
|
||||
|
||||
DEBUG_printf(("_ipp_add_attr(%p, %d)\n", ipp, num_values));
|
||||
DEBUG_printf(("_ipp_add_attr(%08x, %d)\n", ipp, num_values));
|
||||
|
||||
if (ipp == NULL || num_values < 0)
|
||||
return (NULL);
|
||||
@@ -1654,8 +1599,6 @@ _ipp_add_attr(ipp_t *ipp, /* I - IPP request */
|
||||
|
||||
ipp->last = attr;
|
||||
|
||||
DEBUG_printf(("_ipp_add_attr(): %p\n", attr));
|
||||
|
||||
return (attr);
|
||||
}
|
||||
|
||||
@@ -1670,8 +1613,6 @@ _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 :
|
||||
@@ -1691,7 +1632,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 && i == 0)
|
||||
if (attr->values[i].string.charset)
|
||||
free(attr->values[i].string.charset);
|
||||
free(attr->values[i].string.text);
|
||||
}
|
||||
|
||||
+12
-6
@@ -4,7 +4,7 @@
|
||||
* Internet Printing Protocol definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -30,7 +30,7 @@
|
||||
* Include necessary headers...
|
||||
*/
|
||||
|
||||
# include "http.h"
|
||||
# include <cups/http.h>
|
||||
|
||||
|
||||
/*
|
||||
@@ -100,8 +100,7 @@ typedef enum /**** Format tags for attribute formats... ****/
|
||||
IPP_TAG_URISCHEME,
|
||||
IPP_TAG_CHARSET,
|
||||
IPP_TAG_LANGUAGE,
|
||||
IPP_TAG_MIMETYPE,
|
||||
IPP_TAG_COPY = 0x80000000
|
||||
IPP_TAG_MIMETYPE
|
||||
} ipp_tag_t;
|
||||
|
||||
typedef enum /**** Resolution units... ****/
|
||||
@@ -110,6 +109,14 @@ typedef enum /**** Resolution units... ****/
|
||||
IPP_RES_PER_CM
|
||||
} ipp_res_t;
|
||||
|
||||
typedef enum /**** Multiple Document Handling ****/
|
||||
{
|
||||
IPP_DOC_SINGLE,
|
||||
IPP_DOC_UNCOLLATED,
|
||||
IPP_DOC_COLLATED,
|
||||
IPP_DOC_SEPARATE
|
||||
} ipp_doc_t;
|
||||
|
||||
typedef enum /**** Finishings... ****/
|
||||
{
|
||||
IPP_FINISH_NONE = 3,
|
||||
@@ -217,7 +224,7 @@ typedef enum /**** IPP status codes... ****/
|
||||
IPP_ATTRIBUTES,
|
||||
IPP_URI_SCHEME,
|
||||
IPP_CHARSET,
|
||||
IPP_CONFLICT,
|
||||
IPP_CONFLICT,\
|
||||
IPP_COMPRESSION_NOT_SUPPORTED,
|
||||
IPP_COMPRESSION_ERROR,
|
||||
IPP_DOCUMENT_FORMAT_ERROR,
|
||||
@@ -343,7 +350,6 @@ extern ipp_state_t ippRead(http_t *http, ipp_t *ipp);
|
||||
extern const ipp_uchar_t *ippTimeToDate(time_t t);
|
||||
extern ipp_state_t ippWrite(http_t *http, ipp_t *ipp);
|
||||
extern int ippPort(void);
|
||||
extern void ippSetPort(int p);
|
||||
|
||||
extern ipp_attribute_t *_ipp_add_attr(ipp_t *, int);
|
||||
extern void _ipp_free_attr(ipp_attribute_t *);
|
||||
|
||||
+4
-9
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* I18N/language support for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -263,10 +263,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
*/
|
||||
|
||||
if (fp == NULL)
|
||||
{
|
||||
strncpy(line, lang_default[0], sizeof(line) - 1);
|
||||
line[sizeof(line) - 1] = '\0';
|
||||
}
|
||||
strcpy(line, lang_default[0]);
|
||||
else if (fgets(line, sizeof(line), fp) == NULL)
|
||||
{
|
||||
/*
|
||||
@@ -323,8 +320,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
*/
|
||||
|
||||
lang->used ++;
|
||||
strncpy(lang->language, langname, sizeof(lang->language) - 1);
|
||||
lang->language[sizeof(lang->language) - 1] = '\0';
|
||||
strcpy(lang->language, langname);
|
||||
|
||||
for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
|
||||
if (strcmp(lang_encodings[i], line) == 0)
|
||||
@@ -351,8 +347,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
|
||||
if (lang_default[count] == NULL)
|
||||
break;
|
||||
|
||||
strncpy(line, lang_default[count], sizeof(line) - 1);
|
||||
/* Already set last byte to 0 above... */
|
||||
strcpy(line, lang_default[count]);
|
||||
}
|
||||
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-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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 +3,7 @@
|
||||
*
|
||||
* Option marking routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,9 +118,7 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */
|
||||
if (c1->marked)
|
||||
break;
|
||||
|
||||
if (j == 0 ||
|
||||
strcasecmp(c1->choice, "None") == 0 ||
|
||||
strcasecmp(c1->choice, "Off") == 0 ||
|
||||
if (j == 0 || strcasecmp(c1->choice, "None") == 0 ||
|
||||
strcasecmp(c1->choice, "False") == 0)
|
||||
c1 = NULL;
|
||||
}
|
||||
@@ -151,9 +149,7 @@ ppdConflicts(ppd_file_t *ppd) /* I - PPD to check */
|
||||
if (c2->marked)
|
||||
break;
|
||||
|
||||
if (j == 0 ||
|
||||
strcasecmp(c2->choice, "None") == 0 ||
|
||||
strcasecmp(c2->choice, "Off") == 0 ||
|
||||
if (j == 0 || strcasecmp(c2->choice, "None") == 0 ||
|
||||
strcasecmp(c2->choice, "False") == 0)
|
||||
c2 = NULL;
|
||||
}
|
||||
|
||||
+5
-5
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* MD5 password support for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -23,10 +23,10 @@
|
||||
*
|
||||
* Contents:
|
||||
*
|
||||
* httpMD5() - Compute the MD5 sum of the username:group:password.
|
||||
* httpMD5Nonce() - Combine the MD5 sum of the username, group, and password
|
||||
* with the server-supplied nonce value.
|
||||
* httpMD5String() - Convert an MD5 sum to a character string.
|
||||
* httpMD5() - Compute the MD5 sum of the username:group:password.
|
||||
* 'httpMD5Nonce()' - Combine the MD5 sum of the username, group, and password
|
||||
* with the server-supplied nonce value.
|
||||
* 'httpMD5String()' - Convert an MD5 sum to a character string.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
+6
-287
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Option routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -39,7 +38,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
/*
|
||||
@@ -102,274 +100,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.
|
||||
*/
|
||||
@@ -442,17 +172,6 @@ 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')
|
||||
{
|
||||
/*
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Page size functions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
|
||||
+43
-108
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD file routines for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,7 +108,6 @@ 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 */
|
||||
|
||||
|
||||
/*
|
||||
@@ -122,10 +121,6 @@ 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);
|
||||
@@ -176,18 +171,6 @@ 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...
|
||||
*/
|
||||
@@ -650,27 +633,6 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
}
|
||||
else if (strcmp(keyword, "Throughput") == 0)
|
||||
ppd->throughput = atoi(string);
|
||||
else if (strcmp(keyword, "Font") == 0)
|
||||
{
|
||||
/*
|
||||
* Add this font to the list of available fonts...
|
||||
*/
|
||||
|
||||
if (ppd->num_fonts == 0)
|
||||
ppd->fonts = (char **)malloc(sizeof(char *));
|
||||
else
|
||||
ppd->fonts = (char **)realloc(ppd->fonts,
|
||||
sizeof(char *) * (ppd->num_fonts + 1));
|
||||
|
||||
if (ppd->fonts == NULL)
|
||||
{
|
||||
ppdClose(ppd);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
ppd->fonts[ppd->num_fonts] = strdup(name);
|
||||
ppd->num_fonts ++;
|
||||
}
|
||||
else if (strcmp(keyword, "VariablePaperSize") == 0 &&
|
||||
strcmp(string, "True") == 0 &&
|
||||
!ppd->variable_sizes)
|
||||
@@ -1045,6 +1007,45 @@ ppdOpen(FILE *fp) /* I - File to read from */
|
||||
}
|
||||
else if (strcmp(keyword, "CloseGroup") == 0)
|
||||
group = NULL;
|
||||
else if (strcmp(keyword, "OpenSubGroup") == 0)
|
||||
{
|
||||
/*
|
||||
* Open a new sub-group...
|
||||
*/
|
||||
|
||||
DEBUG_printf(("group = %p, subgroup = %p\n", group, subgroup));
|
||||
|
||||
if (group == NULL || subgroup != NULL)
|
||||
{
|
||||
ppdClose(ppd);
|
||||
safe_free(string);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (group->num_subgroups == 0)
|
||||
subgroup = malloc(sizeof(ppd_group_t));
|
||||
else
|
||||
subgroup = realloc(group->subgroups,
|
||||
(group->num_subgroups + 1) * sizeof(ppd_group_t));
|
||||
|
||||
if (subgroup == NULL)
|
||||
{
|
||||
ppdClose(ppd);
|
||||
safe_free(string);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
group->subgroups = subgroup;
|
||||
subgroup += group->num_subgroups;
|
||||
group->num_subgroups ++;
|
||||
|
||||
memset(subgroup, 0, sizeof(ppd_group_t));
|
||||
ppd_decode(string);
|
||||
ppd_fix(string);
|
||||
strncpy(subgroup->text, string, sizeof(subgroup->text) - 1);
|
||||
}
|
||||
else if (strcmp(keyword, "CloseSubGroup") == 0)
|
||||
subgroup = NULL;
|
||||
else if (strcmp(keyword, "OrderDependency") == 0 ||
|
||||
strcmp(keyword, "NonUIOrderDependency") == 0)
|
||||
{
|
||||
@@ -1551,7 +1552,7 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
*textptr, /* Text pointer */
|
||||
*strptr, /* Pointer into string */
|
||||
*lineptr, /* Current position in line buffer */
|
||||
line[65536]; /* Line buffer (64k) */
|
||||
line[262144]; /* Line buffer (256k) */
|
||||
|
||||
|
||||
/*
|
||||
@@ -1566,8 +1567,6 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
* Now loop until we have a valid line...
|
||||
*/
|
||||
|
||||
*string = NULL;
|
||||
|
||||
do
|
||||
{
|
||||
/*
|
||||
@@ -1601,12 +1600,10 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
ungetc(ch, fp);
|
||||
}
|
||||
|
||||
ch = '\n';
|
||||
*lineptr++ = '\n';
|
||||
|
||||
if (!endquote) /* Continue for multi-line text */
|
||||
break;
|
||||
|
||||
*lineptr++ = '\n';
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1617,72 +1614,10 @@ ppd_read(FILE *fp, /* I - File to read from */
|
||||
*lineptr++ = ch;
|
||||
|
||||
if (ch == '\"')
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
endquote = !endquote;
|
||||
}
|
||||
}
|
||||
|
||||
if (endquote)
|
||||
{
|
||||
/*
|
||||
* Didn't finish this quoted string...
|
||||
*/
|
||||
|
||||
while ((ch = getc(fp)) != EOF)
|
||||
if (ch == '\"')
|
||||
break;
|
||||
}
|
||||
|
||||
if (ch != '\n')
|
||||
{
|
||||
/*
|
||||
* Didn't finish this line...
|
||||
*/
|
||||
|
||||
while ((ch = getc(fp)) != EOF)
|
||||
if (ch == '\r' || ch == '\n')
|
||||
{
|
||||
/*
|
||||
* Line feed or carriage return...
|
||||
*/
|
||||
|
||||
if (ch == '\r')
|
||||
{
|
||||
/*
|
||||
* Check for a trailing line feed...
|
||||
*/
|
||||
|
||||
if ((ch = getc(fp)) == EOF)
|
||||
break;
|
||||
if (ch != 0x0a)
|
||||
ungetc(ch, fp);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (lineptr > line && lineptr[-1] == '\n')
|
||||
lineptr --;
|
||||
|
||||
|
||||
+1
-3
@@ -4,7 +4,7 @@
|
||||
* PostScript Printer Description definitions for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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
|
||||
@@ -207,8 +207,6 @@ typedef struct /**** Files ****/
|
||||
*/
|
||||
|
||||
extern void ppdClose(ppd_file_t *ppd);
|
||||
extern int ppdCollect(ppd_file_t *ppd, ppd_section_t section,
|
||||
ppd_choice_t ***choices);
|
||||
extern int ppdConflicts(ppd_file_t *ppd);
|
||||
extern int ppdEmit(ppd_file_t *ppd, FILE *fp,
|
||||
ppd_section_t section);
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* snprintf functions for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 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-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
|
||||
+19
-34
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* HTTP test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -45,20 +45,25 @@ 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[8192]; /* Input buffer */
|
||||
char buffer[1024]; /* 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 ++)
|
||||
@@ -70,42 +75,22 @@ main(int argc, /* I - Number of command-line arguments */
|
||||
continue;
|
||||
}
|
||||
|
||||
httpSeparate(argv[i], method, username, host, &port, resource);
|
||||
|
||||
http = httpConnect(host, port);
|
||||
if (http == NULL)
|
||||
{
|
||||
perror(host);
|
||||
continue;
|
||||
}
|
||||
printf("Requesting file \"%s\"...\n", resource);
|
||||
printf("Requesting file \"%s\"...\n", argv[i]);
|
||||
httpClearFields(http);
|
||||
httpSetField(http, HTTP_FIELD_ACCEPT_LANGUAGE, "en");
|
||||
httpGet(http, resource);
|
||||
while ((status = httpUpdate(http)) == HTTP_CONTINUE);
|
||||
httpGet(http, argv[i]);
|
||||
status = httpUpdate(http);
|
||||
|
||||
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)
|
||||
{
|
||||
current = time(NULL);
|
||||
if (current == start) current ++;
|
||||
printf("\r%ld/%ld bytes (%ld bytes/sec) ", total, length,
|
||||
total / (current - start));
|
||||
fflush(stdout);
|
||||
}
|
||||
printf("Read %ld bytes, %ld total...\n", bytes, ftell(out));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-16
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* PPD test program for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products, all rights reserved.
|
||||
* Copyright 1997-2000 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,21 +171,6 @@ 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]);
|
||||
|
||||
ppdClose(ppd);
|
||||
}
|
||||
|
||||
|
||||
+80
-334
@@ -4,7 +4,7 @@
|
||||
* User, system, and password routines for the Common UNIX Printing
|
||||
* System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -24,16 +24,9 @@
|
||||
*
|
||||
* 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...
|
||||
* cupsUser() - Return the current users name.
|
||||
* cupsGetPassword() - Get a password from the user...
|
||||
* cupsServer() - Return the hostname of the default server...
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -41,279 +34,11 @@
|
||||
*/
|
||||
|
||||
#include "cups.h"
|
||||
#include "string.h"
|
||||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
|
||||
|
||||
/*
|
||||
* Local functions...
|
||||
*/
|
||||
|
||||
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...
|
||||
*/
|
||||
|
||||
const char * /* O - Password */
|
||||
cupsGetPassword(const char *prompt) /* I - Prompt string */
|
||||
{
|
||||
return ((*cups_pwdcb)(prompt));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* '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...
|
||||
*/
|
||||
|
||||
const char * /* O - Server name */
|
||||
cupsServer(void)
|
||||
{
|
||||
FILE *fp; /* client.conf file */
|
||||
char *server; /* Pointer to server name */
|
||||
const char *home; /* Home directory of user */
|
||||
static char line[1024]; /* Line from file */
|
||||
|
||||
|
||||
/*
|
||||
* First see if we have already set the server name...
|
||||
*/
|
||||
|
||||
if (!cups_server[0])
|
||||
{
|
||||
/*
|
||||
* Then see if the CUPS_SERVER environment variable is set...
|
||||
*/
|
||||
|
||||
if ((server = getenv("CUPS_SERVER")) == 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");
|
||||
}
|
||||
|
||||
server = "localhost";
|
||||
|
||||
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, "ServerName ", 11) == 0)
|
||||
{
|
||||
/*
|
||||
* Got it! Drop any trailing newline and find the name...
|
||||
*/
|
||||
|
||||
server = line + strlen(line) - 1;
|
||||
if (*server == '\n')
|
||||
*server = '\0';
|
||||
|
||||
for (server = line + 11; isspace(*server); server ++);
|
||||
break;
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy the server name over...
|
||||
*/
|
||||
|
||||
strncpy(cups_server, server, sizeof(cups_server) - 1);
|
||||
cups_server[sizeof(cups_server) - 1] = '\0';
|
||||
}
|
||||
|
||||
return (cups_server);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsSetPasswordCB()' - Set the password callback for CUPS.
|
||||
*/
|
||||
|
||||
void
|
||||
cupsSetPasswordCB(const char *(*cb)(const char *)) /* I - Callback function */
|
||||
{
|
||||
if (cb == (const char *(*)(const char *))0)
|
||||
cups_pwdcb = cups_get_password;
|
||||
else
|
||||
cups_pwdcb = cb;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsSetServer()' - Set the default server name...
|
||||
*/
|
||||
|
||||
void
|
||||
cupsSetServer(const char *server) /* I - Server name */
|
||||
{
|
||||
if (server)
|
||||
{
|
||||
strncpy(cups_server, server, sizeof(cups_server) - 1);
|
||||
cups_server[sizeof(cups_server) - 1] = '\0';
|
||||
}
|
||||
else
|
||||
cups_server[0] = '\0';
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cupsSetUser()' - Set the default user name...
|
||||
*/
|
||||
|
||||
void
|
||||
cupsSetUser(const char *user) /* I - User name */
|
||||
{
|
||||
if (user)
|
||||
{
|
||||
strncpy(cups_user, user, sizeof(cups_user) - 1);
|
||||
cups_user[sizeof(cups_user) - 1] = '\0';
|
||||
}
|
||||
else
|
||||
cups_user[0] = '\0';
|
||||
}
|
||||
|
||||
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
/*
|
||||
* WIN32 and OS/2 username and password stuff...
|
||||
@@ -326,19 +51,16 @@ cupsSetUser(const char *user) /* I - User name */
|
||||
const char * /* O - User name */
|
||||
cupsUser(void)
|
||||
{
|
||||
if (!cups_user[0])
|
||||
strcpy(cups_user, "WindowsUser");
|
||||
|
||||
return (cups_user);
|
||||
return ("WindowsUser");
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cups_get_password()' - Get a password from the user...
|
||||
* 'cupsGetPassword()' - Get a password from the user...
|
||||
*/
|
||||
|
||||
static const char * /* O - Password */
|
||||
cups_get_password(const char *prompt) /* I - Prompt string */
|
||||
const char * /* O - Password */
|
||||
cupsGetPassword(const char *prompt) /* I - Prompt string */
|
||||
{
|
||||
return (NULL);
|
||||
}
|
||||
@@ -359,49 +81,35 @@ cupsUser(void)
|
||||
struct passwd *pwd; /* User/password entry */
|
||||
|
||||
|
||||
if (!cups_user[0])
|
||||
{
|
||||
/*
|
||||
* Rewind the password file...
|
||||
*/
|
||||
/*
|
||||
* Rewind the password file...
|
||||
*/
|
||||
|
||||
setpwent();
|
||||
setpwent();
|
||||
|
||||
/*
|
||||
* Lookup the password entry for the current user.
|
||||
*/
|
||||
/*
|
||||
* Lookup the password entry for the current user.
|
||||
*/
|
||||
|
||||
if ((pwd = getpwuid(getuid())) == NULL)
|
||||
strcpy(cups_user, "unknown"); /* Unknown user! */
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Copy the username...
|
||||
*/
|
||||
if ((pwd = getpwuid(getuid())) == NULL)
|
||||
return ("unknown"); /* Unknown user! */
|
||||
|
||||
setpwent();
|
||||
/*
|
||||
* Rewind the password file again and return the username...
|
||||
*/
|
||||
|
||||
strncpy(cups_user, pwd->pw_name, sizeof(cups_user) - 1);
|
||||
cups_user[sizeof(cups_user) - 1] = '\0';
|
||||
}
|
||||
setpwent();
|
||||
|
||||
/*
|
||||
* Rewind the password file again...
|
||||
*/
|
||||
|
||||
setpwent();
|
||||
}
|
||||
|
||||
return (cups_user);
|
||||
return (pwd->pw_name);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* 'cups_get_password()' - Get a password from the user...
|
||||
* 'cupsGetPassword()' - Get a password from the user...
|
||||
*/
|
||||
|
||||
static const char * /* O - Password */
|
||||
cups_get_password(const char *prompt) /* I - Prompt string */
|
||||
const char * /* O - Password */
|
||||
cupsGetPassword(const char *prompt) /* I - Prompt string */
|
||||
{
|
||||
return (getpass(prompt));
|
||||
}
|
||||
@@ -409,36 +117,74 @@ cups_get_password(const char *prompt) /* I - Prompt string */
|
||||
|
||||
|
||||
/*
|
||||
* 'cups_get_line()' - Get a line from a file.
|
||||
* 'cupsServer()' - Return the hostname of the default server...
|
||||
*/
|
||||
|
||||
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 */
|
||||
const char * /* O - Server name */
|
||||
cupsServer(void)
|
||||
{
|
||||
char *bufptr; /* Pointer to end of buffer */
|
||||
FILE *fp; /* client.conf file */
|
||||
char *server; /* Pointer to server name */
|
||||
const char *home; /* Home directory of user */
|
||||
static char line[1024]; /* Line from file */
|
||||
|
||||
|
||||
/*
|
||||
* Get the line from a file...
|
||||
* First see if the CUPS_SERVER environment variable is set...
|
||||
*/
|
||||
|
||||
if (fgets(buf, buflen, fp) == NULL)
|
||||
return (NULL);
|
||||
if ((server = getenv("CUPS_SERVER")) != NULL)
|
||||
return (server);
|
||||
|
||||
/*
|
||||
* Remove all trailing whitespace...
|
||||
* Next check to see if we have a $HOME/.cupsrc or client.conf file...
|
||||
*/
|
||||
|
||||
bufptr = buf + strlen(buf) - 1;
|
||||
if (bufptr < buf)
|
||||
return (NULL);
|
||||
if ((home = getenv("HOME")) != NULL)
|
||||
{
|
||||
snprintf(line, sizeof(line), "%s/.cupsrc", home);
|
||||
fp = fopen(line, "r");
|
||||
}
|
||||
else
|
||||
fp = NULL;
|
||||
|
||||
while (isspace(*bufptr) && bufptr >= buf)
|
||||
*bufptr-- = '\0';
|
||||
if (fp == NULL)
|
||||
fp = fopen(CUPS_SERVERROOT "/client.conf", "r");
|
||||
|
||||
return (buf);
|
||||
if (fp == NULL)
|
||||
return ("localhost");
|
||||
|
||||
/*
|
||||
* Read the config file and look for a ServerName line...
|
||||
*/
|
||||
|
||||
while (fgets(line, sizeof(line), fp) != NULL)
|
||||
if (strncmp(line, "ServerName ", 11) == 0)
|
||||
{
|
||||
/*
|
||||
* Got it! Drop any trailing newline and find the name...
|
||||
*/
|
||||
|
||||
server = line + strlen(line) - 1;
|
||||
if (*server == '\n')
|
||||
*server = '\0';
|
||||
|
||||
for (server = line + 11; isspace(*server); server ++);
|
||||
|
||||
if (*server)
|
||||
{
|
||||
fclose(fp);
|
||||
return (server);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Didn't see a ServerName line, so return "localhost"...
|
||||
*/
|
||||
|
||||
fclose(fp);
|
||||
|
||||
return ("localhost");
|
||||
}
|
||||
|
||||
|
||||
|
||||
+219
-264
@@ -3,7 +3,7 @@
|
||||
*
|
||||
* Printing utilities for the Common UNIX Printing System (CUPS).
|
||||
*
|
||||
* Copyright 1997-2001 by Easy Software Products.
|
||||
* Copyright 1997-2000 by Easy Software Products.
|
||||
*
|
||||
* These coded instructions, statements, and computer programs are the
|
||||
* property of Easy Software Products and are protected by Federal
|
||||
@@ -29,10 +29,8 @@
|
||||
* cupsGetDefault() - Get the default printer or class.
|
||||
* 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...
|
||||
@@ -50,7 +48,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
# include <io.h>
|
||||
@@ -177,19 +174,9 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
nonce[HTTP_MAX_VALUE], /* nonce="xyz" string */
|
||||
plain[255], /* Plaintext username:password */
|
||||
encode[255]; /* Encoded username:password */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
|
||||
|
||||
if (http == NULL || request == NULL || resource == NULL)
|
||||
{
|
||||
if (request != NULL)
|
||||
ippDelete(request);
|
||||
|
||||
last_error = IPP_INTERNAL_ERROR;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
DEBUG_printf(("cupsDoFileRequest(%p, %08x, \'%s\', \'%s\')\n",
|
||||
DEBUG_printf(("cupsDoFileRequest(%08x, %08s, \'%s\', \'%s\')\n",
|
||||
http, request, resource, filename ? filename : "(null)"));
|
||||
|
||||
/*
|
||||
@@ -309,10 +296,10 @@ cupsDoFileRequest(http_t *http, /* I - HTTP connection to server */
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
|
||||
snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
http->hostname);
|
||||
printf("Authentication required for %s on %s...\n", cupsUser(),
|
||||
http->hostname);
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) != NULL)
|
||||
if ((password = cupsGetPassword("UNIX Password: ")) != NULL)
|
||||
{
|
||||
/*
|
||||
* Got a password; send it to the server...
|
||||
@@ -445,12 +432,6 @@ cupsGetClasses(char ***classes) /* O - Classes */
|
||||
char **temp; /* Temporary pointer */
|
||||
|
||||
|
||||
if (classes == NULL)
|
||||
{
|
||||
last_error = IPP_INTERNAL_ERROR;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to connect to the server...
|
||||
*/
|
||||
@@ -467,7 +448,6 @@ cupsGetClasses(char ***classes) /* O - Classes */
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
@@ -483,9 +463,6 @@ 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...
|
||||
*/
|
||||
@@ -545,6 +522,9 @@ 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 */
|
||||
@@ -565,6 +545,43 @@ 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 ((fp = fopen(CUPS_SERVERROOT "/client.conf", "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...
|
||||
*/
|
||||
@@ -628,42 +645,22 @@ 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 bytes; /* Number of bytes read */
|
||||
char buffer[8192]; /* Buffer for file */
|
||||
char printer[HTTP_MAX_URI], /* Printer name */
|
||||
method[HTTP_MAX_URI], /* Method/scheme name */
|
||||
username[HTTP_MAX_URI], /* Username:password */
|
||||
hostname[HTTP_MAX_URI], /* Hostname */
|
||||
resource[HTTP_MAX_URI]; /* Resource name */
|
||||
int port; /* Port number */
|
||||
char *tempdir; /* Temporary file directory */
|
||||
const char *password; /* Password string */
|
||||
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 */
|
||||
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)
|
||||
{
|
||||
last_error = IPP_INTERNAL_ERROR;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* See if we can connect to the server...
|
||||
*/
|
||||
@@ -675,119 +672,19 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
}
|
||||
|
||||
/*
|
||||
* Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
|
||||
* attributes:
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* printer-uri
|
||||
* requested-attributes
|
||||
* Then check for the cache file...
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
#if defined(WIN32) || defined(__EMX__)
|
||||
tempdir = "C:/WINDOWS/TEMP";
|
||||
|
||||
request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
|
||||
request->request.op.request_id = 1;
|
||||
snprintf(filename, sizeof(filename), "%s/%s.ppd", tempdir, printer);
|
||||
#else
|
||||
if ((tempdir = getenv("TMPDIR")) == NULL)
|
||||
tempdir = "/tmp";
|
||||
|
||||
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)
|
||||
{
|
||||
last_error = response->request.status.status_code;
|
||||
printer[0] = '\0';
|
||||
hostname[0] = '\0';
|
||||
|
||||
if ((attr = ippFindAttribute(response, "member-uris", IPP_TAG_URI)) != NULL)
|
||||
{
|
||||
/*
|
||||
* Get the first actual server and printer name in the class...
|
||||
*/
|
||||
|
||||
for (i = 0; i < attr->num_values; i ++)
|
||||
{
|
||||
httpSeparate(attr->values[0].string.text, method, username, hostname,
|
||||
&port, resource);
|
||||
if (strncmp(resource, "/printers/", 10) == 0)
|
||||
{
|
||||
/*
|
||||
* Found a printer!
|
||||
*/
|
||||
|
||||
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...
|
||||
*/
|
||||
|
||||
httpSeparate(attr->values[0].string.text, method, username, hostname,
|
||||
&port, resource);
|
||||
strncpy(printer, strrchr(resource, '/') + 1, sizeof(printer) - 1);
|
||||
printer[sizeof(printer) - 1] = '\0';
|
||||
}
|
||||
|
||||
ippDelete(response);
|
||||
|
||||
/*
|
||||
* Remap local hostname to localhost...
|
||||
*/
|
||||
|
||||
gethostname(buffer, sizeof(buffer));
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Get a temp file...
|
||||
*/
|
||||
|
||||
cupsTempFile(filename, sizeof(filename));
|
||||
snprintf(filename, sizeof(filename), "%s/%d.%s.ppd", tempdir, getuid(), printer);
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
/*
|
||||
* And send a request to the HTTP server...
|
||||
@@ -830,10 +727,10 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
* Nope, get a password from the user...
|
||||
*/
|
||||
|
||||
snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
cups_server->hostname);
|
||||
printf("Authentication required for %s on %s...\n", cupsUser(),
|
||||
cups_server->hostname);
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) != NULL)
|
||||
if ((password = cupsGetPassword("UNIX Password: ")) != NULL)
|
||||
{
|
||||
/*
|
||||
* Got a password; send it to the server...
|
||||
@@ -879,13 +776,13 @@ cupsGetPPD(const char *name) /* I - Printer name */
|
||||
* OK, we need to copy the file; open the file and copy it...
|
||||
*/
|
||||
|
||||
unlink(filename);
|
||||
if ((fp = fopen(filename, "w")) == NULL)
|
||||
{
|
||||
/*
|
||||
* Can't open file; close the server connection and return NULL...
|
||||
*/
|
||||
|
||||
httpFlush(cups_server);
|
||||
httpClose(cups_server);
|
||||
cups_server = NULL;
|
||||
return (NULL);
|
||||
@@ -915,12 +812,6 @@ cupsGetPrinters(char ***printers) /* O - Printers */
|
||||
char **temp; /* Temporary pointer */
|
||||
|
||||
|
||||
if (printers == NULL)
|
||||
{
|
||||
last_error = IPP_INTERNAL_ERROR;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try to connect to the server...
|
||||
*/
|
||||
@@ -937,7 +828,6 @@ cupsGetPrinters(char ***printers) /* O - Printers */
|
||||
*
|
||||
* attributes-charset
|
||||
* attributes-natural-language
|
||||
* requested-attributes
|
||||
*/
|
||||
|
||||
request = ippNew();
|
||||
@@ -953,9 +843,6 @@ 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...
|
||||
*/
|
||||
@@ -1030,8 +917,8 @@ cupsPrintFile(const char *name, /* I - Printer or class name */
|
||||
int num_options,/* I - Number of options */
|
||||
cups_option_t *options) /* I - Options */
|
||||
{
|
||||
DEBUG_printf(("cupsPrintFile(\'%s\', \'%s\', %d, %p)\n",
|
||||
name, filename, num_options, options));
|
||||
DEBUG_printf(("cupsPrintFile(\'%s\', \'%s\', %d, %08x)\n",
|
||||
printer, filename, num_options, options));
|
||||
|
||||
return (cupsPrintFiles(name, 1, &filename, title, num_options, options));
|
||||
}
|
||||
@@ -1050,6 +937,9 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
cups_option_t *options) /* I - Options */
|
||||
{
|
||||
int i; /* Looping var */
|
||||
int n, n2; /* Attribute values */
|
||||
char *option, /* Name of option */
|
||||
*s; /* Pointer into option value */
|
||||
const char *val; /* Pointer to option value */
|
||||
ipp_t *request; /* IPP request */
|
||||
ipp_t *response; /* IPP response */
|
||||
@@ -1061,8 +951,8 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
int jobid; /* New job ID */
|
||||
|
||||
|
||||
DEBUG_printf(("cupsPrintFiles(\'%s\', %d, %p, %d, %p)\n",
|
||||
name, num_files, files, num_options, options));
|
||||
DEBUG_printf(("cupsPrintFiles(\'%s\', %d, %p, %d, %08x)\n",
|
||||
printer, num_files, files, num_options, options));
|
||||
|
||||
if (name == NULL || num_files < 1 || files == NULL)
|
||||
return (0);
|
||||
@@ -1076,6 +966,7 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
DEBUG_printf(("cupsPrintFile: Unable to open connection - %s.\n",
|
||||
strerror(errno)));
|
||||
last_error = IPP_SERVICE_UNAVAILABLE;
|
||||
ippDelete(request);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -1105,6 +996,20 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
|
||||
NULL, uri);
|
||||
|
||||
/*
|
||||
* Handle raw print files...
|
||||
*/
|
||||
|
||||
if (cupsGetOption("raw", num_options, options))
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/vnd.cups-raw");
|
||||
else if ((val = cupsGetOption("document-format", num_options, options)) != NULL)
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, val);
|
||||
else
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
|
||||
NULL, "application/octet-stream");
|
||||
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
|
||||
NULL, cupsUser());
|
||||
|
||||
@@ -1112,10 +1017,129 @@ cupsPrintFiles(const char *name, /* I - Printer or class name */
|
||||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, title);
|
||||
|
||||
/*
|
||||
* Then add all options...
|
||||
* Then add all options on the command-line...
|
||||
*/
|
||||
|
||||
cupsEncodeOptions(request, num_options, options);
|
||||
for (i = 0; i < num_options; i ++)
|
||||
{
|
||||
/*
|
||||
* Skip the "raw" option - handled above...
|
||||
*/
|
||||
|
||||
if (strcasecmp(options[i].name, "raw") == 0 ||
|
||||
strcasecmp(options[i].name, "document-format") == 0)
|
||||
continue;
|
||||
|
||||
/*
|
||||
* 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, and option=MxN.
|
||||
*/
|
||||
|
||||
option = options[i].name;
|
||||
val = options[i].value;
|
||||
|
||||
if (*val == '\0')
|
||||
val = NULL;
|
||||
|
||||
if (val != NULL)
|
||||
{
|
||||
if (strcasecmp(val, "true") == 0 ||
|
||||
strcasecmp(val, "on") == 0 ||
|
||||
strcasecmp(val, "yes") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - true...
|
||||
*/
|
||||
|
||||
n = 1;
|
||||
val = "";
|
||||
}
|
||||
else if (strcasecmp(val, "false") == 0 ||
|
||||
strcasecmp(val, "off") == 0 ||
|
||||
strcasecmp(val, "no") == 0)
|
||||
{
|
||||
/*
|
||||
* Boolean value - false...
|
||||
*/
|
||||
|
||||
n = 0;
|
||||
val = "";
|
||||
}
|
||||
|
||||
n = strtol(val, &s, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (strncasecmp(option, "no", 2) == 0)
|
||||
{
|
||||
option += 2;
|
||||
n = 0;
|
||||
}
|
||||
else
|
||||
n = 1;
|
||||
|
||||
s = "";
|
||||
}
|
||||
|
||||
if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
|
||||
{
|
||||
/*
|
||||
* String value(s)...
|
||||
*/
|
||||
|
||||
DEBUG_printf(("cupsPrintFile: Adding string option \'%s\' with value \'%s\'...\n",
|
||||
option, val));
|
||||
|
||||
ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
|
||||
}
|
||||
else if (val != NULL)
|
||||
{
|
||||
/*
|
||||
* Numeric value, range, or resolution...
|
||||
*/
|
||||
|
||||
if (*s == '-')
|
||||
{
|
||||
n2 = strtol(s + 1, NULL, 0);
|
||||
ippAddRange(request, IPP_TAG_JOB, option, n, n2);
|
||||
|
||||
DEBUG_printf(("cupsPrintFile: Adding range option \'%s\' with value %d-%d...\n",
|
||||
option, n, n2));
|
||||
}
|
||||
else if (*s == 'x')
|
||||
{
|
||||
n2 = strtol(s + 1, &s, 0);
|
||||
|
||||
if (strcasecmp(s, "dpc") == 0)
|
||||
ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
|
||||
else if (strcasecmp(s, "dpi") == 0)
|
||||
ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_INCH, n, n2);
|
||||
else
|
||||
ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
|
||||
|
||||
DEBUG_printf(("cupsPrintFile: Adding resolution option \'%s\' with value %s...\n",
|
||||
option, val));
|
||||
}
|
||||
else
|
||||
{
|
||||
ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, option, n);
|
||||
|
||||
DEBUG_printf(("cupsPrintFile: Adding integer option \'%s\' with value %d...\n",
|
||||
option, n));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Boolean value...
|
||||
*/
|
||||
|
||||
DEBUG_printf(("cupsPrintFile: Adding boolean option \'%s\' with value %d...\n",
|
||||
option, n));
|
||||
ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Do the request...
|
||||
@@ -1225,14 +1249,7 @@ char * /* O - Filename */
|
||||
cupsTempFile(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 */
|
||||
|
||||
|
||||
@@ -1250,79 +1267,27 @@ cupsTempFile(char *filename, /* I - Pointer to buffer */
|
||||
* See if TMPDIR is defined...
|
||||
*/
|
||||
|
||||
#ifdef WIN32
|
||||
GetTempPath(sizeof(tmpdir), tmpdir);
|
||||
#else
|
||||
if ((tmpdir = getenv("TMPDIR")) == NULL)
|
||||
tmpdir = "/var/tmp";
|
||||
|
||||
if ((int)(strlen(tmpdir) + 8) > len)
|
||||
{
|
||||
/*
|
||||
* Put root temp files in restricted temp directory...
|
||||
* The specified directory exceeds the size of the buffer; default it...
|
||||
*/
|
||||
|
||||
if (getuid() == 0)
|
||||
tmpdir = CUPS_REQUESTS "/tmp";
|
||||
else
|
||||
tmpdir = "/var/tmp";
|
||||
strcpy(buf, "/var/tmp/XXXXXX");
|
||||
return (mktemp(buf));
|
||||
}
|
||||
#endif /* WIN32 */
|
||||
|
||||
/*
|
||||
* Make the temporary name using the specified directory...
|
||||
*/
|
||||
|
||||
do
|
||||
else
|
||||
{
|
||||
#ifdef WIN32
|
||||
/*
|
||||
* Get the current time of day...
|
||||
* Make the temporary name using the specified directory...
|
||||
*/
|
||||
|
||||
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_WRONLY | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
|
||||
#else
|
||||
fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0600);
|
||||
#endif /* O_NOFOLLOW */
|
||||
sprintf(filename, "%s/XXXXXX", tmpdir);
|
||||
return (mktemp(filename));
|
||||
}
|
||||
while (fd < 0);
|
||||
|
||||
/*
|
||||
* Close the temp file - it'll be reopened later as needed...
|
||||
*/
|
||||
|
||||
close(fd);
|
||||
|
||||
/*
|
||||
* Return the temp filename...
|
||||
*/
|
||||
|
||||
return (filename);
|
||||
}
|
||||
|
||||
|
||||
@@ -1383,10 +1348,7 @@ cups_connect(const char *name, /* I - Destination (printer[@host]) */
|
||||
return (NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
httpEncryption(cups_server, cupsEncryption());
|
||||
return (printer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1405,11 +1367,10 @@ 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 */
|
||||
const char *root; /* Server root directory */
|
||||
int pid; /* Current process ID */
|
||||
FILE *fp; /* Certificate file */
|
||||
char filename[1024], /* Certificate filename */
|
||||
certificate[33]; /* Certificate string */
|
||||
|
||||
|
||||
/*
|
||||
@@ -1425,16 +1386,10 @@ cups_local_auth(http_t *http) /* I - Connection */
|
||||
* try the root certificate...
|
||||
*/
|
||||
|
||||
if ((root = getenv("CUPS_SERVERROOT")) == NULL)
|
||||
root = CUPS_SERVERROOT;
|
||||
|
||||
pid = getpid();
|
||||
snprintf(filename, sizeof(filename), "%s/certs/%d", root, pid);
|
||||
sprintf(filename, CUPS_SERVERROOT "/certs/%d", pid);
|
||||
if ((fp = fopen(filename, "r")) == NULL && pid > 0)
|
||||
{
|
||||
snprintf(filename, sizeof(filename), "%s/certs/0", root);
|
||||
fp = fopen(filename, "r");
|
||||
}
|
||||
fp = fopen(CUPS_SERVERROOT "/certs/0", "r");
|
||||
|
||||
if (fp == NULL)
|
||||
return (0);
|
||||
@@ -1450,7 +1405,7 @@ cups_local_auth(http_t *http) /* I - Connection */
|
||||
* Set the authorization string and return...
|
||||
*/
|
||||
|
||||
snprintf(authstring, sizeof(authstring), "Local %s", certificate);
|
||||
sprintf(authstring, "Local %s", certificate);
|
||||
|
||||
return (1);
|
||||
#endif /* WIN32 || __EMX__ */
|
||||
|
||||
+3
-11
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Datafile makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -81,24 +81,16 @@ clean:
|
||||
#
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(DATADIR)
|
||||
-$(MKDIR) $(DATADIR)/banners
|
||||
$(CHMOD) ugo+rx $(DATADIR)
|
||||
$(CHMOD) ugo+rx $(DATADIR)/banners
|
||||
$(INSTALL_DATA) $(BANNERS) $(DATADIR)/banners
|
||||
-$(MKDIR) $(DATADIR)/charsets
|
||||
$(CHMOD) ugo+rx $(DATADIR)/charsets
|
||||
$(INSTALL_DATA) $(CHARSETS) $(DATADIR)/charsets
|
||||
-$(MKDIR) $(DATADIR)/data
|
||||
$(CHMOD) ugo+rx $(DATADIR)/data
|
||||
$(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
|
||||
-if test "$(PAMDIR)" != ""; then \
|
||||
$(MKDIR) $(PAMDIR); \
|
||||
$(CHMOD) ugo+rx $(PAMDIR); \
|
||||
if test -f /lib/security/pam_unix.so; then \
|
||||
$(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
|
||||
else \
|
||||
$(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
|
||||
fi \
|
||||
$(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
|
||||
fi
|
||||
|
||||
|
||||
|
||||
+25
-33
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,20 +151,14 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -176,30 +170,28 @@ gsave
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -7 mul add % - 2 lines
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Classified) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 6 mul % Bottom of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Classified) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -209,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -218,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -227,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -236,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -262,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: classified 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: classified 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+25
-33
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,20 +151,14 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -176,30 +170,28 @@ gsave
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -7 mul add % - 2 lines
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Confidential) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 6 mul % Bottom of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Confidential) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -209,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -218,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -227,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -236,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -262,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: confidential 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: confidential 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
auth required /lib/security/pam_unix.so nullok shadow
|
||||
account required /lib/security/pam_unix.so
|
||||
+25
-33
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,20 +151,14 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -176,30 +170,28 @@ gsave
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -7 mul add % - 2 lines
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Secret) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 6 mul % Bottom of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Secret) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -209,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -218,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -227,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -236,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -262,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: secret 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: secret 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+39
-31
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,39 +151,47 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
pageBottom 72 mul
|
||||
translate
|
||||
|
||||
% Draw the label at the top and bottom...
|
||||
0 setgray % Color
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Banner) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Banner) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -193,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -202,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -211,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -220,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -246,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: standard 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: standard 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+28
-35
@@ -213,22 +213,15 @@ gsave
|
||||
/yResolution exch abs def % yResolution = abs(yres)
|
||||
/xResolution exch abs def % xResolution = abs(xres)
|
||||
|
||||
% Figure out the sizes of things...
|
||||
/wheelSize % size of wheels
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 9 mul }
|
||||
{ pageHeight 7 mul }
|
||||
ifelse def
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
/smallFont /Times-Roman findfont % smallFont = Times-Roman
|
||||
pageHeight scalefont def % size = pageHeight (nominally 11)
|
||||
pageWidth 1.5 mul scalefont def % size = pageWidth * 1.5 (nominally 13)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -246,7 +239,7 @@ gsave
|
||||
translate
|
||||
|
||||
% Size the wheel...
|
||||
wheelSize
|
||||
pageWidth 9 mul % radius = pageWidth * 1/8 * 72
|
||||
|
||||
% Draw the colors...
|
||||
dup (C) exch 0 1 1 OCTANT 45 rotate
|
||||
@@ -275,7 +268,7 @@ gsave
|
||||
translate
|
||||
|
||||
% Size the wheel...
|
||||
wheelSize
|
||||
pageWidth 9 mul % radius = pageWidth * 1/8 * 72
|
||||
|
||||
% Loop at 1 degree increments
|
||||
0 1 359 {
|
||||
@@ -297,7 +290,7 @@ gsave
|
||||
(1 Degree Radial Lines) CENTER % Show the text centered
|
||||
|
||||
% Imageable area...
|
||||
pageHeight 15 mul % Height of imageable area
|
||||
pageWidth 19.5 mul % Height of imageable area
|
||||
|
||||
pageWidth 4.5 mul % x = pageWidth * 1/16 * 72
|
||||
pageHeight 35.5 mul % y = pageHeight * 1/2 * 72
|
||||
@@ -326,7 +319,7 @@ gsave
|
||||
smallFont setfont % Font
|
||||
pageWidth 14 mul % x = pageWidth * 3/16 * 72
|
||||
pageHeight 36 mul % y = pageWidth * 1/2 * 72
|
||||
pageHeight -2 mul add % y -= 2 * smallFont height
|
||||
pageWidth -3 mul add % y -= 2 * smallFont height
|
||||
|
||||
% Page Size inches
|
||||
2 copy moveto % Move to x & y
|
||||
@@ -337,7 +330,7 @@ gsave
|
||||
(in) show % "in"
|
||||
|
||||
% Page Size millimeters
|
||||
pageHeight sub % Move down...
|
||||
pageWidth -1.5 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
10 pageWidth 25.4 mul NUMBER % pageWidth
|
||||
@@ -346,7 +339,7 @@ gsave
|
||||
(mm) show % "mm"
|
||||
|
||||
% Lower-left inches
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
(Lower-Left: ) RIGHT % Label
|
||||
@@ -356,7 +349,7 @@ gsave
|
||||
(in) show % "in"
|
||||
|
||||
% Lower-left millimeters
|
||||
pageHeight sub % Move down...
|
||||
pageWidth -1.5 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
10 pageLeft 25.4 mul NUMBER % pageLeft
|
||||
@@ -365,7 +358,7 @@ gsave
|
||||
(mm) show % "mm"
|
||||
|
||||
% Upper-right inches
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
(Upper-Right: ) RIGHT % Label
|
||||
@@ -375,7 +368,7 @@ gsave
|
||||
(in) show % "in"
|
||||
|
||||
% Upper-right millimeters
|
||||
pageHeight sub % Move down...
|
||||
pageWidth -1.5 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
10 pageRight 25.4 mul NUMBER % pageRight
|
||||
@@ -384,7 +377,7 @@ gsave
|
||||
(mm) show % "mm"
|
||||
|
||||
% Resolution dots-per-inch
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
|
||||
2 copy moveto % Move to x & y
|
||||
(Resolution: ) RIGHT % Label
|
||||
@@ -394,7 +387,7 @@ gsave
|
||||
(dpi) show % "dpi"
|
||||
|
||||
% Resolution dots-per-meter
|
||||
pageHeight sub % Move down...
|
||||
pageWidth -1.5 mul add % Move down...
|
||||
|
||||
moveto % Move to x & y
|
||||
1 xResolution 39.27 mul NUMBER % xResolution
|
||||
@@ -403,7 +396,7 @@ gsave
|
||||
(dpm) show % "dpm"
|
||||
|
||||
% Interpreter Information...
|
||||
pageHeight 15 mul % Height of interpreter information
|
||||
pageWidth 19.5 mul % Height of interpreter info
|
||||
|
||||
pageWidth 40.5 mul % x = pageWidth * 9/16 * 72
|
||||
pageHeight 35.5 mul % y = pageHeight * 1/2 * 72
|
||||
@@ -432,7 +425,7 @@ gsave
|
||||
smallFont setfont % Font
|
||||
pageWidth 49 mul % x = pageWidth * 11/16 * 72
|
||||
pageHeight 36 mul % y = pageWidth * 1/2 * 72
|
||||
pageHeight 2 mul sub % y -= 2 * smallFont height
|
||||
pageWidth -3 mul add % y -= 2 * smallFont height
|
||||
|
||||
% Language level
|
||||
2 copy moveto % Move to x & y
|
||||
@@ -441,7 +434,7 @@ gsave
|
||||
1 languagelevel NUMBER % Language level
|
||||
|
||||
% Version
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
2 copy moveto % Move to x & y
|
||||
(Version: ) RIGHT % Label
|
||||
version show % Version
|
||||
@@ -450,13 +443,13 @@ gsave
|
||||
(\)) show % ")"
|
||||
|
||||
% Product
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
2 copy moveto % Move to x & y
|
||||
(Product: ) RIGHT % Label
|
||||
product show % Product name
|
||||
|
||||
% Serial Number
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth -3 mul add % Move down...
|
||||
2 copy moveto % Move to x & y
|
||||
(Serial #: ) RIGHT % Label
|
||||
1 serialnumber NUMBER % S/N
|
||||
@@ -470,28 +463,28 @@ gsave
|
||||
|
||||
% Draw the copyright notice at the bottom...
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 10 mul % Bottom of page
|
||||
pageWidth 14 mul % Bottom of page
|
||||
2 copy moveto % Position text
|
||||
(Printed Using CUPS v1.1.x) CENTER % Show text centered
|
||||
(Printed Using CUPS v1.1) CENTER % Show text centered
|
||||
|
||||
pageHeight 2 mul sub % Move down...
|
||||
pageWidth 3 mul sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
smallFont setfont % Font
|
||||
(Copyright 1993-2000 Easy Software Products, All Rights Reserved.) CENTER
|
||||
pageHeight sub % Move down...
|
||||
pageWidth 1.5 mul sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
(CUPS, and the CUPS logo are the trademark property of) CENTER
|
||||
pageHeight sub % Move down...
|
||||
pageWidth 1.5 mul sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
(Easy Software Products, 44141 Airport View Drive, Suite 204,) CENTER
|
||||
pageHeight sub % Move down...
|
||||
pageWidth 1.5 mul sub % Move down...
|
||||
2 copy moveto % Position text
|
||||
(Hollywood, Maryland, 20636-3111, USA.) CENTER
|
||||
|
||||
% Then the CUPS logo....
|
||||
gsave
|
||||
pageWidth 4 mul
|
||||
pageHeight 4 mul
|
||||
pageWidth 6 mul
|
||||
translate
|
||||
pageWidth 9 mul CUPSLOGO
|
||||
grestore
|
||||
@@ -499,7 +492,7 @@ gsave
|
||||
% And the ESP logo....
|
||||
gsave
|
||||
pageWidth 59 mul
|
||||
pageHeight 4 mul
|
||||
pageWidth 6 mul
|
||||
translate
|
||||
pageWidth 6 mul ESPLOGO
|
||||
grestore
|
||||
@@ -507,6 +500,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: testprint.ps 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: testprint.ps 985 2000-03-13 18:55:00Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+25
-33
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,20 +151,14 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -176,30 +170,28 @@ gsave
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -7 mul add % - 2 lines
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Top Secret) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 6 mul % Bottom of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Top Secret) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -209,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -218,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -227,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -236,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -262,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: topsecret 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: topsecret 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+25
-33
@@ -22,28 +22,28 @@
|
||||
% to third parties or copied or duplicated in any form, in whole or
|
||||
% in part, without the prior written consent of Easy Software Products.
|
||||
%
|
||||
/CENTER { % Draw centered text
|
||||
/CENTER \{ % Draw centered text
|
||||
% (name) CENTER -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/RIGHT { % Draw right-justified text
|
||||
/RIGHT \{ % Draw right-justified text
|
||||
% (name) RIGHT -
|
||||
dup stringwidth pop % Get the width of the string
|
||||
neg 0 rmoveto % Shift left the entire distance
|
||||
show % Show the string
|
||||
} bind def
|
||||
/NUMBER { % Draw a number
|
||||
/NUMBER \{ % Draw a number
|
||||
% power n NUMBER -
|
||||
1 index 1 eq { % power == 1?
|
||||
1 index 1 eq \{ % power == 1?
|
||||
round cvi exch pop % Convert "n" to integer
|
||||
} {
|
||||
} \{
|
||||
1 index mul round exch div % Truncate extra decimal places
|
||||
} ifelse
|
||||
100 string cvs show % Convert to a string and show it...
|
||||
} bind def
|
||||
/CUPSLOGO { % Draw the CUPS logo
|
||||
/CUPSLOGO \{ % Draw the CUPS logo
|
||||
% height CUPSLOGO
|
||||
% Start with a big C...
|
||||
/Helvetica findfont 1 index scalefont setfont
|
||||
@@ -61,14 +61,14 @@
|
||||
dup 1.2 mul moveto
|
||||
(System) show
|
||||
} bind def
|
||||
/ESPLOGO { % Draw the ESP logo
|
||||
/ESPLOGO \{ % Draw the ESP logo
|
||||
% height ESPLOGO
|
||||
% Compute the size of the logo...
|
||||
0 0
|
||||
2 index 1.5 mul 3 index
|
||||
|
||||
% Do the "metallic" fill from 10% black to 40% black...
|
||||
1 -0.001 0 {
|
||||
1 -0.001 0 \{
|
||||
dup % loopval
|
||||
-0.15 mul % loopval * -0.15
|
||||
0.9 add % 0.9 - loopval * 0.15
|
||||
@@ -151,20 +151,14 @@ gsave
|
||||
/pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft
|
||||
/pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom
|
||||
|
||||
/boxWidth % width of text box
|
||||
pageWidth pageHeight lt
|
||||
{ pageWidth 54 mul }
|
||||
{ pageHeight 42 mul }
|
||||
ifelse def
|
||||
|
||||
newpath % Clear bounding path
|
||||
|
||||
% Create fonts...
|
||||
/bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold
|
||||
pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33)
|
||||
pageWidth 4 mul scalefont def % size = pageWidth * 4 (nominally 34)
|
||||
|
||||
/mediumFont /Helvetica findfont % mediumFont = Helvetica
|
||||
pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5)
|
||||
pageWidth 2 mul scalefont def % size = pageWidth * 2 (nominally 17)
|
||||
|
||||
% Offset page to account for lower-left margin...
|
||||
pageLeft 72 mul
|
||||
@@ -176,30 +170,28 @@ gsave
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 72 mul % Top of page
|
||||
pageWidth -7 mul add % - 2 lines
|
||||
pageWidth -9 mul add % - 1 line
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Unclassified) CENTER % Show text centered
|
||||
|
||||
pageWidth 36 mul % Center of page
|
||||
pageHeight 6 mul % Bottom of page
|
||||
pageWidth 8 mul % Bottom of page
|
||||
moveto % Position text
|
||||
bigFont setfont % Font
|
||||
(Unclassified) CENTER % Show text centered
|
||||
|
||||
% Job information box...
|
||||
pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul 9 add % x = pageWidth * 1/4 * 72 + 9
|
||||
pageHeight 27 mul 9 sub % y = pageHeight * 3/8 * 72 - 9
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
0.5 setgray rectfill % Draw a shadow
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
boxWidth 0.5 mul sub % x-= 1/2 box width
|
||||
pageHeight 30 mul % y = pageHeight * 1/4 * 72
|
||||
boxWidth % w = box width
|
||||
pageHeight 14 mul % h = pageHeight * 1/2 * 72
|
||||
pageWidth 18 mul % x = pageWidth * 1/4 * 72
|
||||
pageHeight 27 mul % y = pageHeight * 3/8 * 72
|
||||
pageWidth 36 mul % w = pageWidth * 1/2 * 72
|
||||
pageHeight 18 mul % h = pageHeight * 1/4 * 72
|
||||
|
||||
4 copy 1 setgray rectfill % Clear the box to white
|
||||
0 setgray rectstroke % Draw a black box around it...
|
||||
@@ -209,7 +201,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 5 mul add % y += 2 lines
|
||||
pageWidth 4 mul add % y += 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Job ID: ) RIGHT
|
||||
@@ -218,7 +210,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight 2 mul add % y += 1 line
|
||||
pageWidth 1 mul add % y += 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Title: ) RIGHT
|
||||
@@ -227,7 +219,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -1 mul add % y -= 1 line
|
||||
pageWidth -2 mul add % y -= 1 line
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Requesting User: ) RIGHT
|
||||
@@ -236,7 +228,7 @@ gsave
|
||||
|
||||
pageWidth 36 mul % x = pageWidth * 1/2 * 72
|
||||
pageHeight 36 mul % y = pageHeight * 1/2 * 72
|
||||
pageHeight -4 mul add % y -= 2 lines
|
||||
pageWidth -5 mul add % y -= 2 lines
|
||||
2 copy % Copy X & Y
|
||||
moveto
|
||||
(Billing Info: ) RIGHT
|
||||
@@ -262,6 +254,6 @@ gsave
|
||||
grestore
|
||||
showpage
|
||||
%
|
||||
% End of "$Id: unclassified 1379 2000-09-18 17:12:42Z mike $".
|
||||
% End of "$Id: unclassified 1075 2000-05-11 20:02:21Z mike $".
|
||||
%
|
||||
%%EOF
|
||||
|
||||
+6
-24
@@ -3,7 +3,7 @@
|
||||
#
|
||||
# Documentation makefile for the Common UNIX Printing System (CUPS).
|
||||
#
|
||||
# Copyright 1993-2001 by Easy Software Products.
|
||||
# Copyright 1993-2000 by Easy Software Products.
|
||||
#
|
||||
# These coded instructions, statements, and computer programs are the
|
||||
# property of Easy Software Products and are protected by Federal
|
||||
@@ -47,8 +47,7 @@ include ../Makedefs
|
||||
#
|
||||
|
||||
DOCUMENTS = cmp.shtml idd.shtml ipp.shtml sam.shtml sdd.shtml \
|
||||
spm.shtml sps.shtml ssr.shtml stp.shtml sum.shtml \
|
||||
svd.shtml
|
||||
spm.shtml ssr.shtml stp.shtml sum.shtml svd.shtml
|
||||
DOCIMAGES = images/cups-block-diagram.gif images/cups-large.gif \
|
||||
images/cups-medium.gif images/cups-small.gif
|
||||
WEBPAGES = cups.css cupsdoc.css index.html documentation.html
|
||||
@@ -79,7 +78,6 @@ WEBIMAGES = images/accept-jobs.gif \
|
||||
images/printer-stopped.gif \
|
||||
images/reject-jobs.gif \
|
||||
images/release-job.gif \
|
||||
images/restart-job.gif \
|
||||
images/right.gif \
|
||||
images/show-active.gif \
|
||||
images/show-completed.gif \
|
||||
@@ -89,6 +87,7 @@ WEBIMAGES = images/accept-jobs.gif \
|
||||
images/stop-printer.gif
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
# Make all documents...
|
||||
#
|
||||
@@ -97,10 +96,11 @@ all: $(DOCUMENTS:.shtml=.pdf) $(DOCUMENTS:.shtml=.html) overview.pdf
|
||||
|
||||
|
||||
#
|
||||
# Make PS files...
|
||||
# Make manuals for printing...
|
||||
#
|
||||
|
||||
ps: $(DOCUMENTS:.shtml=.ps) overview.ps
|
||||
print: sam-7x8.pdf spm-7x8.pdf sum-7x8.pdf \
|
||||
sam-7x8.ps spm-7x8.ps sum-7x8.ps
|
||||
|
||||
|
||||
#
|
||||
@@ -119,13 +119,11 @@ clean:
|
||||
|
||||
install:
|
||||
-$(MKDIR) $(DOCDIR)
|
||||
$(CHMOD) ugo+rx $(DOCDIR)
|
||||
$(INSTALL_MAN) $(WEBPAGES) $(DOCDIR)
|
||||
$(INSTALL_MAN) overview.html overview.pdf $(DOCDIR)
|
||||
$(INSTALL_MAN) $(DOCUMENTS:.shtml=.html) $(DOCDIR)
|
||||
$(INSTALL_MAN) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)
|
||||
-$(MKDIR) $(DOCDIR)/images
|
||||
$(CHMOD) ugo+rx $(DOCDIR)/images
|
||||
$(INSTALL_MAN) $(WEBIMAGES) $(DOCDIR)/images
|
||||
$(INSTALL_MAN) $(DOCIMAGES) $(DOCDIR)/images
|
||||
|
||||
@@ -209,22 +207,6 @@ sum-7x8.ps: sum.shtml
|
||||
--size 7x8.5in --left 0.5in --right 0.25in \
|
||||
--top 0.25in --bottom 0.25in --fontsize 10 --headfootsize 10 -f $@ sum.shtml
|
||||
|
||||
$(DOCUMENTS:.shtml=.html): \
|
||||
glossary.shtml printing-overview.shtml \
|
||||
references.shtml system-overview.shtml \
|
||||
../LICENSE.html
|
||||
|
||||
$(DOCUMENTS:.shtml=.pdf): \
|
||||
glossary.shtml printing-overview.shtml \
|
||||
references.shtml system-overview.shtml \
|
||||
../LICENSE.html
|
||||
|
||||
$(DOCUMENTS:.shtml=.ps): \
|
||||
glossary.shtml printing-overview.shtml \
|
||||
references.shtml system-overview.shtml \
|
||||
../LICENSE.html
|
||||
|
||||
|
||||
#
|
||||
# End of Makefile.
|
||||
#
|
||||
|
||||
+544
-614
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+626
-700
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+2
-2
@@ -12,7 +12,7 @@
|
||||
<H2>Identification</H2>
|
||||
|
||||
This configuration management plan document provides the guidelines for
|
||||
development and maintenance of the Common UNIX Printing System ("CUPS")
|
||||
development and maintainance of the Common UNIX Printing System ("CUPS")
|
||||
Version 1.1 software.
|
||||
|
||||
<EMBED SRC="system-overview.shtml">
|
||||
@@ -39,7 +39,7 @@ sections:
|
||||
<H2>Directory Structure</H2>
|
||||
|
||||
Each source file shall be placed a sub-directory corresponding to the software
|
||||
sub-system it belongs to ("scheduler", "cups", etc.) To remain compatible
|
||||
sub-system it belongs to ("scheduler", "libcups", etc.) To remain compatible
|
||||
with older UNIX filesystems, directory names shall not exceed 16 characters
|
||||
in length.
|
||||
|
||||
|
||||
@@ -56,10 +56,6 @@ The following documentation for CUPS is available on this server:
|
||||
<A HREF="sdd.html">HTML</A> |
|
||||
<A HREF="sdd.pdf">PDF</A> )
|
||||
|
||||
<LI>Software Performance Specification (
|
||||
<A HREF="sps.html">HTML</A> |
|
||||
<A HREF="sps.pdf">PDF</A> )
|
||||
|
||||
<LI>Software Version Description (
|
||||
<A HREF="svd.html">HTML</A> |
|
||||
<A HREF="svd.pdf">PDF</A> )
|
||||
|
||||
Arquivo binário não exibido.
@@ -41,7 +41,7 @@
|
||||
<DD>Hewlett-Packard Graphics Language
|
||||
|
||||
<DT>HP-PCL
|
||||
<DD>Hewlett-Packard Page Control Language
|
||||
<DD>Hewlett-Packard Printer Control Language
|
||||
|
||||
<DT>HP-PJL
|
||||
<DD>Hewlett-Packard Printer Job Language
|
||||
@@ -61,6 +61,9 @@
|
||||
<DT>MIME
|
||||
<DD>Multimedia Internet Mail Exchange
|
||||
|
||||
<DT>PCL
|
||||
<DD>Page Control Language
|
||||
|
||||
<DT>PPD
|
||||
<DD>PostScript Printer Description
|
||||
|
||||
|
||||
+928
-1115
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+697
-773
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+21
-33
@@ -129,6 +129,16 @@ file consists of two or more lines of ASCII text.
|
||||
The currently recognized values are:
|
||||
|
||||
<UL>
|
||||
<LI>cp874
|
||||
<LI>cp1250
|
||||
<LI>cp1251
|
||||
<LI>cp1252
|
||||
<LI>cp1253
|
||||
<LI>cp1254
|
||||
<LI>cp1255
|
||||
<LI>cp1256
|
||||
<LI>cp1257
|
||||
<LI>cp1258
|
||||
<LI>iso-8859-1
|
||||
<LI>iso-8859-2
|
||||
<LI>iso-8859-3
|
||||
@@ -144,16 +154,6 @@ The currently recognized values are:
|
||||
<LI>iso-8859-15
|
||||
<LI>us-ascii
|
||||
<LI>utf-8
|
||||
<LI>windows-874
|
||||
<LI>windows-1250
|
||||
<LI>windows-1251
|
||||
<LI>windows-1252
|
||||
<LI>windows-1253
|
||||
<LI>windows-1254
|
||||
<LI>windows-1255
|
||||
<LI>windows-1256
|
||||
<LI>windows-1257
|
||||
<LI>windows-1258
|
||||
</UL>
|
||||
|
||||
<P>The second and succeeding lines define text messages. If the message text
|
||||
@@ -208,11 +208,7 @@ of 1 or more lines of ASCII text. Comment lines start with the pound
|
||||
representing the source and destination types. Following the MIME types are
|
||||
a cost value (0 to 100) and the filter program to use. If the filter program
|
||||
is not specified using the full path then it must reside in the CUPS filter
|
||||
directory:
|
||||
|
||||
<UL><PRE>
|
||||
super/type SP super/type2 SP cost SP program
|
||||
</PRE></UL>
|
||||
directory.
|
||||
|
||||
<H2>Option Files</H2>
|
||||
|
||||
@@ -386,6 +382,10 @@ followed by its value. The following directives are understood:
|
||||
<TD>Location</TD>
|
||||
<TD>A textual location of the class.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>MoreInfo</TD>
|
||||
<TD>A URL pointing to additional information on the class.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>Printer</TD>
|
||||
<TD>Specifies a printer that is a member of the class.</TD>
|
||||
@@ -488,12 +488,6 @@ followed by its value. The following directives are understood:
|
||||
<TD>Specifies a source and destination address for relaying browser
|
||||
information from one subnet to another.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>BrowseShortNames</TD>
|
||||
<TD>yes</TD>
|
||||
<TD>Specifies whether or not to provide short names (without the
|
||||
"@server" part) for remote printers.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>BrowseTimeout</TD>
|
||||
<TD>300</TD>
|
||||
@@ -506,11 +500,6 @@ followed by its value. The following directives are understood:
|
||||
<TD>Specifies whether or not printer and class browsing is enabled; can
|
||||
be "On" or "Off".</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>DataDir</TD>
|
||||
<TD>/usr/share/cups</TD>
|
||||
<TD>Specifies the directory where CUPS data files are stored.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>DefaultCharset</TD>
|
||||
<TD>iso-8859-1</TD>
|
||||
@@ -738,6 +727,10 @@ followed by its value. The following directives are understood:
|
||||
<TD>Location</TD>
|
||||
<TD>A textual location of the printer.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD>MoreInfo</TD>
|
||||
<TD>A URL pointing to additional information on the printer.</TD>
|
||||
</TR>
|
||||
<TR>
|
||||
<TD><Printer name><BR>
|
||||
</Printer></TD>
|
||||
@@ -1063,7 +1056,7 @@ Adobe PostScript Language Reference Manual, Third Edition</A>.
|
||||
|
||||
<P>CUPS raster files are device-dependent raster image files that contain a
|
||||
PostScript page device dictionary and device-dependent raster imagery for
|
||||
each page in the document. These files are used to transfer raster data
|
||||
each page in the document. These files are used to transfer raster data
|
||||
from the PostScript and image file RIPs to device-dependent filters that
|
||||
convert the raster data to a printable format.
|
||||
|
||||
@@ -1348,9 +1341,7 @@ Protocol</A>.
|
||||
System (CIFS) protocols are described at
|
||||
<A HREF="http://anu.samba.org/cifs">http://anu.samba.org/cifs</A>.
|
||||
|
||||
<P>The URI method name for SMB is "smb". Support for this protocol is
|
||||
provided via the SAMBA <CODE>smbspool(1)</CODE> program provided with
|
||||
SAMBA 2.0.6 and higher.
|
||||
<P>The URI method name for SMB is "smb".
|
||||
|
||||
<H1>Directories</H1>
|
||||
|
||||
@@ -1373,9 +1364,6 @@ SAMBA 2.0.6 and higher.
|
||||
<CODE>lpr</CODE>, <CODE>lprm</CODE>, and <CODE>lpstat</CODE> commands
|
||||
reside here.
|
||||
|
||||
<DT>/usr/lib, /usr/lib32
|
||||
<DD>The shared libraries (DSOs) reside here.
|
||||
|
||||
<DT>/usr/lib/cups/backend
|
||||
<DD>The backend filters reside here.
|
||||
|
||||
|
||||
Arquivo binário não exibido.
|
Antes Largura: | Altura: | Tamanho: 11 KiB Depois Largura: | Altura: | Tamanho: 3.4 KiB |
+1181
-1418
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+1182
-1274
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+24
-93
@@ -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) | delete)
|
||||
<P>"requesting-user-name-allowed" (1setof name(127))
|
||||
<P><I>OR</I>
|
||||
<P>"requesting-user-name-denied" (1setof name(127) | delete):
|
||||
<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. To allow
|
||||
all users access to a printer, use the delete tag for the
|
||||
attribute value.
|
||||
specify an access control list for incoming print jobs. The
|
||||
special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed or denied.
|
||||
|
||||
</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 class object should accept new jobs.
|
||||
indicating whether or not the printer 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 class.
|
||||
textual location of the printer.
|
||||
|
||||
<P>"printer-more-info" (uri):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating a
|
||||
URI for additional class information.
|
||||
URI for additional printer information.
|
||||
|
||||
<P>"printer-state" (type2 enum):
|
||||
|
||||
<P>The client OPTIONALLY supplies this attribute indicating the
|
||||
initial/current state of the class. Only the "idle" and "stopped"
|
||||
initial/current state of the printer. 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 class state.
|
||||
textual reason for the current printer 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. To allow
|
||||
all users access to a class, use the delete tag for the
|
||||
attribute value.
|
||||
specify an access control list for incoming print jobs. The
|
||||
special name "ALLUSERS" is reserved to indicate that all users
|
||||
are allowed or denied.
|
||||
|
||||
</UL>
|
||||
|
||||
@@ -1508,12 +1508,9 @@ 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), "hard" or "rts/cts" (RTS/CTS handshaking),
|
||||
or "dtrdsr" (DTR/DSR handshaking).
|
||||
handshaking), or "hard" (CTS/RTS handshaking).
|
||||
|
||||
<P>The URI returned by CUPS-Get-Devices will contain the
|
||||
maximum baud rate supported by the device and the best
|
||||
@@ -1592,17 +1589,6 @@ files. The default value is 0.
|
||||
<P>The job-billing attribute provides a text value to associate with a job
|
||||
for billing purposes.
|
||||
|
||||
<H3>job-hold-until (keyword | name(MAX))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
|
||||
<P>The job-hold-until attribute specifies a hold time. In addition to the
|
||||
standard IPP/1.1 keyword names, CUPS supports name values of the form
|
||||
"HH:MM" and "HH:MM:SS" that specify a hold time. The hold time is in
|
||||
Greenwich Mean Time (GMT) and <I>not</I> in the local time zone. If the
|
||||
specified time is less than the current time, the job is held until the
|
||||
next day.
|
||||
|
||||
<H3>job-sheets (1setof type3 keyword | name(MAX))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
@@ -1615,18 +1601,6 @@ 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
|
||||
@@ -1664,38 +1638,6 @@ equals 1 inch). The default value is the device physical margin.
|
||||
<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).
|
||||
|
||||
<H3>position (type2 keyword)</H3>
|
||||
|
||||
<P>The position attribute specifies the location of image files on the
|
||||
media. The following keyword values are recognized:
|
||||
|
||||
<UL>
|
||||
|
||||
<LI><CODE>center</CODE> - Center the image on the page (default)
|
||||
|
||||
<LI><CODE>top</CODE> - Print the image centered at the top of the page
|
||||
|
||||
<LI><CODE>left</CODE> - Print the image centered on the left of page
|
||||
|
||||
<LI><CODE>right</CODE> - Print the image centered on the right of the page
|
||||
|
||||
<LI><CODE>top-left</CODE> - Print the image at the top left corner of
|
||||
the page
|
||||
|
||||
<LI><CODE>top-right</CODE> - Print the image at the top right corner of
|
||||
the page
|
||||
|
||||
<LI><CODE>bottom</CODE> - Print the image centered at the bottom of
|
||||
the page
|
||||
|
||||
<LI><CODE>bottom-left</CODE> - Print the image at the bottom left
|
||||
corner of the page
|
||||
|
||||
<LI><CODE>bottom-right</CODE> - Print the image at the bottom right
|
||||
corner of the page
|
||||
|
||||
</UL>
|
||||
|
||||
<H3>ppi (integer(1:MAX))</H3>
|
||||
|
||||
<P>The ppi attribute specifies the resolution of an image file in pixels
|
||||
@@ -1760,30 +1702,13 @@ delineate directories.
|
||||
|
||||
<H2>Printer Attributes</H2>
|
||||
|
||||
<H3>job-k-limit (integer)</H3>
|
||||
<H3>job-sheets-default (1setof type3 keyword | name(MAX))</H3>
|
||||
|
||||
<P><I>(CUPS 1.1 and higher)</I>
|
||||
|
||||
<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.
|
||||
<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.
|
||||
|
||||
<H3>job-sheets-supported (1setof type3 keyword | name(MAX))</H3>
|
||||
|
||||
@@ -1889,6 +1814,9 @@ 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>
|
||||
@@ -1897,6 +1825,9 @@ requesting-user-name-denied attribute will be defined, but not both.
|
||||
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>
|
||||
|
||||
+155
-363
@@ -8,13 +8,12 @@
|
||||
<TABLE WIDTH="100%">
|
||||
<TR VALIGN=TOP>
|
||||
<TD><IMG SRC="images/cups-large.gif" WIDTH="103" HEIGHT="120"></TD>
|
||||
<TD><H1 ALIGN="RIGHT">An Overview of the<BR>
|
||||
Common UNIX Printing System,<BR>
|
||||
Version 1.1</H1>
|
||||
<TD><H1 ALIGN=right>An Overview of the<BR>
|
||||
Common UNIX Printing System</H1></DIV>
|
||||
|
||||
<P ALIGN="RIGHT">July 10, 2000<BR>
|
||||
<P ALIGN=right>October 4, 1999<BR>
|
||||
Michael Sweet, Easy Software Products<BR>
|
||||
Copyright 1998-2000, All Rights Reserved.</P>
|
||||
Copyright 1998-1999, All Rights Reserved.</P>
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE>
|
||||
@@ -22,84 +21,124 @@
|
||||
<P>This whitepaper describes the Common UNIX Printing
|
||||
System<SUP>TM</SUP> ("CUPS<SUP>TM</SUP>"), a portable and extensible
|
||||
printing system for UNIX<SUP>®</SUP>. CUPS is being developed by
|
||||
<A HREF="http://www.easysw.com">Easy Software Products</A>, a software
|
||||
firm located in Hollywood, Maryland that has been selling commercial
|
||||
software for UNIX since 1993 through more than 40 distributors serving
|
||||
over 80 countries worldwide.
|
||||
Easy Software Products, a software firm located in Hollywood, Maryland
|
||||
that has been selling commercial software for Silicon
|
||||
Graphics<SUP>®</SUP>, Sun<SUP>®</SUP>, and HP workstations
|
||||
since 1993 through more than 40 distributors serving over 80 countries
|
||||
worldwide.
|
||||
|
||||
<P>Additional information on CUPS is available on the World Wide Web at
|
||||
"<A HREF="http://www.cups.org">http://www.cups.org</A>".
|
||||
|
||||
<H2>Background</H2>
|
||||
|
||||
<P>Printing within UNIX has historically been done using one of two
|
||||
Printing within UNIX has historically been done using one of two
|
||||
printing systems - the Berkeley Line Printer Daemon ("LPD") [RFC1179]
|
||||
and the AT&T Line Printer system. These printing systems were
|
||||
designed in the 70's for printing text to line printers; vendors have
|
||||
since added varying levels of support for other types of printers.
|
||||
|
||||
<P>Replacements for these printing systems have emerged [LPRng,
|
||||
Palladin, PLP], however none of the replacements change the fundamental
|
||||
capabilities of these systems.
|
||||
and the AT&T Line Printer system. Replacements for these printing
|
||||
systems have emerged [LPRng, Palladin, PLP], however none of the
|
||||
replacements change the fundamental capabilities of these systems.
|
||||
|
||||
<P>Over the last few years several attempts at developing a standard
|
||||
printing interface have been made, including the draft POSIX Printing
|
||||
standard developed by the Institute of Electrical and Electronics
|
||||
Engineers, Inc. ("IEEE") [IEEE-1387.4] and Internet Printing Protocol
|
||||
("IPP") developed by the Internet Engineering Task Force ("IETF")
|
||||
through the Printer Working Group ("PWG") [IETF-IPP]. The POSIX
|
||||
printing standard defines a common set of command-line tools as well as
|
||||
a C interface for printer administration and print jobs, but has been
|
||||
shelved by the IEEE.
|
||||
standard [IEEE-1387.4, last updated in 1994] and Internet Printing
|
||||
Protocol [IETF-IPP]. The POSIX printing standard defines a common set
|
||||
of command-line tools as well as a C interface for printer
|
||||
administration and print jobs. The Internet Printing Protocol defines
|
||||
extensions to the HyperText Transport Protocol 1.1 [RFC2068] to provide
|
||||
support for remote printing services.
|
||||
|
||||
<P>The Internet Printing Protocol defines extensions to the HyperText
|
||||
Transport Protocol 1.1 [RFC2616] to provide support for remote printing
|
||||
services. IPP/1.0 was accepted by the IETF as an experimental Request
|
||||
For Comments [RFC] document in October of 1999. Since then the Printer
|
||||
Working Group has developed an updated set of specifications for
|
||||
IPP/1.1 which have been accepted by the IETF and are awaiting
|
||||
publication as proposed standards. Unlike POSIX Printing, IPP enjoys
|
||||
widespread industry support and is poised to become the standard
|
||||
network printing solution for all operating systems.
|
||||
<H2>Weaknesses in Existing Printing Systems</H2>
|
||||
|
||||
<P>CUPS uses IPP/1.1 to provide a complete, modern printing system for
|
||||
UNIX that can be extended to support new printers, devices, and
|
||||
protocols while providing compatibility with existing UNIX
|
||||
applications. CUPS is free software provided under the terms of the
|
||||
GNU General Public License and GNU Library General Public License.
|
||||
Easy Software Products has identified several major weaknesses in
|
||||
the printing systems currently in use:
|
||||
|
||||
<H2>History</H2>
|
||||
<OL>
|
||||
|
||||
<P>The first production release of CUPS (based on IPP/1.0) was released
|
||||
in October of 1999. Since then, we have released several patch updates
|
||||
to the original CUPS 1.0 release that addressed security, portability,
|
||||
and bugs found, but no new functionality was added to improve the
|
||||
stability of the CUPS code.
|
||||
<LI>Users must print text or Adobe<SUP>®</SUP>
|
||||
PostScript<SUP>TM</SUP> files; other formats <I>may</I> be
|
||||
supported, but not universally.
|
||||
|
||||
<P>CUPS 1.1 is based on IPP/1.1 and adds many of the functional
|
||||
enhancements that have been requested by our users. As with 1.0, CUPS
|
||||
1.1 will be followed by patch releases that address any problems found
|
||||
with the software but add no new features.
|
||||
<LI>Lack of a standard command-line interface; each operating
|
||||
system and driver package provides different command-line
|
||||
options, e.g. setting the media size with one driver may
|
||||
involve passing a single option ("letter") while another
|
||||
requires two ("mediasize letter").
|
||||
|
||||
<LI>Lack of a standard application interface; most UNIX
|
||||
applications either do not provide an interface for sending
|
||||
printer options, or restrict the options to those in printer
|
||||
description files supplied with the application.
|
||||
|
||||
<LI>Remote printing problems; no vendor seems to use the same
|
||||
remote printing protocol (many use an "enhanced" version of the
|
||||
LPD protocol with vendor-specific extensions).
|
||||
|
||||
<LI>Client printer administration hassles; most vendors
|
||||
require that you install remote printers on each client by
|
||||
hand, and many do not even provide the ability to browse
|
||||
printers on the "server" system.
|
||||
|
||||
<LI>Drivers typically are hardcoded to handle printing to
|
||||
parallel or serial printers; support for other types of
|
||||
interfaces or networking protocols requires that a driver be
|
||||
rewritten to support them.
|
||||
|
||||
<LI>Security, accounting, and quotas; most printing systems do
|
||||
not support access control lists ("ACLs"), and printer
|
||||
accounting and quotas are not well supported, if at all.
|
||||
|
||||
</OL>
|
||||
|
||||
<H2>Goals of CUPS</H2>
|
||||
|
||||
The basic goals of CUPS are:
|
||||
|
||||
<OL>
|
||||
|
||||
<LI>Provide standard support for text (US ASCII, UTF-8, and
|
||||
ISO-8859-x), Adobe PostScript, PDF, HP-GL/2, TIFF, JPEG, PNG,
|
||||
PBM, PGM, PPM, GIF, SGI RGB, Sun Raster, and Kodak
|
||||
PhotoCD<SUP>TM</SUP> files.
|
||||
|
||||
<LI>Provide a standard command-line interface with a standard
|
||||
minimum set of options (media size and so forth).
|
||||
|
||||
<LI>Provide a standard application interface.
|
||||
|
||||
<LI>Provide a common remote printing interface (IPP).
|
||||
|
||||
<LI>Provide a printer browsing interface and allow users to
|
||||
print to remote printers using a "printer@server" notation
|
||||
rather than adding the printer locally.
|
||||
|
||||
<LI>Provide a scheduler extension interface to support
|
||||
different interfaces separate from the printer driver (e.g.
|
||||
serial, parallel, lpd, tftp, ipp, etc.)
|
||||
|
||||
<LI>Provide a standard interface for ACLs, quotas, accounting,
|
||||
and logging.
|
||||
|
||||
</OL>
|
||||
|
||||
<H2>Design Overview</H2>
|
||||
|
||||
<P>Like most printing systems, CUPS is designed around a central print
|
||||
Like most printing systems, CUPS is designed around a central print
|
||||
scheduling process that dispatches print jobs, processes administrative
|
||||
commands, provides printer status information to local and remote
|
||||
programs, and informs users as needed. Figure 1 shows the basic
|
||||
organization of CUPS.
|
||||
|
||||
<CENTER><IMG SRC="images/cups-block-diagram.gif" WIDTH="470" HEIGHT="170"></CENTER>
|
||||
<P ALIGN="CENTER">Figure 1 - CUPS Block Diagram</P>
|
||||
<P ALIGN=CENTER><IMG SRC="images/cups-block-diagram.gif" WIDTH="540" HEIGHT="200">
|
||||
<BR>Figure 1 - CUPS Block Diagram
|
||||
|
||||
<H3>Scheduler</H3>
|
||||
|
||||
<P>The scheduler is a HTTP/1.1 server application that handles HTTP
|
||||
The scheduler is a HTTP/1.1 server application that handles HTTP
|
||||
requests. Besides handling printer requests via IPP POST requests, the
|
||||
scheduler also acts as a full-featured web server for documentation,
|
||||
status monitoring, and administration.
|
||||
scheduler also acts as a full-featured web server for documentation and
|
||||
status monitoring.
|
||||
|
||||
<P>The scheduler also manages a list of available printers on the LAN
|
||||
<P>The scheduler also monitors the LAN for printer browsing information
|
||||
and dispatches print jobs as needed using the appropriate filters and
|
||||
backends.
|
||||
|
||||
@@ -109,17 +148,17 @@ The configuration files consist of:
|
||||
|
||||
<UL>
|
||||
|
||||
<LI>The HTTP server configuration file.
|
||||
<LI>A HTTP server configuration file.
|
||||
|
||||
<LI>Printer and class definition files.
|
||||
|
||||
<LI>MIME type and conversion rule files.
|
||||
|
||||
<LI>PostScript Printer Description ("PPD") files.
|
||||
<LI>PostScript Printer Description (PPD) files.
|
||||
|
||||
</UL>
|
||||
|
||||
<P>The HTTP server configuration file is purposely similar to the
|
||||
The HTTP server configuration file is purposely similar to the
|
||||
Apache server configuration file and defines all of the access control
|
||||
properties for the server.
|
||||
|
||||
@@ -132,323 +171,77 @@ class, round-robin fashion.
|
||||
application/postscript, etc.) and "magic" rules for automatically
|
||||
detecting the format of a file. These are used by the HTTP server to
|
||||
determine the <I>Content-Type</I> field for <I>GET</I> and <I>HEAD</I>
|
||||
requests and by the IPP request handler to determine the file type
|
||||
when a <I>Print-Job</I> or <I>Send-File</I> request is received with a
|
||||
requests, and by the IPP request handler to determine the file type
|
||||
when a <I>Print-Job</I> request is received with a
|
||||
<I>document-format</I> of <I>application/octet-stream</I>.
|
||||
|
||||
<P>The MIME conversion rule files list the available filters. The
|
||||
filters are used when a job is dispatched so that an application can
|
||||
send a convenient file format to the printing system which then
|
||||
converts the document into a printable format as needed. Each filter
|
||||
has a relative cost associated with it, and the filtering algorithm
|
||||
chooses the set of filters that will convert the file to the needed
|
||||
format with the lowest total "cost".
|
||||
<P>The MIME conversion rule files list the available filters. These
|
||||
files are augmented by <I>cupsFilter</I> entries in the printer PPD
|
||||
files. The filters are used when a job is dispatched so that an
|
||||
application can send a convenient file format to the printing system
|
||||
which then converts the document into a printable format as needed.
|
||||
Each filter has a relative cost associated with it, and the filtering
|
||||
algorithm chooses the set of filters that will convert the file to the
|
||||
needed format with the lowest total "cost".
|
||||
|
||||
<P>The PPD files describe the capabilities of all printers, not just
|
||||
PostScript printers. There is one PPD file for each printer. PPD files
|
||||
for non-PostScript printers define additional filters through
|
||||
<I>cupsFilter</I> attributes to support printer drivers.
|
||||
<P>The PPD files describe the capabilities of PostScript printers.
|
||||
There is one PPD file for each printer.
|
||||
|
||||
<H3>CUPS API</H3>
|
||||
<H3>CUPS Interface Library</H3>
|
||||
|
||||
<P>The CUPS API contains CUPS-specific convenience functions for queuing
|
||||
print jobs, getting printer information, accessing resources via HTTP
|
||||
and IPP, and manipulating PPD files. Unlike the rest of CUPS, the CUPS
|
||||
API is provided under the terms of the GNU LGPL so it may be used by
|
||||
non-GPL applications.
|
||||
|
||||
<H3>Berkeley and System V Commands</H3>
|
||||
|
||||
<P>CUPS provides the System V and Berkeley command-line interfaces for
|
||||
submitting jobs and checking the printer status. The
|
||||
<CODE>lpstat</CODE> and <CODE>lpc status</CODE> commands also show
|
||||
network printers ("printer@server") when printer browsing is enabled.
|
||||
|
||||
<P>The System V administation commands are supplied for managing
|
||||
printers and classes. The Berkeley printer administration tool
|
||||
(<CODE>lpc</CODE>) is only supported in a "read-only" mode to check the
|
||||
current status of the printer queues and scheduler.
|
||||
The CUPS interface library contains CUPS-specific convenience functions
|
||||
for queuing print jobs, etc. It also contains functions to access
|
||||
resources via HTTP and IPP, perform MIME typing and conversion, and
|
||||
manipulate PPD files.
|
||||
|
||||
<H3>Filters</H3>
|
||||
|
||||
<P>A filter program reads from the standard input or from a file if a
|
||||
A filter program reads from the standard input or from a file if a
|
||||
filename is supplied. All filters must support a common set of options
|
||||
including printer name, job ID, username, job title, number of copies,
|
||||
and job options. All output is sent to the standard output.
|
||||
|
||||
<P>Filters are provided for many file formats and include image file
|
||||
and PostScript raster filters that support non-PostScript printers. Multiple
|
||||
filters are run in parallel to produce the required output format.
|
||||
|
||||
<P>The PostScript raster filter is based on the GNU Ghostscript 5.50
|
||||
core. Instead of using the Ghostscript printer drivers and front-end,
|
||||
the CUPS filter uses a generic raster printer driver and CUPS-compliant
|
||||
front-end to support any kind of raster printer. This allows the same
|
||||
printer driver filter to be used for printing raster data from any
|
||||
filter.
|
||||
|
||||
<H3>CUPS Imaging</H3>
|
||||
|
||||
<P>The CUPS Imaging library provides functions for managing large
|
||||
images, doing colorspace conversion and color management, scaling
|
||||
images for printing, and managing raster page streams. It is used by
|
||||
the CUPS image file filters, the PostScript RIP, and all raster
|
||||
printers drivers.
|
||||
|
||||
<H3>Backends</H3>
|
||||
|
||||
<P>A backend program is a special filter that sends print data to a
|
||||
device or network connection. Backends for parallel, serial, USB, LPD, IPP,
|
||||
and AppSocket (JetDirect) connections are provided in CUPS 1.1.
|
||||
|
||||
<P>SAMBA version 2.0.6 and higher includes a SMB backend
|
||||
(<CODE>smbspool(1)</CODE>) that can be used with CUPS 1.0 or 1.1 for
|
||||
printing to Windows.
|
||||
|
||||
<H2>Network Printing</H2>
|
||||
|
||||
<P>Traditionally, network printing has been one of the hardest things to
|
||||
get working under UNIX. One reason is because each vendor added their
|
||||
own extensions to the LPD protocol (the previous standard for network
|
||||
printing), making cross-platform printing difficult if not impossible.
|
||||
|
||||
<P>Another reason is that you have to administer every network printer
|
||||
on every client machine. In some cases you can "clone" the printer
|
||||
configuration from a "master" client to each of the others, but even
|
||||
that can be time-consuming and error-prone. Something better is needed.
|
||||
|
||||
<P>CUPS provides "printer browsing", which allows clients to
|
||||
automatically see and use printers from any server on a LAN. This means
|
||||
that you only need to configure the server and the clients will
|
||||
automatically see the printers and classes on it.
|
||||
|
||||
<P>In addition, CUPS can automatically merge multiple identical network
|
||||
printers into "implicit classes". This allows clients to send jobs to
|
||||
the implicit class and have them print on the first available printer
|
||||
or server. In addition, failsafe and load-balancing functions are
|
||||
enabled simply by defining the same printer on multiple servers!
|
||||
|
||||
<H2>New Features in CUPS 1.1</H2>
|
||||
|
||||
<P>CUPS 1.1 includes many new features and capabilities:
|
||||
|
||||
<OL>
|
||||
|
||||
<LI><A HREF="#BACKENDS">Backends</A>
|
||||
|
||||
<LI><A HREF="#BANNERS">Banner Page Support</A>
|
||||
|
||||
<LI><A HREF="#DIGEST">Digest Authentication</A>
|
||||
|
||||
<LI><A HREF="#DIRSVC">Directory Services</A>
|
||||
|
||||
<LI><A HREF="#FHS2">Directory Structure Changes</A>
|
||||
|
||||
<LI><A HREF="#DOCOS">Documentation</A>
|
||||
|
||||
<LI><A HREF="#DRIVERS">Drivers</A>
|
||||
|
||||
<LI><A HREF="#FILTERS">Filters</A>
|
||||
|
||||
<LI><A HREF="#IPP">IPP Support</A>
|
||||
|
||||
<LI><A HREF="#PERSISTENCE">Job Persistence</A>
|
||||
|
||||
<LI><A HREF="#LPD">LPD Client Support</A>
|
||||
|
||||
<LI><A HREF="#USEROPTS">User-Defined Printers and Options</A>
|
||||
|
||||
<LI><A HREF="#WEB">Web Administration Interface</A>
|
||||
|
||||
</OL>
|
||||
|
||||
<H3><A NAME="BACKENDS">1. Backends</A></H3>
|
||||
|
||||
<P>CUPS 1.1 implements a new backend interface for retrieving a list of
|
||||
available devices for CUPS clients. This allows administration
|
||||
interfaces to query the CUPS scheduler for a list of available devices,
|
||||
automatically configure printers if the device identification
|
||||
information is available, and present the user with a list of available
|
||||
devices rather than relying on the user to know what devices are
|
||||
configured on the system.
|
||||
|
||||
<P>The new release also includes a backend for USB printers under
|
||||
*BSD and Linux. Support for USB under Solaris 8 will be provided in
|
||||
a subsequent patch release.
|
||||
|
||||
<H3><A NAME="BANNERS">2. Banner Page Support</A></H3>
|
||||
|
||||
<P>CUPS 1.1 includes support for banner pages at the beginning and end
|
||||
of a job. Banner pages may be of any file format and support variable
|
||||
substitution for job titles, usernames, etc. Default banner pages are
|
||||
associated with each printer and can be overridden with command-line
|
||||
options by the user.
|
||||
|
||||
<H3><A NAME="DIGEST">3. Digest Authentication</A></H3>
|
||||
|
||||
<P>Digest authentication provides a more secure method of authenticating
|
||||
access to the printing system. Unlike Basic authentication, Digest
|
||||
authentication does not send passwords "in the clear" so it is more
|
||||
difficult to gain unauthorized access to your system.
|
||||
|
||||
<P>CUPS 1.1 implements Digest authentication using a special MD5
|
||||
password file instead of the UNIX password file. This file is managed
|
||||
using the new <CODE>lppasswd</CODE> command.
|
||||
|
||||
<H3><A NAME="DIRSVC">4. Directory Services</A></H3>
|
||||
|
||||
<P>CUPS 1.1 adds new directory service ("printer browsing") features to
|
||||
make using CUPS on large LANs and WANs easier. You can now poll a
|
||||
remote server for printer information and relay it to the LAN as well
|
||||
as restrict what printer information is processed (e.g. to "hide"
|
||||
servers, domains, or networks that you don't want to see.)
|
||||
|
||||
<H3><A NAME="FHS2">5. Directory Structure Changes</A></H3>
|
||||
|
||||
<P>CUPS 1.1 now uses a directory structure that complies with the
|
||||
Filesystem Hierarchy Standard ("FHS"), version 2.0. This should make
|
||||
integration into existing Linux and *BSD distributions a lot easier.
|
||||
|
||||
<H3><A NAME="DOCOS">6. Documentation</A></H3>
|
||||
|
||||
<P>The CUPS 1.1 documentation has gone through many revisions,
|
||||
including a completely rewritten administrators manual, a new
|
||||
programmers manual, and an IPP implementation reference manual.
|
||||
|
||||
<H3><A NAME="DRIVERS">7. Drivers</A></H3>
|
||||
|
||||
<P>CUPS 1.1 includes drivers for EPSON dot-matrix and inkjet printers.
|
||||
As with the HP PCL drivers, the EPSON drivers don't necessarily provide
|
||||
the best possible output for each printer but should provide adequate
|
||||
printing quality for general day-to-day printing.
|
||||
|
||||
<H3><A NAME="FILTERS">8. Filters</A></H3>
|
||||
|
||||
<P>CUPS 1.1 includes new image, PostScript, PDF, and text filters. The image
|
||||
filters have been upgraded to support Windows BMP and Alias PIX files.
|
||||
|
||||
<P>The PostScript filter is now based off GNU Ghostscript 5.50. The new
|
||||
filter provides much better performance with higher-resolution printers
|
||||
and supports most Level 3 PostScript language features.
|
||||
|
||||
<P>The new PDF filter is based off the excellent Xpdf software from
|
||||
Derek Noonburg and supports automatic page scaling. The new filter is a
|
||||
faster, smaller, more reliable replacement for the GNU Ghostscript PDF
|
||||
filtering that was used in CUPS 1.0.
|
||||
|
||||
<P>The new text filter now supports bidirectional text and can embed
|
||||
fonts as needed.
|
||||
|
||||
<H3><A NAME="IPP">9. IPP Support</A></H3>
|
||||
|
||||
<P>Probably the least visible portion of CUPS is the IPP support. CUPS
|
||||
1.1 implements all of the required IPP/1.1 operations and attributes
|
||||
and most of the optional ones. The optional Create-Job and Send-File
|
||||
operations are now implemented, allowing for better System V printing
|
||||
system compatibility (one job ID per <CODE>lp</CODE> command) and
|
||||
support for banner pages.
|
||||
|
||||
<H3><A NAME="PERSISTENCE">10. Job Persistence</A></H3>
|
||||
|
||||
<P>CUPS 1.1 supports job persistence. This means that jobs are preserved
|
||||
even after a reboot, a feature that was sorely missing from CUPS 1.0.
|
||||
|
||||
<P>In addition, CUPS 1.1 allows you to keep job information after the
|
||||
job has printed. The basic post-job persistence mode provides a job
|
||||
history (number of pages printed, time job was printed, etc.) but does
|
||||
not preserve the actual job files. This can be changed to discard all
|
||||
information after a job is printed or keep the job files after printing
|
||||
so you can reprint a job at some later time.
|
||||
|
||||
<H3><A NAME="LPD">11. LPD Client Support</A></H3>
|
||||
|
||||
<P>By popular request, CUPS 1.1 supports LPD-based clients using a new
|
||||
mini-daemon that handles LPD requests and passes them on to the main
|
||||
server.
|
||||
|
||||
<H3><A NAME="USEROPTS">12. User-Defined Printers and Options</A></H3>
|
||||
|
||||
<P>CUPS 1.1 includes support for user-defined printers and options via
|
||||
a new <CODE>lpoptions</CODE> command. User-defined printers are special
|
||||
instances of the available printers (e.g. "printer/instance" or
|
||||
"printer@server/instance") that can have their own default options such
|
||||
as media size, resolution, and so forth. The <CODE>lpoptions</CODE>
|
||||
command can also be used to set a different default printer queue.
|
||||
|
||||
<H3><A NAME="WEB">13. Web Administration Interface</A></H3>
|
||||
|
||||
<P>CUPS 1.0 provided a simple class, job, and printer monitoring
|
||||
interface for web browsers. CUPS 1.1 replaces this interface with an
|
||||
enhanced administration interface that allows you to add, modify,
|
||||
delete, configure, and control classes, jobs, and printers.
|
||||
|
||||
<H2>Software Using CUPS</H2>
|
||||
|
||||
<P>A lot has happened since CUPS 1.0 came out, and many software packages
|
||||
are supporting CUPS. We have contributed code to the SAMBA team to support
|
||||
CUPS, and parts of that are already available in SAMBA 2.0.6 and 2.0.7.
|
||||
With any luck the final pieces that provide a complete integration with
|
||||
SAMBA will be available in the next release of SAMBA.
|
||||
|
||||
<P>Two graphical interfaces have appeared on the scene that use CUPS as
|
||||
well. The KUPS project provides a KDE-based interface for CUPS and can be
|
||||
found at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://kups.sourceforge.net">http://kups.sourceforge.net</A>
|
||||
</PRE></UL>
|
||||
|
||||
<P>The X Printing Panel ("XPP") project provides a graphical printing
|
||||
panel for CUPS and can be found at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://www.phy.uni-bayreuth.de/till/xpp">http://www.phy.uni-bayreuth.de/till/xpp/</A>
|
||||
</PRE></UL>
|
||||
|
||||
<P>Numerous other filters, drivers, tutorials, etc. have been made available
|
||||
on the CUPS bazaar, available at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://www.cups.org/bazaar.cgi">http://www.cups.org/bazaar.cgi</A>
|
||||
</PRE></UL>
|
||||
|
||||
<P>Finally, our own ESP Print Pro software uses CUPS to provide drivers
|
||||
for over 2300 printers and can be found at:
|
||||
|
||||
<UL><PRE>
|
||||
<A HREF="http://www.easysw.com/printpro">http://www.easysw.com/printpro</A>
|
||||
</PRE></UL>
|
||||
|
||||
<H2>Operating Systems Using CUPS</H2>
|
||||
|
||||
<P>One of our goals has always been to get as many UNIX/Linux
|
||||
distributions using CUPS as possible. Debian is currently providing
|
||||
CUPS as part of its stable distribution, and many other distributions
|
||||
are considering it in their next releases.
|
||||
A backend program is a special filter that writes incoming data to a
|
||||
device or network connection. Backends for serial, parallel, LPD,
|
||||
IPP, SMB, and AppSocket (JetDirect) connections are provided in
|
||||
CUPS 1.0.
|
||||
|
||||
<H2>Berkeley and System V Commands</H2>
|
||||
|
||||
CUPS provides the System V and Berkeley command-line interfaces
|
||||
for submitting jobs and checking the printer status. The "lpstat" and
|
||||
"lpc status" commands also show network printers ("printer@hostname")
|
||||
when printer browsing is enabled.
|
||||
|
||||
<P>The System V administation commands are supplied for managing
|
||||
printers local to the system. The Berkeley printer administration tool
|
||||
("lpc") is only supported in a "read-only" mode to check the current
|
||||
status of the printer queues and scheduler.
|
||||
|
||||
<H2>Summary</H2>
|
||||
|
||||
<P>The Common UNIX Printing System provides a modern printing interface
|
||||
The Common UNIX Printing System provides a modern printing interface
|
||||
for UNIX applications that is both flexible and user-friendly. The
|
||||
software provides System V and Berkeley compatible command-line
|
||||
interfaces to ensure compatibility with existing applications. CUPS 1.1
|
||||
adds many new features that make it an even better choice for printing
|
||||
under UNIX.
|
||||
interfaces to ensure compatibility with existing applications.
|
||||
|
||||
<H2>Who to Contact</H2>
|
||||
<H2>Licensing</H2>
|
||||
|
||||
<P>For more information on CUPS please contact us at:
|
||||
CUPS is available under the terms of the GNU General Public License
|
||||
which means that it is basically free except for binary-only
|
||||
distribution. Vendors wishing to license CUPS for their printing
|
||||
solution should contact Easy Software Products at:
|
||||
|
||||
<UL><PRE>
|
||||
Attn: CUPS Information
|
||||
Easy Software Products
|
||||
44141 Airport View Drive Suite 204
|
||||
<UL>
|
||||
<P>Attn: CUPS Licensing<BR>
|
||||
Easy Software Products<BR>
|
||||
44141 Airport View Drive Suite 204<BR>
|
||||
Hollywood, Maryland 20636-3111 USA
|
||||
|
||||
+1.301.373.9600
|
||||
|
||||
<A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A>
|
||||
</PRE></UL>
|
||||
<P>+1.301.373.9600<BR>
|
||||
cups-info@cups.org
|
||||
</UL>
|
||||
|
||||
<H2>References</H2>
|
||||
|
||||
@@ -460,31 +253,30 @@ Hollywood, Maryland 20636-3111 USA
|
||||
|
||||
<DT><A HREF="http://www.pwg.org/ipp/index.html">IETF-IPP</A></DT>
|
||||
|
||||
<DD>Internet Printing Protocol/1.1</DD>
|
||||
<DD>Internet Printing Protocol/1.0</DD>
|
||||
|
||||
<DT><A HREF="http://www.astart.com/lprng.html">LPRng</A></DT>
|
||||
|
||||
<DD>An enhanced, extended, and portable implementation of the
|
||||
Berkeley LPR print spooler functionality</DD>
|
||||
<DD>An enhanced, extended, and portable implementation of the Berkeley LPR
|
||||
print spooler functionality</DD>
|
||||
|
||||
<DT>Palladin</DT>
|
||||
|
||||
<DD>A printing system developed at the Massachussetts Institute
|
||||
of Technology</DD>
|
||||
<DD>A printing system developed at the Massachussetts Institute of Technology</DD>
|
||||
|
||||
<DT><A HREF="http://www-usa.iona.com//hyplan/jmason/plp.html">PLP</A></DT>
|
||||
|
||||
<DD>The Portable Line Printer spooler system</DD>
|
||||
|
||||
<DT><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC1179</A></DT>
|
||||
<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc1179.txt">RFC1179</A></DT>
|
||||
|
||||
<DD>Line Printer Daemon Protocol</DD>
|
||||
|
||||
<DT><A HREF="http://www.ietf.org/rfc/rfc2046.txt">RFC2046</A></DT>
|
||||
<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc2046.txt">RFC2046</A></DT>
|
||||
|
||||
<DD>Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types</DD>
|
||||
|
||||
<DT><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</A></DT>
|
||||
<DT><A HREF="http://www.cis.ohio-state.edu/rfc/rfc2068.txt">RFC2068</A></DT>
|
||||
|
||||
<DD>Hypertext Transfer Protocol -- HTTP/1.1</DD>
|
||||
|
||||
@@ -492,9 +284,9 @@ Hollywood, Maryland 20636-3111 USA
|
||||
|
||||
<H2>Trademarks</H2>
|
||||
|
||||
<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
|
||||
trademark property of Easy Software Products. All other trademarks are
|
||||
the property of their respective owners.
|
||||
The Common UNIX Printing System, CUPS, and the CUPS logo are
|
||||
trademarks of Easy Software Products. All other trademarks are the
|
||||
property of their respective owners.
|
||||
|
||||
</BODY>
|
||||
</HTML>
|
||||
|
||||
Arquivo binário não exibido.
+13
-15
@@ -7,14 +7,14 @@
|
||||
<UL>
|
||||
<LI>CUPS-CMP-1.1: CUPS Configuration Management Plan
|
||||
<LI>CUPS-IDD-1.1: CUPS System Interface Design Description
|
||||
<LI>CUPS-IPP-1.1: CUPS Implementation of IPP
|
||||
<LI>CUPS-IPP-1.1: CUPS Implmentation of IPP
|
||||
<LI>CUPS-SAM-1.1.x: CUPS Software Administrators Manual
|
||||
<LI>CUPS-SDD-1.1: CUPS Software Design Description
|
||||
<LI>CUPS-SPM-1.1.x: CUPS Software Programming Manual
|
||||
<LI>CUPS-SPM-1.1: CUPS Software Programming Manual
|
||||
<LI>CUPS-SSR-1.1: CUPS Software Security Report
|
||||
<LI>CUPS-STP-1.1: CUPS Software Test Plan
|
||||
<LI>CUPS-SUM-1.1.x: CUPS Software Users Manual
|
||||
<LI>CUPS-SVD-1.1: CUPS Software Version Description
|
||||
<LI>CUPS-SVD-1.1.x: CUPS Software Version Description
|
||||
</UL>
|
||||
|
||||
<H2>Other Documents</H2>
|
||||
@@ -22,21 +22,19 @@
|
||||
<P>The following non-CUPS documents are referenced by this document:
|
||||
|
||||
<UL>
|
||||
<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/5003.PPD_Spec_v4.3.pdf">Adobe
|
||||
PostScript Printer Description File Format Specification,
|
||||
Version 4.3.</A>
|
||||
<LI><A HREF="http://partners.adobe.com/asn/developer/PDFS/TN/PLRM.pdf">Adobe
|
||||
PostScript Language Reference, Third Edition.</A>
|
||||
<LI>Adobe PostScript Printer Description File Format Specification,
|
||||
Version 4.3.
|
||||
<LI>Adobe PostScript Language Reference, Third Edition.
|
||||
<LI>IPP: Job and Printer Set Operations
|
||||
<LI>IPP/1.1: Encoding and Transport
|
||||
<LI>IPP/1.1: Implementers Guide
|
||||
<LI>IPP/1.1: Model and Semantics
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc1179.txt">RFC 1179, Line Printer Daemon Protocol</A>
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc2567.txt">RFC 2567, Design Goals for an Internet Printing Protocol</A>
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc2568.txt">RFC 2568, Rationale for the Structure of the Model and Protocol</A>
|
||||
for the Internet Printing Protocol</A>
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc2569.txt">RFC 2569, Mapping between LPD and IPP Protocols</A>
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1</A>
|
||||
<LI><A HREF="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617, HTTP Authentication: Basic and Digest Access</A>
|
||||
<LI>RFC 1179, Line Printer Daemon Protocol
|
||||
<LI>RFC 2567, Design Goals for an Internet Printing Protocol
|
||||
<LI>RFC 2568, Rationale for the Structure of the Model and Protocol
|
||||
for the Internet Printing Protocol
|
||||
<LI>RFC 2569, Mapping between LPD and IPP Protocols
|
||||
<LI>RFC 2616, Hypertext Transfer Protocol -- HTTP/1.1
|
||||
<LI>RFC 2617, HTTP Authentication: Basic and Digest Access
|
||||
Authentication
|
||||
</UL>
|
||||
|
||||
+404
-689
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+2601
-2855
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
+67
-320
@@ -1,7 +1,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2001, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.1.6">
|
||||
<META NAME="COPYRIGHT" CONTENT="Copyright 1997-2000, All Rights Reserved">
|
||||
<META NAME="DOCNUMBER" CONTENT="CUPS-SAM-1.1">
|
||||
<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.6.
|
||||
("CUPS<SUP>TM</SUP>"), version 1.1.
|
||||
|
||||
<EMBED SRC="system-overview.shtml">
|
||||
|
||||
@@ -148,7 +148,7 @@ from the source code.
|
||||
|
||||
<H3><A NAME="REQUIREMENTS">Requirements</A></H3>
|
||||
|
||||
<P>You'll need ANSI-compliant C and C++ compilers to build CUPS on your
|
||||
<P>You'll need an ANSI-compliant C compiler to build CUPS on your
|
||||
system. As its name implies, CUPS is designed to run on the UNIX
|
||||
operating system, however the CUPS interface library and most of the
|
||||
filters and backends supplied with CUPS should also compile and run
|
||||
@@ -199,39 +199,15 @@ software in another location:
|
||||
|
||||
<P>If the PNG, JPEG, TIFF, and ZLIB libraries are not installed in a
|
||||
system default location (typically <VAR>/usr/include</VAR> and
|
||||
<VAR>/usr/lib</VAR>) you'll need to set the <CODE>CFLAGS</CODE>,
|
||||
<CODE>CXXFLAGS</CODE>, and <CODE>LDFLAGS</CODE> environment variables
|
||||
prior to running configure:
|
||||
<VAR>/usr/lib</VAR>) you'll need to set the <CODE>CFLAGS</CODE> and
|
||||
<CODE>LDFLAGS</CODE> environment variables prior to running configure:
|
||||
|
||||
<UL><PRE>
|
||||
<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 CFLAGS "-I/some/directory"</B>
|
||||
<B>setenv LDFLAGS "-L/some/directory"</B>
|
||||
<B>./configure ... ENTER</B>
|
||||
</PRE></UL>
|
||||
|
||||
<P>or:
|
||||
|
||||
<UL><PRE>
|
||||
<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>./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>
|
||||
@@ -257,7 +233,7 @@ prior to running configure:
|
||||
<P>Installing CUPS will overwrite your existing printing
|
||||
system. If you experience difficulties with the CUPS software
|
||||
and need to go back to your old printing system, you will need
|
||||
to reinstall the old printing system from your operating system CDs.
|
||||
to reinstall the printing system from your operating system CDs.
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
@@ -290,7 +266,7 @@ only available for Linux.
|
||||
system. If you experience difficulties with the CUPS software
|
||||
and need to go back to your old printing system, you will need
|
||||
to remove the CUPS software with the provided script and/or
|
||||
reinstall the old printing system from your operating system CDs.
|
||||
reinstall the printing system from your operating system CDs.
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
@@ -309,7 +285,6 @@ Once you are the root user, run the installation script with:
|
||||
<P>After asking you a few yes/no questions the CUPS software will be
|
||||
installed and the scheduler will be started automatically.
|
||||
|
||||
<!-- NEED 2in -->
|
||||
<H3><A NAME="RPM-BINARY">Installing an RPM Distribution</A></H3>
|
||||
|
||||
<P>To install the CUPS software from an RPM distribution you will need
|
||||
@@ -359,7 +334,7 @@ example, the first parallel port in Linux usually uses a device URI of
|
||||
|
||||
<!-- NEED 2.5in -->
|
||||
<P>You can see a complete list of supported devices by running the
|
||||
<CODE>lpinfo(8)</CODE> command:
|
||||
<CODE>lpinfo(1m)</CODE> command:
|
||||
|
||||
<UL><PRE>
|
||||
<B>lpinfo -v ENTER</B>
|
||||
@@ -371,7 +346,7 @@ network lpd
|
||||
direct parallel:/dev/lp1
|
||||
serial serial:/dev/ttyS1?baud=115200
|
||||
serial serial:/dev/ttyS2?baud=115200
|
||||
direct usb:/dev/usb/lp0
|
||||
direct usb:/dev/usb/usblp0
|
||||
network smb
|
||||
</PRE></UL>
|
||||
|
||||
@@ -392,7 +367,7 @@ DeskJet, EPSON 9-pin, EPSON 24-pin, and EPSON Stylus printers.
|
||||
<H2>Adding Your First Printer</H2>
|
||||
|
||||
<P>CUPS provides two methods for adding printers: a command-line
|
||||
program called <CODE>lpadmin(8)</CODE> and a Web interface. The
|
||||
program called <CODE>lpadmin(1m)</CODE> and a Web interface. The
|
||||
<CODE>lpadmin</CODE> command allows you to perform most printer
|
||||
administration tasks from the command-line and is located in
|
||||
<VAR>/usr/sbin</VAR>. The Web interface is located at:
|
||||
@@ -506,7 +481,7 @@ to add or modify a printer:
|
||||
|
||||
<DD>Enables the printer and accepts job. This option is
|
||||
equivalent to running the <CODE>enable(1)</CODE> and
|
||||
<CODE>accept(8)</CODE> commands on the printer.
|
||||
<CODE>accept(1m)</CODE> commands on the printer.
|
||||
|
||||
<DT>-L <I>location</I>
|
||||
|
||||
@@ -695,7 +670,7 @@ jobs to a single server. However, if that server goes down then all
|
||||
printing will be disabled. Use this configuration only as absolutely needed.
|
||||
|
||||
<P>The default server is normally "localhost". To override the default
|
||||
server create a file named <VAR>/etc/cups/client.conf</VAR> and add
|
||||
server create a file named <VAR>/etc/cups/conf/client.conf</VAR> and add
|
||||
a line reading:
|
||||
|
||||
<UL><PRE>
|
||||
@@ -713,8 +688,8 @@ reading:
|
||||
ServerName <I>server</I>
|
||||
</PRE></UL>
|
||||
|
||||
<P>to the file. The <VAR>server</VAR> name can be the hostname or IP
|
||||
address of the default server.
|
||||
<P>to the file. As before the <VAR>server</VAR> name can be the
|
||||
hostname or IP address of the default server.
|
||||
|
||||
<H3><A NAME="CLIENT_AUTO">Automatic Configuration of Print Queues</A></H3>
|
||||
|
||||
@@ -797,8 +772,6 @@ configuration files are located in the <VAR>/etc/cups</VAR> directory:
|
||||
</DL>
|
||||
</UL>
|
||||
|
||||
<H2><A NAME="RESTARTING">Restarting the CUPS Server</A></H2>
|
||||
|
||||
<P>Once you have made a change to a configuration file you need to
|
||||
restart the CUPS server by sending it a <CODE>HUP</CODE> signal or using the
|
||||
supplied initialization script. The CUPS distributions install the
|
||||
@@ -816,9 +789,11 @@ script in the <VAR>init.d</VAR> directory with the name
|
||||
<P>The <VAR>/etc/cups/cupsd.conf</VAR> file contains configuration
|
||||
<I>directives</I> that control how the server functions. Each directive
|
||||
is listed on a line by itself followed by its value. Comments are
|
||||
introduced using the number sign ("#") character at the beginning of a
|
||||
line. Since the server configuration file consists of plain text, you
|
||||
can use your favorite text editor to make changes to it.
|
||||
introduced using the number sign ("#") character at the beginning of
|
||||
a line.
|
||||
|
||||
<P>Since the server configuration file consists of plain text, you can
|
||||
use your favorite text editor to make changes to it.
|
||||
|
||||
<!-- NEED 4in -->
|
||||
<H2>Server Directives</H2>
|
||||
@@ -837,7 +812,6 @@ 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>
|
||||
@@ -846,10 +820,9 @@ determine how the server operates:
|
||||
<LI><A HREF="#BrowsePoll"><CODE>BrowsePoll</CODE></A>
|
||||
<LI><A HREF="#BrowsePort"><CODE>BrowsePort</CODE></A>
|
||||
<LI><A HREF="#BrowseRelay"><CODE>BrowseRelay</CODE></A>
|
||||
<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="#DataDir"><CODE>DataDir</CODE></A>
|
||||
<LI><A HREF="#DefaultCharset"><CODE>DefaultCharset</CODE></A>
|
||||
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
@@ -857,12 +830,10 @@ 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="#ErrorLog"><CODE>ErrorLog</CODE></A>
|
||||
<LI><A HREF="#FilterLimit"><CODE>FilterLimit</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>
|
||||
@@ -872,9 +843,9 @@ determine how the server operates:
|
||||
<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="#MaxLogSize"><CODE>MaxLogSize</CODE></A>
|
||||
<LI><A HREF="#MaxRequestSize"><CODE>MaxRequestSize</CODE></A>
|
||||
<LI><A HREF="#Order"><CODE>Order</CODE></A>
|
||||
|
||||
</TD>
|
||||
<TD VALIGN="TOP">
|
||||
@@ -882,13 +853,11 @@ 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="#RemoteRoot"><CODE>RemoteRoot</CODE></A>
|
||||
<LI><A HREF="#RequestRoot"><CODE>RequestRoot</CODE></A>
|
||||
<LI><A HREF="#RIPCache"><CODE>RIPCache</CODE></A>
|
||||
<LI><A HREF="#ServerAdmin"><CODE>ServerAdmin</CODE></A>
|
||||
@@ -913,7 +882,6 @@ determine how the server operates:
|
||||
|
||||
<UL><PRE>
|
||||
AccessLog /var/log/cups/access_log
|
||||
AccessLog /var/log/cups/access_log-%s
|
||||
AccessLog syslog
|
||||
</PRE></UL>
|
||||
|
||||
@@ -925,15 +893,12 @@ to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
|
||||
access log file is stored in "common log format" and can be used by any
|
||||
web access reporting tool to generate a report on CUPS server activity.
|
||||
|
||||
<P>The server name can be included in the filename by using
|
||||
<CODE>%s</CODE> in the name.
|
||||
|
||||
<P>The special name "syslog" can be used to send the access information
|
||||
to the system log instead of a plain file.
|
||||
|
||||
<P>The default access log file is <VAR>/var/log/cups/access_log</VAR>.
|
||||
|
||||
<!-- NEED 6in -->
|
||||
<!-- NEED 5in -->
|
||||
<H3><A NAME="Allow">Allow</A></H3>
|
||||
<HR>
|
||||
|
||||
@@ -1092,23 +1057,6 @@ 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>
|
||||
@@ -1329,27 +1277,6 @@ BrowseRelay 127.0.0.1 255.255.255.255
|
||||
<P>This effectively provides access to printers on a WAN for all clients
|
||||
on the LAN(s).
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="BrowseShortNames">BrowseShortNames</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
BrowseShortNames Yes
|
||||
BrowseShortNames No
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>BrowseShortNames</CODE> directive specifies whether or not
|
||||
short names are used for remote printers when possible. Short names are
|
||||
just the remote printer name, without the server ("printer"). If more than
|
||||
one remote printer is detected with the same name, the printers will have
|
||||
long names ("printer@server1", "printer@server2".)
|
||||
|
||||
<P>The default value for this option is <CODE>Yes</CODE>.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="BrowseTimeout">BrowseTimeout</A></H3>
|
||||
<HR>
|
||||
@@ -1372,7 +1299,7 @@ destinations.
|
||||
<A HREF="#BrowseInterval"><CODE>BrowseInterval</CODE></A> value. Otherwise
|
||||
printers and classes will disappear from client systems between updates.
|
||||
|
||||
<!-- NEED 4in -->
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Browsing">Browsing</A></H3>
|
||||
<HR>
|
||||
|
||||
@@ -1401,21 +1328,6 @@ browsing is enabled. The default setting is <CODE>On</CODE>.
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="DataDir">DataDir</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
DataDir /usr/share/cups
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>DataDir</CODE> directive sets the directory to use for data
|
||||
files.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="DefaultCharset">DefaultCharset</A></H3>
|
||||
<HR>
|
||||
@@ -1553,7 +1465,6 @@ the web content by providing subdirectories for each language needed.
|
||||
|
||||
<UL><PRE>
|
||||
ErrorLog /var/log/cups/error_log
|
||||
ErrorLog /var/log/cups/error_log-%s
|
||||
ErrorLog syslog
|
||||
</PRE></UL>
|
||||
|
||||
@@ -1564,39 +1475,9 @@ file. If the filename is not absolute then it is assumed to be relative
|
||||
to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
|
||||
default error log file is <VAR>/var/log/cups/error_log</VAR>.
|
||||
|
||||
<P>The server name can be included in the filename by using
|
||||
<CODE>%s</CODE> in the name.
|
||||
|
||||
<P>The special name "syslog" can be used to send the error information
|
||||
to the system log instead of a plain file.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="FilterLimit">FilterLimit</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
FilterLimit 0
|
||||
FilterLimit 200
|
||||
FilterLimit 1000
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>FilterLimit</CODE> directive sets the maximum cost
|
||||
of all running job filters. It can be used to limit the number
|
||||
of filter programs that are run on a server to minimize disk,
|
||||
memory, and CPU resource problems. A limit of 0 disables filter
|
||||
limiting.
|
||||
|
||||
<P>An average print to a non-PostScript printer needs a filter
|
||||
limit of about 200. A PostScript printer needs about half that
|
||||
(100). Setting the limit below these thresholds will effectively
|
||||
limit the scheduler to printing a single job at any time.
|
||||
|
||||
<P>The default limit is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="Group">Group</A></H3>
|
||||
<HR>
|
||||
@@ -1806,29 +1687,6 @@ 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 size to 0 disables this functionality. The default
|
||||
setting is 0.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="MaxLogSize">MaxLogSize</A></H3>
|
||||
<HR>
|
||||
@@ -1906,7 +1764,6 @@ The following values are supported:
|
||||
|
||||
<UL><PRE>
|
||||
PageLog /var/log/cups/page_log
|
||||
PageLog /var/log/cups/page_log-%s
|
||||
PageLog syslog
|
||||
</PRE></UL>
|
||||
|
||||
@@ -1917,9 +1774,6 @@ file. If the filename is not absolute then it is assumed to be relative
|
||||
to the <A HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
|
||||
default page log file is <VAR>/var/log/cups/page_log</VAR>.
|
||||
|
||||
<P>The server name can be included in the filename by using
|
||||
<CODE>%s</CODE> in the name.
|
||||
|
||||
<P>The special name "syslog" can be used to send the page information
|
||||
to the system log instead of a plain file.
|
||||
|
||||
@@ -2009,34 +1863,15 @@ Printcap /etc/printcap
|
||||
<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, then no
|
||||
printcap file will be generated. The default is to generate a
|
||||
file named <VAR>/etc/printcap</VAR>.
|
||||
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.
|
||||
|
||||
<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="RemoteRoot">RemoteRoot</A></H3>
|
||||
<HR>
|
||||
|
||||
<H4>Examples</H4>
|
||||
|
||||
<UL><PRE>
|
||||
RemoteRoot remroot
|
||||
RemoteRoot root
|
||||
</PRE></UL>
|
||||
|
||||
<H4>Description</H4>
|
||||
|
||||
<P>The <CODE>RemoteRoot</CODE> directive sets the username for
|
||||
unauthenticated root requests from remote hosts. The default
|
||||
username is <VAR>remroot</VAR>. Setting <CODE>RemoteRoot</CODE>
|
||||
to <VAR>root</VAR> effectively disables this security mechanism.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<H3><A NAME="RequestRoot">RequestRoot</A></H3>
|
||||
<HR>
|
||||
@@ -2229,10 +2064,11 @@ filter and CGI programs run as. The default user is <CODE>lp</CODE>.
|
||||
<!-- NEW PAGE -->
|
||||
<H2><A NAME="PRINTING_SECURITY">Printing System Security</A></H2>
|
||||
|
||||
<P>CUPS provides support for address, certificate, and password (Basic
|
||||
and Digest) based authentication and access control. Certificate and
|
||||
password authentication provide ways to limit access to individual
|
||||
people or groups.
|
||||
<P>CUPS provides support for address, certificate, and password (Basic and
|
||||
Digest) based authentication and access control.
|
||||
|
||||
<P>Certificate and password authentication provide ways to limit access to
|
||||
individual people or groups.
|
||||
|
||||
<P>Address based access control allows you to limit access to specific
|
||||
systems, networks, or domains. While this does not provide authentication,
|
||||
@@ -2379,7 +2215,6 @@ additional group membership requirements are checked.
|
||||
AuthType Basic
|
||||
</PRE></UL>
|
||||
|
||||
<!-- NEED 7in -->
|
||||
<H3>Using Digest Authentication</H3>
|
||||
|
||||
<P>Digest authentication uses users and passwords defined in the
|
||||
@@ -2503,10 +2338,11 @@ Password again: <B>(password) ENTER</B> [password is not echoed]
|
||||
<!-- NEW PAGE -->
|
||||
<H2><A NAME="PRINTER_ACCOUNTING">Printer Accounting</A></H2>
|
||||
|
||||
<P>ESP Print Pro maintains a log of all accesses, errors, and
|
||||
pages that are printed. The log files are normally stored in the
|
||||
<VAR>/var/log/cups</VAR> directory. You can change this by
|
||||
editing the <VAR>/etc/cups/cupsd.conf</VAR> configuration file.
|
||||
<P>CUPS maintains a log of all accesses, errors, and pages that are
|
||||
|
||||
<P>The log files are normally stored in the <VAR>/var/log/cups</VAR>
|
||||
directory. You can change this by editing the
|
||||
<VAR>/etc/cups/cupsd.conf</VAR> configuration file.
|
||||
|
||||
<H3>The access_log File</H3>
|
||||
|
||||
@@ -2531,16 +2367,13 @@ directive in the <VAR>cupsd.conf</VAR> file.
|
||||
If no username and password is supplied for the request then this field
|
||||
contains "-".
|
||||
|
||||
<P>The <I>date-time</I> field is the date and time of the request in local time
|
||||
and is in the format:
|
||||
<P>The <I>date-time</I> field is the date and time of the request in Greenwich
|
||||
Mean Time (a.k.a. ZULU) and is in the format:
|
||||
|
||||
<UL><PRE>
|
||||
[DD/MON/YYYY:HH:MM:SS +ZZZZ]
|
||||
[DD/MON/YYYY:HH:MM:SS +0000]
|
||||
</PRE></UL>
|
||||
|
||||
<P>where <I>ZZZZ</I> is the timezone offset in hours and minutes from Greenwich
|
||||
Mean Time (a.k.a. GMT a.k.a. ZULU.)
|
||||
|
||||
<P>The <I>method</I> field is the HTTP method used ("GET", "PUT", "POST", etc.)
|
||||
|
||||
<P>The <I>resource</I> field is the filename of the requested resource.
|
||||
@@ -2555,7 +2388,7 @@ above.
|
||||
|
||||
<P>The <I>bytes</I> field contains the number of bytes in the request.
|
||||
For POST requests the <I>bytes</I> field contains the number of bytes
|
||||
that was received from the client.
|
||||
of non-IPP data that is received from the client.
|
||||
|
||||
<H3>The error_log File</H3>
|
||||
|
||||
@@ -2812,7 +2645,8 @@ different file types and filters.
|
||||
<P>Once you choose the names for these files, create them using your
|
||||
favorite text editor as described earlier in this chapter. Once you
|
||||
have created the files, restart the <CODE>cupsd</CODE> process as
|
||||
described earlier in <A HREF="#RESTARTING">"Restarting the CUPS Server"</A>.
|
||||
described in <A HREF="#PRINTING_MANAGEMENT">Chapter N, "Printing System
|
||||
Configuration"</A>.
|
||||
|
||||
<H3>Printer Drivers and PPD Files</H3>
|
||||
|
||||
@@ -2857,7 +2691,7 @@ the automatic client configuration and printer options are not supported by
|
||||
the LPD protocol, so you must manually configure each client for the printers
|
||||
it needs to access.
|
||||
|
||||
<P>The <CODE>cups-lpd(8)</CODE> program provides support for LPD clients.
|
||||
<P>The <CODE>cups-lpd(1m)</CODE> program provides support for LPD clients.
|
||||
To enable LPD support on your server, edit the <VAR>/etc/inetd.conf</VAR>
|
||||
file and add a line reading:
|
||||
|
||||
@@ -2868,13 +2702,13 @@ printer stream tcp nowait lp /usr/lib/cups/daemon/cups-lpd cups-lpd
|
||||
<P>The path to the <CODE>cups-lpd</CODE> may vary depending on your
|
||||
installation.
|
||||
|
||||
<P>Once you have added this line, send the <CODE>inetd(8)</CODE> process
|
||||
<P>Once you have added this line, send the <CODE>inetd(1m)</CODE> process
|
||||
a <CODE>HUP</CODE> signal or reboot the system:
|
||||
|
||||
<UL><PRE>
|
||||
<B>killall -HUP inetd ENTER</B> [IRIX and some versions of Linux]
|
||||
<B>kill -HUP <I>pid</I> ENTER [Others]</B>
|
||||
<B>reboot ENTER [For all systems if the HUP signal fails]</B>
|
||||
<B>kill -HUP <I>pid</I> ENTER</B>
|
||||
<B>reboot ENTER</B>
|
||||
</PRE></UL>
|
||||
|
||||
<H2>Printing to LPD Servers</H2>
|
||||
@@ -2898,7 +2732,7 @@ free and commercial software packages that do.
|
||||
|
||||
<H3>Columbia Appletalk Package (CAP)</H3>
|
||||
|
||||
<P>Because the CAP LaserWriter server (<CODE>lwsrv(8)</CODE>) does
|
||||
<P>Because the CAP LaserWriter server (<CODE>lwsrv(1m)</CODE>) does
|
||||
not support specification of PPD files, we do not recommend that you
|
||||
use CAP with CUPS. However, you can run the <CODE>lpsrv</CODE> program
|
||||
for limited printing with the command:
|
||||
@@ -2914,7 +2748,7 @@ printer, and <CODE>printer</CODE> is the name of the CUPS print queue.
|
||||
<H3>XINET KA/Spool</H3>
|
||||
|
||||
<P>To use your system as a print server for Mac OS clients,
|
||||
configure each printer using a <CODE>papserver(8)</CODE> in the
|
||||
configure each printer using a <CODE>papserver(1m)</CODE> in the
|
||||
<VAR>/usr/adm/appletalk/services</VAR> file, specifying the
|
||||
corresponding PPD file in the <VAR>/etc/cups/ppd</VAR> directory for
|
||||
each printer. For a printer named <CODE>MyPrinter</CODE> the entry
|
||||
@@ -3111,7 +2945,7 @@ test page or bottom of the print server.
|
||||
<H3>Configuring the IP Address Using ARP</H3>
|
||||
|
||||
<P>The easiest way to set the IP address of a network device is to use
|
||||
the <CODE>arp(8)</CODE> command. The <CODE>arp</CODE> sends an Address
|
||||
the <CODE>arp(1m)</CODE> command. The <CODE>arp</CODE> sends an Address
|
||||
Resolution Protocol ("ARP") packet to the specified Ethernet MAC address,
|
||||
setting the network device's IP address:
|
||||
|
||||
@@ -3135,7 +2969,7 @@ IP address after a power cycle. If you just have a single printer or
|
||||
print server, the <CODE>arp</CODE> command is the way to go.
|
||||
|
||||
<P>Some UNIX operating systems use a program called
|
||||
<CODE>rarpd(8)</CODE> to manage RARP. Others, like Linux, support this
|
||||
<CODE>rarpd(1m)</CODE> to manage RARP. Others, like Linux, support this
|
||||
protocol in the kernel. For systems that provide the <CODE>rarpd</CODE>
|
||||
program you will need to start it before RARP lookups will work:
|
||||
|
||||
@@ -3167,7 +3001,7 @@ server to set its address.
|
||||
|
||||
<P>The BOOTP protocol is used when you need to provide additional information
|
||||
such as the location of a configuration file to the network interface. Using
|
||||
the standard <CODE>bootpd(8)</CODE> program supplied with UNIX you simply need to
|
||||
the standard <CODE>bootpd(1m)</CODE> program supplied with UNIX you simply need to
|
||||
add a line to the <VAR>/etc/bootptab</VAR> file; for IRIX:
|
||||
|
||||
<UL><PRE>
|
||||
@@ -3272,7 +3106,7 @@ CUPS:
|
||||
lpd://<I>address</I>/pr3</TD>
|
||||
</TR>
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
<TD>EFI® Fiery® RIP</TD>
|
||||
<TD>EFI® Fiery RIP</TD>
|
||||
<TD>lpd://<I>address</I>/print</TD>
|
||||
</TR>
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
@@ -3314,8 +3148,7 @@ CUPS:
|
||||
</TR>
|
||||
<!-- NEED 1in -->
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
<TD>Linksys EtherFast®<BR>
|
||||
<A HREF="#LINKSYS">(see directions)</A></TD>
|
||||
<TD>Linksys EtherFast®</TD>
|
||||
<TD>socket://<I>address</I>:4010<BR>
|
||||
socket://<I>address</I>:4020<BR>
|
||||
socket://<I>address</I>:4030</TD>
|
||||
@@ -3333,15 +3166,7 @@ CUPS:
|
||||
<TD>socket://<I>address</I>:9100</TD>
|
||||
</TR>
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
<TD>XEROX® 4512 NIC</TD>
|
||||
<TD>lpd://<I>address</I>/PORT1</TD>
|
||||
</TR>
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
<TD>XEROX® XNIC</TD>
|
||||
<TD>lpd://<I>address</I>/PASSTHRU</TD>
|
||||
</TR>
|
||||
<TR ALIGN="LEFT" VALIGN="TOP">
|
||||
<TD>XEROX® (most others)</TD>
|
||||
<TD>XEROX®</TD>
|
||||
<TD>socket://<I>address</I>:5503</TD>
|
||||
</TR>
|
||||
</TABLE></CENTER>
|
||||
@@ -3446,76 +3271,6 @@ ftp> <B>quit ENTER</B>
|
||||
|
||||
<P>Your Axis print server is now ready for use!
|
||||
|
||||
<H2><A NAME="LINKSYS">Configuring Linksys Print Servers</A></H2>
|
||||
|
||||
<P>The Linksys print servers can be configured using ARP, RARP, or
|
||||
BOOTP. Like older Axis print servers, an additional step must be
|
||||
performed to configure the TCP/IP portion of the print server for use
|
||||
with CUPS.
|
||||
|
||||
<!-- NEED 3in -->
|
||||
<P>Each print server contains a configuration file named
|
||||
<VAR>CONFIG</VAR> that contains a list of network parameters used by
|
||||
the server. To modify this file you must first download it from the
|
||||
print server using the <CODE>ftp(1)</CODE> program:
|
||||
|
||||
<UL><PRE>
|
||||
<B>ftp -n ip-address ENTER</B>
|
||||
Connected to ip-address.
|
||||
220 Print Server Ready.
|
||||
Remote system type is Print.
|
||||
ftp> <B>get CONFIG ENTER</B>
|
||||
local: CONFIG remote: CONFIG
|
||||
200 Command OK.
|
||||
150 Open ASCII Mode Connection.
|
||||
WARNING! 68 bare linefeeds received in ASCII mode
|
||||
File may not have transferred correctly.
|
||||
226 Transfer complete.
|
||||
##### bytes received in #.## seconds (##### Kbytes/s)
|
||||
ftp> <B>quit ENTER</B>
|
||||
221 Goodbye.
|
||||
</PRE></UL>
|
||||
|
||||
<!-- NEED 2in -->
|
||||
<P>Next, edit the file with your favorite text editor and locate the
|
||||
lines beginning with:
|
||||
|
||||
<UL><PRE>
|
||||
0100 L1_PROUT:P1
|
||||
0120 L2_PROUT:P1
|
||||
0140 L3_PROUT:P1
|
||||
</PRE></UL>
|
||||
|
||||
<P>Change the port number for
|
||||
each parallel and serial port on the server as follows:
|
||||
|
||||
<UL><PRE>
|
||||
0100 L1_PROUT:<B>P1</B>
|
||||
0120 L2_PROUT:<B>P2</B>
|
||||
0140 L3_PROUT:<B>P3</B>
|
||||
</PRE></UL>
|
||||
|
||||
<!-- NEED 4in -->
|
||||
<P>This maps each virtual printer with a physical port. Save the file and then upload the
|
||||
new <VAR>CONFIG</VAR> file using the <CODE>ftp</CODE> command:
|
||||
|
||||
<UL><PRE>
|
||||
<B>ftp -n ip-address ENTER</B>
|
||||
Connected to ip-address.
|
||||
220 Print Server Ready.
|
||||
Remote system type is Print.
|
||||
ftp> <B>put CONFIG ENTER</B>
|
||||
local: CONFIG remote: CONFIG
|
||||
200 Command OK.
|
||||
150 Open ASCII Mode Connection.
|
||||
226 Transfer complete.
|
||||
##### bytes received in #.## seconds (##### Kbytes/s)
|
||||
ftp> <B>quit ENTER</B>
|
||||
221 Goodbye.
|
||||
</PRE></UL>
|
||||
|
||||
<P>Your Linksys print server is now ready for use!
|
||||
|
||||
|
||||
<H1 ALIGN="RIGHT"><A NAME="PRINTER_DRIVERS">C - Printer Drivers</A></H1>
|
||||
|
||||
@@ -3601,11 +3356,7 @@ the Common UNIX Printing System.
|
||||
<TH>Pathname</TH>
|
||||
<TH>Description</TH>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/certs/</TD>
|
||||
<TD>The location of authentication certificate files for local
|
||||
HTTP clients.</TD>
|
||||
</TR>
|
||||
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/classes.conf</TD>
|
||||
<TD>The printer classes configuration file for the scheduler.</TD>
|
||||
@@ -3614,10 +3365,6 @@ the Common UNIX Printing System.
|
||||
<TD>/etc/cups/cupsd.conf</TD>
|
||||
<TD>The scheduler configuration file.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/interfaces/</TD>
|
||||
<TD>The location of System V interface scripts for printers.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/mime.convs</TD>
|
||||
<TD>The list of standard file filters included with ESP Print Pro.</TD>
|
||||
@@ -3626,15 +3373,19 @@ the Common UNIX Printing System.
|
||||
<TD>/etc/cups/mime.types</TD>
|
||||
<TD>The list of recognized file types for ESP Print Pro.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/printers.conf</TD>
|
||||
<TD>The printer configuration file for the scheduler.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/interfaces/</TD>
|
||||
<TD>The location of System V interface scripts for printers.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/ppd/</TD>
|
||||
<TD>The location of PostScript Printer Description ("PPD") files for
|
||||
printers.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/etc/cups/printers.conf</TD>
|
||||
<TD>The printer configuration file for the scheduler.</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/usr/bin/cancel</TD>
|
||||
<TD>The System V cancel job(s) command.</TD>
|
||||
@@ -3765,10 +3516,6 @@ the Common UNIX Printing System.
|
||||
/usr/share/catman/u_man/</TD>
|
||||
<TD>Man pages (IRIX)</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/usr/share/man/</TD>
|
||||
<TD>Man pages (Compaq Tru64 UNIX, HP-UX, Solaris)</TD>
|
||||
</TR>
|
||||
<TR VALIGN="TOP">
|
||||
<TD>/usr/man/</TD>
|
||||
<TD>Man pages (all others)</TD>
|
||||
@@ -3925,7 +3672,7 @@ Management"</A>.
|
||||
root account.
|
||||
|
||||
<LI>accessing the CUPS server using the hostname or IP
|
||||
address of the server without enabling remote access for
|
||||
address of the server but haven't enabled remote access for
|
||||
administration functions. This can be corrected by following
|
||||
the instructions in the <A HREF="#ALLOW_REMOTE">"I Can't Do
|
||||
Administration Tasks from Another Machine!"</A> section earlier
|
||||
|
||||
+413
-625
Diferenças do arquivo suprimidas por serem muito extensas
Carregar Diff
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