Save changes.

.gitignore

@@ -0,0 +1,10 @@
+*.o
+.buildrev
+buildtest.env
+build.log
+temp
+tools/.buildrev
+tools/Makefile
+tools/config.log
+tools/config.status
+tools/sendbuildlog

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "stable"]
+	path = stable
+	url = https://github.com/apple/cups.git
+	branch = branch-2.1
+[submodule "development"]
+	path = development
+	url = https://github.com/apple/cups.git

CHANGES-1.0.txt

@@ -1,217 +0,0 @@
-CHANGES-1.0.txt
----------------
-
-CHANGES IN CUPS v1.0.5
-
-	- The HP-GL/2 filter did not correctly set the pen color
-          for pens other than #1.
-	- The scheduler would only accept 26 simultaneous jobs
-          under some OS releases (mkstemp() limitation.)  It now
-          handles up to 2^32 simultaneous jobs.
-	- The PostScript filter loaded the printer's PPD file
-          twice.
-	- The PAM authentication code now uses pam_strerror() to
-          provide a textual error message in the error_log file.
-	- The scheduler now copies PPD and interface script
-          files instead of moving them; this fixes installations
-          with a separate requests directory.
-	- The PostScript RIP did not generate correct 6-color
-          output.
-	- Several filters were marking PPD options twice when
-          they didn't need to.
-	- The scheduler did not save the printer or class state
-          after an accept-jobs or reject-jobs operation.
-	- The cupsGetDefault() function now ignores the PRINTER
-          environment variable if it is set to "lp".
-	- New ippErrorString() function to get textual error
-          messages.
-	- Better error reporting in the System V commands.
-	- The lpadmin and lpstat commands always tried to
-          connect to the default server.
-	- The text filter didn't load the charset files from the
-          correct location.
-	- Wasn't sending a WWW-Authenticate: field to HTTP
-          clients when authentication was required.
-	- httpSeparate() didn't always set the default port
-          number for known methods.
-	- The HP-GL/2 filter now looks for "PSwidth,length"
-          instead of (the correct) "PSlength,width" as
-          documented by HP.  It appears that many major CAD
-          applications are broken and this change allows the
-          auto-rotation to work with them.
-	- The IPP "printer-resolution" option was not being
-          translated.
-	- The charset files did not include the Microsoft
-          "standard" characters from 128 to 159 (unused by the
-          ISO-8859-x charsets)
-	- The scheduler was chunking the Content-Type field from
-          CGI programs; this problem was most noticeable with
-          Microsoft Internet Explorer 5.
-	- By popular demand, the printers, jobs, and classes
-          CGIs no longer force a reload of the page every 10/30
-          seconds.
-	- The scheduler incorrectly required that the IPP client
-          provide a document-format attribute for the
-          validate-job operation.
-	- Clients that sent bad IPP requests without the
-          required attributes-natural-language and
-          attributes-charset attributes would crash the
-          scheduler.
-
-
-CHANGES IN CUPS v1.0.4
-
-	- Documentation updates.
-	- Jobs would get stuck in the queue and wouldn't print
-	  until you enabled the queue.
-	- The lp and lpr commands now catch SIGHUP and SIGINTR.
-	- The lp and lpr commands now use sigaction or sigset
-	  when available.
-	- CUPS library updates for WIN32/OS-2
-
-
-CHANGES IN CUPS v1.0.3
-
-	- Documentation updates.
-	- The lpq man page was missing.
-	- The configure script was not properly detecting the
-	  image libraries.
-	- The top-level makefile was calling "make" instead of
-	  "$(MAKE)".
-	- PostScript filter fixes for number-up, OutputOrder,
-	  and %Trailer.
-	- The imagetops filter didn't end the base-85 encoding
-	  properly if the image data was not a multiple of 4
-	  bytes in length.
-	- The imagetoraster filter didn't generate good banded
-	  RGB or CMY data (was dividing the line width by 4
-	  instead of 3...)
-	- The imagetoraster filter now records the bounding
-	  box of the image on the page.
-	- The CUPS image library cache code wasn't working as
-	  designed; images larger than the maximum RIP cache
-	  would eventually thrash using the same cache tile.
-	- The CUPS image library TIFF loading code didn't
-	  handle unknown resolution units properly; the fixed
-	  code uses a default resolution of 128 PPI.
-	- cupsGetClasses() and cupsGetPrinters() did not free
-	  existing strings if they ran out of memory.
-	- The scheduler logs incorrectly contained 3 digits for
-	  the timezone offset instead of 4.
-	- The scheduler now does a lookup for the default user
-	  and group ID; the previous hardcoded values caused
-	  problems with the LPD backend.
-	- The cancel-job operation now allows any user in the
-	  system group to cancel any job.
-	- The cancel-job operation stopped the print queue if
-	  the job was being printed.
-	- Now only stop printers if the backend fails. If the
-	  filter fails then the failure is noted in the
-	  error_log and printing continues with the next file in
-	  the queue.
-	- Now log whether a filter fails because of a signal
-	  or because it returned a non-zero exit status.
-	- The root user now always passes the system group test.
-	- Printers with an interface script and remote printers
-	  and classes didn't have a printer-make-and-model
-	  attribute.
-	- Added logging of lost/timed-out remote printers.
-	- The HP-GL/2 filter was scaling the pen width twice.
-	- Updated the HP-GL/2 filter to use a single SP (Set
-	  Pen) procedure.  This makes the output smaller and is
-	  more appropriate since the filter keeps track of the
-	  pen states already.
-	- The scheduler didn't handle passwords with spaces.
-	- The IPP backend now does multiple copies and retries
-	  if the destination server requires it (e.g. HP
-	  JetDirect.)
-	- The disable command didn't implement the "-c" option
-	  (cancel all jobs.)
-	- Changed the CMYK generation function for the image file
-	  and PostScript RIPs.
-	- The lp command didn't support the "-h" option as
-	  documented.
-	- The AppSocket, IPP, and LPD backends now retry on all
-	  network errors.  This should prevent stopped queues
-	  caused by a printer being disconnected from the
-	  network or powered off.
-	- The scheduler now restarts a job if the corresponding
-	  printer is modified.
-	- The image RIPs now rotate the image if needed to fit
-	  on the page.
-
-
-CHANGES IN CUPS v1.0.2
-
-	- The HP-GL/2 filter didn't always scale the output
-	  correctly.
-	- The HP-GL/2 filter now supports changing the page size
-	  automatically when the "fitplot" option is not used.
-	- The cancel-job operation was expecting a resource name
-	  of the form "/job/#" instead of "/jobs/#"; this
-	  prevented the cancel and lprm commands from working.
-	- The backends didn't log pages when files were printed
-	  using the "-oraw" option.
-	- The authorization code did not work with the Slackware
-	  long shadow password package because its crypt() can
-	  return NULL.
-	- The chunking code didn't work for reading the response
-	  of a POST request.
-	- cupsGetPPD() now does authentication as needed.
-	- The N-up code in the PostScript filter didn't work
-	  with some printers (grestoreall would restore the
-	  default blank page and device settings).
-	- The N-up code in the PostScript filter didn't scale
-	  the pages to fit within the imageable area of the
-	  page.
-	- Wasn't doing an fchown() on the request files.  This
-	  caused problems when the default root account group
-	  and CUPS group were not the same.
-
-
-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.

CHANGES.txt

@@ -1,379 +0,0 @@
-CHANGES.txt - 2007-10-30
-------------------------
-
-CHANGES IN CUPS V1.3.4
-
-	- Documentation updates (STR #2560, STR #2563, STR #2569)
-	- CUPS now maps the "nb" locale to "no" on all platforms
-	  (STR #2575)
-	- CUPS did not work with a Windows 2003 R2 KDC (STR #2568)
-	- ippReadIO() could read past the end of a buffer (STR
-	  #2561)
-	- The scheduler would crash on shutdown if it was unable
-	  to create a Kerberos context.
-	- Multiple AuthTypes in cupsd.conf did not work (STR
-	  #2545)
-	- The snmp.conf file referenced the wrong man page (STR
-	  #2564)
-	- The cupsaddsmb program didn't handle domain sockets
-	  properly (STR #2556)
-	- The scheduler now validates device URIs when adding
-	  printers.
-	- Updated httpSeparateURI() to support hostnames with
-	  the backslash character.
-	- Updated the Japanese localization (STR #2546)
-	- The parallel backend now gets the current IEEE-1284
-	  device ID string on Linux (STR #2553)
-	- The IPP backend now checks the job status at
-	  variable intervals (from 1 to 10 seconds) instead
-	  of every 10 seconds for faster remote printing
-	  (STR #2548)
-	- "lpr -p" and "lpr -l" did not work (STR #2544)
-	- Compilation failed when a previous version of CUPS
-	  was installed and was included in the SSL include
-	  path (STR #2538)
-	- The scheduler did not reject requests with charsets
-	  other than US-ASCII or UTF-8, and the CUPS API
-	  incorrectly passed the locale charset to the scheduler
-	  instead of UTF-8 (STR #2537)
-	- cups-deviced did not filter out duplicate devices.
-	- The AppleTalk backend incorrectly added a scheme
-	  listing when AppleTalk was disabled or no printers
-	  were found.
-	- The PostScript filter generated N^2 copies when the
-	  printer supported collated copies and user requested
-	  reverse-order output.
-	- The scheduler did not reprint all of the files in a
-	  job that was held.
-	- The scheduler did not update the printcap file after
-	  removing stale remote queues.
-	- The cupsd.conf man page incorrectly referenced
-	  "AuthType Kerberos" instead of "AuthType Negotiate".
-
-
-CHANGES IN CUPS V1.3.3
-
-	- The scheduler did not use the attributes-natural-language
-	  attribute when passing the LANG environment variable to
-	  cups-deviced or cups-driverd.
-	- The scheduler did not use the printer-op-policy when
-	  modifying classes or printers (STR #2525)
-	- The auth-info-required attribute was not always updated
-	  for remote queues that required authentication.
-	- The German web interface localization contained errors
-	  (STR #2523)
-	- The Swedish localization contained errors (STR #2522)
-
-
-CHANGES IN CUPS V1.3.2
-
-	- The 1.3.1 release was incorrectly created from the
-	  1.4.x source tree (STR #2519)
-	- Added support for 32/64-bit libraries on HP-UX
-	  (STR #2520)
-	- The scheduler incorrectly used portrait as the default
-	  orientation (STR #2513)
-	- The scheduler no longer writes the printcap file for
-	  every remote printer update (STR #2512)
-	- Remote raw printing with multiple copies did not work
-	  (STR #2518)
-	- Updated the configure script to require at least autoconf
-	  2.60 (STR #2515)
-	- Some gzip'd PPD files were not read in their entirety
-	  (STR #2510)
-
-
-CHANGES IN CUPS V1.3.1
-
-	- Documentation updates.
-	- The USB backend on Mac OS X could hang if the driver and
-	  printer did not match.
-	- Delegated Kerberos credentials were not working.
-	- "make distclean" incorrectly removed the edit-config.tmpl
-	  files (STR #2508)
-	- Fix compile problem on HP-UX (STR #2501)
-	- The cupstestppd utility now tests for resolutions greater
-	  than 99999 DPI to detect a missing  "x" between the X and Y
-	  resolutions.
-	- Fixed many problems in the various translations and added
-	  a new "checkpo" utility to validate them.
-	- The cupstestppd utility now tests the custom page size code
-	  for CUPS raster drivers.
-	- cupsLangDefault() did not attempt to return a language that
-	  was supported by the calling application.
-	- If a remote printer stopped while a job was being sent, the
-	  local queue would also get stopped and the job re-queued,
-	  resulting in duplicate prints in some cases.
-	- A few Apple-specific job options needed to be omitted when
-	  printing a banner page.
-	- The new peer credential support did not compile on FreeBSD
-	  (STR #2495)
-	- Direct links to help files did not set the current section
-	  so the table-of-contents was not shown.
-	- The configure script did not support --localedir=foo (STR #2488)
-	- The backends were not displaying their localized messages.
-	- CUPS-Authenticate-Job did not require Kerberos authentication
-	  on queues protected by Kerberos.
-	- The Zebra ZPL driver did not work with Brady label printers
-	  (STR #2487)
-	- Norwegian wasn't localized on Mac OS X.
-	- getnameinfo() returns an error on some systems when DNS is
-	  not available, leading to numerous problems (STR #2486)
-	- The cupsfilter command did not work properly on Mac OS X.
-	- The scheduler makefile contained a typo (STR #2483)
-	- The TBCP and BCP port monitors did not handle the trailing
-	  CTRL-D in some PostScript output properly.
-	- Fixed the localization instructions and German template for
-	  the "Find New Printers" button (STR #2478)
-	- The web interface did not work with the Chinese localization
-	  (STR #2477)
-	- The web interface home page did not work for languages that
-	  were only partially localized (STR #2472)
-	- Updated the Spanish web interface localization (STR #2473)
-	- ppdLocalize() did not work for country-specific localizations.
-
-
-CHANGES IN CUPS V1.3.0
-
-	- The scheduler did not handle out-of-file conditions
-	  gracefully when accepting new connections, leading to
-	  heavy CPU usage.
-	- The scheduler did not detect ServerBin misconfigurations
-	  (STR #2470)
-	- "AuthType Default" did not work as expected when the
-	  "DefaultAuthType foo" line appeared after it in the
-	  cupsd.conf file.
-	- The on-line help did not describe many common printing
-	  options (STR #1846)
-	- The IPP backend did not return the "auth required" status
-	  when printing to a Kerberos-protected queue.
-	- The scheduler was not looking in the correct directories
-	  for LSB PPD files (STR #2464)
-	- Changed references to ESP Ghostscript to GPL Ghostscript
-	  (STR #2463)
-	- The PostScript filter did not cleanly terminate when
-	  the job was canceled or stopped.
-	- Fixed generation of Kerberos credentials for remote
-	  printing.  Note that this requires a recent version of
-	  MIT Kerberos with a working krb5_cc_new_unique()
-	  function or Heimdal Kerberos.
-	- Added Portuguese and updated Italian message catalogs.
-
-
-CHANGES IN CUPS V1.3rc2
-
-	- Added more range checking to the pdftops filter. 
-	- The scheduler would crash if a remote IPP queue was stopped
-	  (STR #2460)
-	- The scheduler did not allow "DefaultAuthType None".
-
-
-CHANGES IN CUPS V1.3rc1
-
-	- Updated the German localization (STR #2443)
-	- cupsAdminGetServerSettings() did not handle </Foo> properly.
-	- When lprm and cancel are run with no job ID, they now will
-	  cancel the first stopped job if no pending or processing
-	  jobs are left in the queue.
-	- The scheduler now logs successful print jobs, filter
-	  failures, and the job file types at the default log
-	  level (STR #2458)
-	- The scheduler now logs the usernames it is using for
-	  authorization at LogLevel debug instead of debug2 (STR #2448)
-	- Added Intellitech Intellibar and Zebra CPCL PPDs to the list
-	  of installed PPDs.
-	- Added 6" and 8" wide label sizes for the Zebra ZPL Label
-	  Printer driver (STR #2442)
-	- The cupsaddsmb program and web interface now support
-	  exporting of 64-bit Windows drivers, when available
-	  (STR #2439)
-	- Moving a job that was printing did not stop the job on the
-	  original printer (STR #2262)
-	- The cups-lpd mini-daemon did not work on Mac OS X server.
-	- Added httpGetAuthString() and httpSetAuthString() APIs to get
-	  and set the current (cached) authorization string to use for
-	  HTTP requests.
-	- Updated the default cupsd.conf policy to list the
-	  "administrative" operations separately from the "printer
-	  control" operations so that it is easier to define a
-	  group of users that are "printer operators".
-	- The web interface now pulls the default cupsd.conf file
-	  from cupsd.conf.default in the CUPS config directory.
-	- Added a help file for using Kerberos with CUPS.
-	- The scheduler now strips the "@KDC" portion of Kerberos
-	  usernames since those usernames typically do not appear in
-	  the group membership lists used by CUPS.
-	- cupsMarkOptions() could (incorrectly) leave multiple option
-	  choices marked.
-	- Backends could (incorrectly) run as root during discovery
-	  (STR #2454)
-	- Avahi is now supported for DNS-SD (Bonjour) printer sharing
-	  (STR #2455)
-	- The default cupsd.conf file had typos and old operation names
-	  (STR #2450)
-	- The scheduler now erases authentication cache files using the
-	  7-pass US DoD algorithm.
-	- Delegated Kerberos credentials (proxy authentication) did not
-	  work.
-	- The filter makefile did not optimize the libcupsimage.2.dylib
-	  with a sectorder file.
-	- The IPP backend incorrectly wrote an empty printer message
-	  when processing the "none" state reason.
-	- The USB backend could deadlock on Mac OS X while performing
-	  a side-channel command.
-	- The scheduler did not prevent remote queues from being
-	  shared/published.
-	- The scheduler did not remove the temporary request file on
-	  authentication errors.
-	- ppdLocalizeIPPReason() did not handle "scheme:" schemes or
-	  "file" URLs.
-	- ppdLocalizeIPPReason() was not exported on Mac OS X.
-
-
-CHANGES IN CUPS V1.3b1
-
-	- Copyright updates - CUPS is now owned by Apple Inc.
-	- Documentation updates (STR #1775, STR #2027, STR #2130,
-	  STR #2131, STR #2263, STR #2356, STR #2397)
-	- Added new cupsfilter utility (STR #1734)
-	- Added new job-printer-state-message and
-	  job-printer-state-reasons attributes to jobs (STR #2418)
-	- Added LDAP+SSL support (STR #1967)
-	- CUPS now supports authentication via peer credentials
-	  over domain sockets (STR #2242, STR #2277)
-	- The CUPS sample driver PPDs are now generated by the PPD
-	  compiler and include all of the localized languages by
-	  default (STR #2164)
-	- You can now specify "AuthType Default" in the cupsd.conf
-	  file to use the default authentication defined by the
-	  DefaultAuthType directive.
-	- The SNMP backend no longer adds a default Address line
-	  when none is specified in the snmp.conf file; this allows
-	  the backend to be easily disabled as needed (STR #2434)
-	- Added a new cupsctl command for doing basic changes to
-	  the cupsd.conf file (STR #1777)
-	- Added a new ppdLocalizeIPPReason() function to get the
-	  localized text/URI for a given IPP reason keyword for a
-	  driver.
-	- Removed the deskjet2.ppd driver, as it only worked with
-	  a very small subset of HP DeskJet printers and was
-	  confusing to users.  The rastertohp driver still
-	  supports the deskjet2.ppd options for existing queues.
-	- The scheduler did not add a trailing banner page if a
-	  client did not specify the last document in a job (STR
-	  #1711)
-	- The scheduler did not report Bonjour shared printers as
-	  remote printers (STR #2384)
-	- Added new -R and -W options to the cupstestppd program
-	  for greater control over the testing of PPDs.
-	- Added a new cupsGetServerPPD() function for getting
-	  an available PPD from the server (STR #2334)
-	- Added a new cupsDoIORequest() function for reading
-	  and writing files via IPP requests (STR #2334)
-	- Added a new CUPS_GET_PPD operation for getting an
-	  available PPD file on the server (STR #2334) 
-	- CUPS_GET_PPDS now reports multiple ppd-product values
-	  based on the PPD ModelName and Product strings (STR
-	  #2334, STR #2383)
-	- CUPS_GET_PPDS now reports the PSVersion attributes
-	  from a PPD file in the ppd-psversion attribute
-	  (STR #2334)
-	- CUPS_GET_PPDS now reports the cupsModelNumber attribute
-	  from a PPD file in the ppd-model-number attribute (STR
-	  #2383)
-	- CUPS_GET_PPDS now reports a driver type string in the
-	  ppd-type attribute based on the cupsFax and cupsFilter
-	  attributes in a PPD file (STR #2383)
-	- Added a new printer attribute called "cups-version"
-	  which reports the version of CUPS that is running
-	  (STR #2240)
-	- backendRunLoop() now aborts immediately on SIGTERM
-	  if no data has been written yet (STR #2103)
-	- Due to poor IPP support from the vendors, the SNMP
-	  backend no longer tries IPP connections; instead,
-	  it now uses a lookup file with fallback to port 9100
-	  (socket://address) and 515 (lpd://address) printing
-	  (STR #2035, STR #2354) 
-	- The scheduler now recreates the CUPS log directory as
-	  needed (STR #2353)
-	- cupsLangDefault() now maps new-style Apple locale names
-	  to the traditional ll_CC form (STR #2357)
-        - Add new cupsArrayNew2() API to support hashed lookups
-          of array elements (STR #2358)
-        - ppdConflicts() optimizations (STR #2358)
-	- The cupstestppd program now tests for existing filters,
-	  icons, profiles, and dialog extensions (STR #2326)
-	- The web interface no longer lists new printers on the
-	  main administration page.  Instead, a new "List Available
-	  Printers" button is provided that shows a separate page
-	  with the list of printers.
-	- The web interface now supports setting the banner and
-	  policy options on raw printers and classes (STR #2238)
-	- The socket backend now reads any pending back-channel
-	  data before shutting down the socket (STR #2325)
-	- Added a new ErrorPolicy directive in the cupsd.conf
-	  file (STR #1871)
-	- Printers that use JCL options are now exported to Samba
-	  correctly (STR #1985)
-	- The IPP backend now relays printer-state-message values
-	  from the server to the client (STR #2109)
-	- Added support for the PWG printer-alert and
-	  printer-alert-description attributes (STR #2088)
-	- Added support for LPD "stream" mode (STR #2036)
-	- The scheduler now reports the PostScript product string
-	  from PPD files in CUPS-Get-PPDs responses (STR #1900)
-	- Raw printing with queues pointing to the file pseudo-
-	  device and multiple files and/or banners now works (STR
-	  #1933)
-	- Added new public cupsAdminGetServerSettings() and
-	  cupsAdminSetServerSettings() APIs.
-	- Added new "makebuttons" script in the "tools" directory
-	  for creating web interface buttons (STR #2231)
-	- Added support for DNS-SD (aka "Bonjour") printer sharing
-	  (STR #1171)
-	- Job operations (cancel, hold, release, etc.) from the
-	  web interface now return back to the original page (STR
-	  #2239)
-	- The classes or printers list is now shown after a
-	  successful deletion from the web interface (STR #1999)
-	- The default configuration now allows browse packets from
-	  any address (STR #2008)
-	- The web interface now provides an "allow printing from the
-	  Internet" check box (STR #1897)
-	- The notify-events-default and
-	  notify-lease-duration-default attributes can now be set
-	  (STR #1671)
-	- Server-side default options are now sent to clients when
-	  the "printer-defaults" attribute group is requested (STR
-	  #1923)
-	- Added support for Linux "relro" linker option (STR #1614)
-	- CUPS now validates the number-up option value (STR #1329)
-	- The on-line help now provides better search capabilities
-	  (STR #1701)
-	- The web interface "Add This Printer" button now allows you
-	  to change the printer name, description,  and location
-	  (STR #1646)
-	- Added support for Mac OS X authorization services
-	  (STR #2206)
-	- Added support for driver-specific pre-filters (STR #2108)
-	- Added a new side-channel API for drivers and backends
-	  for basic device control and information queries (STR
-	  #1898)
-	- The scheduler now uses poll(), epoll(), or /dev/kqueue
-	  instead of select() when possible (STR #1261)
-	- Added new cupsArrayGetIndex() and cupsArrayGetInsert()
-	  functions to get the current index and insertion
-	  positions of an array.
-	- Added a new --with-max-copies configure option (STR
-	  #2090)
-	- Added new cupsRemoveDest() and cupsSetDefaultDest()
-	  functions.
-	- Added support for cupsPJLCharset attribute in PPD files
-	  which specifies the character set that is used in PJL
-	  strings (STR #1969)
-	- Moved the definition of the (private) _http_s structure
-	  to http-private.h; code that directly accesses the
-	  http_t members will no longer compile!
-	- Added support for setting the document-format-default
-	  attribute on a per-printer basis.
-	- Added support for IntelliBar label printers.

CREDITS.txt

@@ -1,46 +0,0 @@
-CREDITS.txt - 2007-09-10
-------------------------
-
-Few projects are completed by one person, and CUPS is no exception.  We'd
-like to thank the following individuals for their contributions:
-
-    Nathaniel Barbour              - Lots of testing and feedback.
-    N. Becker                      - setsid().
-    Philippe Combes                - French localization and buttons script.
-    Jean-Eric Cuendet              - GhostScript filters for CUPS.
-    Van Dang                       - HTTP and IPP policeman.
-    L. Peter Deutsch               - MD5 code.
-    Dr. ZP Han                     - setgid()/setuid().
-    Guy Harris                     - *BSD shared libraries and lots of other
-                                     fixes.
-    Bjoern Jacke                   - I18N stuff.
-    Wang Jian                      - CUPS RPM corrections.
-    Roderick Johnstone             - Beta tester of the millenium.
-    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
-    Kenshi Muto                    - Japanese localization, patches, and
-                                     testing.
-    Tomohiro Kato                  - Japanese localization.
-    Kiko                           - Bug fixes.
-    Sergey V. Kovalyov             - ESP Print Pro and CUPS beta tester.
-    Marek Laane                    - Estonian translation.
-    Mark Lawrence                  - Microsoft interoperability testing.
-    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
-    Jason McMullan                 - Original CUPS RPM distributions.
-    Wes Morgan                     - *BSD fixes.
-    Daniel Nylander                - Swedish localization.
-    Giulio Orsero                  - Bug fixes and testing.
-    Michal Osowiecki               - Polish localization.
-    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
-    Vincenzo Reale                 - Italian localization.
-    Petter Reinholdtsen            - HP-UX compiler stuff.
-    Juan Pablo González Riopedre   - Spanish localization.
-    Opher Shachar                  - Hebrew localization.
-    Stuart Stevens                 - HP JetDirect IPP information.
-    Andrea Suatoni                 - IRIX desktop integration and testing.
-    Teppo Turlianen                - Finnish localization.
-    Tim Waugh                      - Lots of patches, testing, and Linux
-                                     integration.
-    Yugami                         - LDAP browsing support.
-
-If I've missed someone, please let me know by sending an email to
-"msweet@apple.com".

INSTALL.txt

@@ -1,182 +0,0 @@
-INSTALL - CUPS v1.3.2 - 2007-09-18
-----------------------------------
-
-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".
-
-**** IF YOU HAVE A NON-POSTSCRIPT PRINTER AND ARE NOT       ****
-**** RUNNING MAC OS X, YOU WILL ALSO NEED TO INSTALL GPL    ****
-**** GHOSTSCRIPT WITH THE "cups" DRIVER AFTER YOU INSTALL   ****
-**** CUPS.                                                  ****
-
-
-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 several versions
-    of GCC 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. 
-    BSD users should use GNU make (gmake).
-
-    Besides these tools you'll want the JPEG, PNG, TIFF, and ZLIB
-    libraries for image support, the CDSA, GNU TLS, or OpenSSL
-    libraries for encryption support, and the OpenLDAP and
-    OpenSLP libraries for directory services support. CUPS will
-    compile and run without these, however you'll miss out on
-    many of the features provided by CUPS.
-
-    Kerberos support requires a very recent version of the MIT
-    implementation with the krb5_cc_new_unique() function or the
-    Heimdal implementation, along with the corresponding GSSAPI
-    pieces.
-
-    Also, please note that CUPS no longer includes the
-    Ghostscript- based pstoraster filter.  You *must* download
-    GPL Ghostscript separately from the CUPS web site if you want
-    to print PostScript files to non-PostScript printers on
-    operating systems other than Mac OS X.
-
-
-COMPILING FROM SUBVERSION
-
-    The CUPS Subversion repository doesn't hold a copy of the
-    pre-built configure script.  You'll need to run the GNU
-    autoconf software (2.52 or higher) before compiling the
-    software from Subversion:
-
-	autoconf -f
-
-
-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
-
-    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
-
-    To see a complete list of configuration options, use the
-    --help option:
-
-        ./configure --help
-
-    If any of the dependent libraries are not installed in a
-    system default location (typically "/usr/include" and
-    "/usr/lib") you'll need to set the CFLAGS, CPPFLAGS,
-    CXXFLAGS, DSOFLAGS, and LDFLAGS environment variables prior
-    to running configure:
-
-	setenv CFLAGS "-I/some/directory"
-	setenv CPPFLAGS "-I/some/directory"
-	setenv CXXFLAGS "-I/some/directory"
-	setenv DSOFLAGS "-L/some/directory"
-	setenv LDFLAGS "-L/some/directory"
-	./configure ...
-
-    or:
-
-	CFLAGS="-I/some/directory" \
-	CPPFLAGS="-I/some/directory" \
-	CXXFLAGS="-I/some/directory" \
-	DSOFLAGS="-L/some/directory" \
-	LDFLAGS="-L/some/directory" \
-	./configure ...
-
-    Once you have configured things, just type:
-
-	make ENTER
-
-    or if you have FreeBSD, NetBSD, or OpenBSD type:
-
-	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, NetBSD, or OpenBSD:
-
-	gmake install ENTER
-
-    You can also build binary packages that can be installed on
-    other machines using the RPM spec file
-    ("packaging/cups.spec") or EPM list file
-    ("packaging/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 EPM software is available 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, NetBSD, and OpenBSD.  The <format> target is one of
-    the following:
-
-	epm       - Builds a script + tarfile package
-	aix       - Builds an AIX package
-	bsd       - Builds a *BSD package
-	deb       - Builds a Debian package
-	depot     - Builds a HP-UX package (also swinstall)
-	inst      - Builds an IRIX package (also tardist)
-	osx       - Builds a MacOS X package
-	pkg       - Builds a Solaris package
-	rpm       - Builds a RPM package
-	setld     - Build a Tru64 UNIX package
-	slackware - Build a Slackware package
-	swinstall - Build a HP-UX package (also depot)
-	tardist   - Builds an IRIX package (also inst)
-
-
-REPORTING PROBLEMS
-
-    If you have problems, READ THE DOCUMENTATION FIRST!  If the
-    documentation does not solve your problems, please post a
-    message on the "cups.general" forum at:
-
-        http://www.cups.org/newsgroups.php
-
-    Include your operating system and version, compiler and
-    version, and any errors or problems you've run into. The
-    "config.log" file and the output from the configure script
-    and make 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.

Makedefs.in

@@ -1,276 +0,0 @@
-#
-# "$Id$"
-#
-#   Common makefile definitions for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-#
-# Programs...
-#
-
-AR		=	@AR@
-AWK		=	@AWK@
-CC		=	@LIBTOOL@ @CC@
-CXX		=	@LIBTOOL@ @CXX@
-DSO		=	@DSO@
-HTMLDOC		=	@HTMLDOC@
-INSTALL		=	@INSTALL@
-LD		=	@LD@
-LIBTOOL		=	@LIBTOOL@
-LN		=	@LN@ -sf
-MV		=	@MV@
-PHPCONFIG	=	@PHPCONFIG@
-RANLIB		=	@RANLIB@
-RM		=	@RM@ -f
-RMDIR		=	@RMDIR@
-SED		=	@SED@
-SHELL		=	/bin/sh
-STRIP		=	@STRIP@
-
-#
-# Installation programs...
-#
-
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_CONFIG	=	$(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA	=	$(INSTALL) -m 644
-INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_MAN	=	$(INSTALL) -m 644
-INSTALL_SCRIPT	=	$(INSTALL) -m 755
-
-#
-# Default user, group, and system groups for the scheduler...
-#
-
-CUPS_USER	=	@CUPS_USER@
-CUPS_GROUP	=	@CUPS_GROUP@
-CUPS_SYSTEM_GROUPS =	@CUPS_SYSTEM_GROUPS@
-CUPS_PRIMARY_SYSTEM_GROUP =	@CUPS_PRIMARY_SYSTEM_GROUP@
-
-#
-# Default permissions...
-#
-
-CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
-CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
-
-#
-# Languages to install...
-#
-
-LANGUAGES	=	@LANGUAGES@
-INSTALL_LANGUAGES =	@INSTALL_LANGUAGES@
-UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
-
-#
-# Libraries...
-#
-
-LIBCUPS		=	@LIBCUPS@
-LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
-LIBJPEG		=	@LIBJPEG@
-LIBLDAP		=	@LIBLDAP@
-LIBMALLOC	=	@LIBMALLOC@
-LIBPAPER	=	@LIBPAPER@
-LIBPNG		=	@LIBPNG@
-LIBSLP		=	@LIBSLP@
-LIBGSSAPI	=	@LIBGSSAPI@
-LIBTIFF		=	@LIBTIFF@
-LIBZ		=	@LIBZ@
-
-#
-# Install static libraries?
-#
-
-INSTALLSTATIC	=	@INSTALLSTATIC@
-
-#
-# Program options...
-#
-# ARCHFLAGS     Defines the default architecture build options.
-# ARCH32FLAGS   Defines the 32-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# ARCH64FLAGS   Defines the 64-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# OPTIM         Defines the common compiler optimization/debugging options
-#               for all architectures.
-# OPTIONS       Defines other compile-time options (currently only -DDEBUG
-#               for extra debug info)
-#
-
-ALL_CFLAGS	=	$(CFLAGS) $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
-			$(OPTIONS)
-ARCHFLAGS	=	@ARCHFLAGS@
-ARFLAGS		=	@ARFLAGS@
-BACKLIBS	=	@BACKLIBS@
-CFLAGS		=	-I.. @CPPFLAGS@ @CFLAGS@ \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-COMMONLIBS	=	@LIBS@
-CUPSDLIBS	=	@CUPSDLIBS@
-CXXFLAGS	=	-I.. $(SSLFLAGS) @CPPFLAGS@ @CXXFLAGS@ \
-			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
-CXXLIBS		=	@CXXLIBS@
-DSOFLAGS	=	@DSOFLAGS@
-DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
-DNSSDLIBS	=	@DNSSDLIBS@
-FONTS		=	@FONTS@
-IMGLIBS		=	@IMGLIBS@
-IMGFILTERS	=	@IMGFILTERS@
-LAUNCHDLIBS	=	@LAUNCHDLIBS@
-LDFLAGS		=	-L../cups -L../filter @LDARCHFLAGS@ \
-			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-LEGACY_BACKENDS	=	@LEGACY_BACKENDS@
-LIBCUPSORDER	=	@LIBCUPSORDER@
-LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
-LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
-LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
-LIBS		=	$(LINKCUPS) $(COMMONLIBS)
-OPTIM		=	@OPTIM@
-OPTIONS		=
-PAMLIBS		=	@PAMLIBS@
-PAP		=	@PAP@
-PDFTOPS		=	@PDFTOPS@
-PHPDIR		=	@PHPDIR@
-SSLFLAGS	=	@SSLFLAGS@
-SSLLIBS		=	@SSLLIBS@
-
-#
-# Separate 32/64-bit library support...
-#
-
-ARCH32FLAGS	=	@ARCH32FLAGS@
-DSO32FLAGS	=	@DSO32FLAGS@
-INSTALL32	=	@INSTALL32@
-LIB32CUPS	=	@LIB32CUPS@
-LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
-LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
-UNINSTALL32	=	@UNINSTALL32@
-
-ARCH64FLAGS	=	@ARCH64FLAGS@
-DSO64FLAGS	=	@DSO64FLAGS@
-INSTALL64	=	@INSTALL64@
-LIB64CUPS	=	@LIB64CUPS@
-LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@
-LIB64DIR	=	$(BUILDROOT)@LIB64DIR@
-UNINSTALL64	=	@UNINSTALL64@
-
-#
-# Directories...
-#
-# The first section uses the GNU names (which are *extremely*
-# difficult to find in a makefile because they are lowercase...)
-# We have to define these first because autoconf uses ${prefix}
-# and ${exec_prefix} for most of the other directories...
-#
-# The "datarootdir" variable may not get defined if you are using
-# a version of autoconf prior to 2.60.
-#
-# This is immediately followed by definition in ALL CAPS for the
-# needed directories...
-#
-
-bindir		=	@bindir@
-datadir		=	@datadir@
-datarootdir	=	@datarootdir@
-exec_prefix	=	@exec_prefix@
-includedir	=	@includedir@
-infodir		=	@infodir@
-libdir		=	@libdir@
-libexecdir	=	@libexecdir@
-localstatedir	=	@localstatedir@
-mandir		=	@mandir@
-oldincludedir	=	@oldincludedir@
-prefix		=	@prefix@
-sbindir		=	@sbindir@
-sharedstatedir	=	@sharedstatedir@
-srcdir		=	@srcdir@
-sysconfdir	=	@sysconfdir@
-top_srcdir	=	@top_srcdir@
-
-BUILDROOT	=	$(DSTROOT)
-
-AMANDIR		=	$(BUILDROOT)@AMANDIR@
-BINDIR		=	$(BUILDROOT)@bindir@
-CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
-DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
-DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
-ICONDIR		=	@ICONDIR@
-INCLUDEDIR	=	$(BUILDROOT)$(includedir)
-INITDIR		=	@INITDIR@
-INITDDIR	=	@INITDDIR@
-LIBDIR		=	$(BUILDROOT)$(libdir)
-LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
-LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
-MANDIR		=	$(BUILDROOT)@mandir@
-MENUDIR		=	@MENUDIR@
-PMANDIR		=	$(BUILDROOT)@PMANDIR@
-RCLEVELS	=	@RCLEVELS@
-RCSTART		=	@RCSTART@
-RCSTOP		=	@RCSTOP@
-REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
-SBINDIR		=	$(BUILDROOT)@sbindir@
-SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
-SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
-STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
-XINETD		=	@XINETD@
-
-MAN1EXT		=	@MAN1EXT@
-MAN5EXT		=	@MAN5EXT@
-MAN7EXT		=	@MAN7EXT@
-MAN8EXT		=	@MAN8EXT@
-MAN8DIR		=	@MAN8DIR@
-
-PAMDIR		=	@PAMDIR@
-PAMFILE		=	@PAMFILE@
-
-DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
-DBUSDIR		=	@DBUSDIR@
-
-
-#
-# Rules...
-#
-
-.SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
-
-.c.o:
-	echo Compiling $<...
-	$(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $<
-
-.c.32.o:
-	echo Compiling 32-bit $<...
-	$(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-
-.c.64.o:
-	echo Compiling 64-bit $<...
-	$(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-
-.cxx.o:
-	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
-
-.man.1 .man.1m .man.5 .man.7 .man.8:
-	echo Linking $<...
-	$(RM) $@
-	$(LN) $< $@
-
-.man.1.gz .man.1m.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
-	echo -n Compressing $<...
-	$(RM) $@
-	gzip -v9 <$< >$@
-
-
-#
-# End of "$Id$"
-#

Makefile

@@ -1,285 +0,0 @@
-#
-# "$Id$"
-#
-#   Top-level Makefile for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-include Makedefs
-
-#
-# Directories to make...
-#
-
-DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
-		notifier $(PDFTOPS) scheduler systemv test \
-		$(PHPDIR) \
-		conf data doc $(FONTS) ppd templates
-
-
-#
-# Make all targets...
-#
-
-all:
-	chmod +x cups-config
-	for dir in $(DIRS); do\
-		echo Making all in $$dir... ;\
-		(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
-	done
-
-
-#
-# Remove object and target files...
-#
-
-clean:
-	for dir in $(DIRS); do\
-		echo Cleaning in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
-	done
-
-
-#
-# Remove all non-distribution files...
-#
-
-distclean:	clean
-	$(RM) Makedefs config.h config.log config.status
-	$(RM) cups-config conf/cupsd.conf conf/pam.std
-	$(RM) doc/help/ref-cupsd-conf.html doc/help/standard.html
-	$(RM) doc/index.html
-	$(RM) init/cups.sh init/cups-lpd
-	$(RM) man/client.conf.man
-	$(RM) man/cups-deviced.man man/cups-driverd.man
-	$(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-	$(RM) man/cupsd.conf.man man/lpoptions.man
-	$(RM) packaging/cups.list
-	$(RM) templates/header.tmpl
-	-$(RM) doc/*/index.html
-	-$(RM) templates/*/header.tmpl
-	-$(RM) -r autom4te*.cache
-
-
-#
-# Make dependencies
-#
-
-depend:
-	for dir in $(DIRS); do\
-		echo Making dependencies in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
-	done
-
-
-#
-# Generate a ctags file...
-#
-
-ctags:
-	ctags -R .
-
-
-#
-# Install object and target files...
-#
-
-install:	installhdrs
-	for dir in $(DIRS); do\
-		echo Installing in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
-	done
-	echo Installing cups-config script...
-	$(INSTALL_DIR) -m 755 $(BINDIR)
-	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-	if test "x$(INITDIR)" != x; then \
-		echo Installing init scripts...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		for level in $(RCLEVELS); do \
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
-			if test `uname` = HP-UX; then \
-				level=`expr $$level - 1`; \
-				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			fi; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
-		done; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
-	fi
-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
-		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			echo Installing StartupItems files...; \
-			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			echo Installing LaunchDaemons configuration files...; \
-			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
-			$(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
-			case `uname -r` in \
-				8.*) \
-				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
-				$(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \
-				$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \
-				$(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \
-				$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \
-				;; \
-			esac \
-		else \
-			echo Installing RC script...; \
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-		fi \
-	fi
-	if test "x$(DBUSDIR)" != x; then \
-		echo Installing cups.conf in $(DBUSDIR)...;\
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR)/system.d; \
-		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/system.d/cups.conf; \
-	fi
-	if test "x$(XINETD)" != x; then \
-		echo Installing xinetd configuration file for cups-lpd...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
-		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
-	fi
-	if test "x$(MENUDIR)" != x; then \
-		echo Installing desktop menu...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(MENUDIR); \
-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)$(MENUDIR); \
-	fi
-	if test "x$(ICONDIR)" != x; then \
-		echo Installing desktop icons...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps; \
-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)$(ICONDIR)/hicolor/16x16/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps; \
-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)$(ICONDIR)/hicolor/32x32/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps; \
-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps; \
-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
-	fi
-
-
-#
-# Install source and header files...
-#
-
-installsrc:
-	gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -
-
-installhdrs:
-	(cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
-	(cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
-
-
-#
-# Uninstall object and target files...
-#
-
-uninstall:
-	for dir in $(DIRS); do\
-		echo Uninstalling in $$dir... ;\
-		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
-	done
-	echo Uninstalling cups-config script...
-	$(RM) $(BINDIR)/cups-config
-	-$(RMDIR) $(BINDIR)
-	echo Uninstalling startup script...
-	if test "x$(INITDIR)" != x; then \
-		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		$(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
-		$(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(RM) $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-		$(RM) $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-		$(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-	fi
-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-			$(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-			$(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-			$(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-			$(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
-			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cupsd.plist; \
-			$(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cups-lpd.plist; \
-			$(RMDIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
-		else \
-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-		fi \
-		$(RMDIR) $(BUILDROOT)$(INITDDIR); \
-	fi
-	if test "x$(DBUSDIR)" != x; then \
-		echo Uninstalling cups.conf in $(DBUSDIR)...;\
-		$(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
-		$(RMDIR) $(BUILDROOT)$(DBUSDIR); \
-	fi
-	$(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
-	$(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png
-
-
-#
-# Run the test suite...
-#
-
-test:	all
-	echo Running CUPS test suite...
-	cd test; ./run-stp-tests.sh
-
-
-check:	all
-	echo Running CUPS test suite with defaults...
-	cd test; ./run-stp-tests.sh 1 0 n
-
-
-#
-# Make software distributions using EPM (http://www.easysw.com/epm/)...
-#
-
-EPMFLAGS	=	-v --output-dir dist $(EPMARCH)
-
-aix bsd deb depot inst pkg setld slackware swinstall tardist:
-	epm $(EPMFLAGS) -f $@ cups packaging/cups.list
-
-epm:
-	epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
-
-osx:
-	epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list
-
-rpm:
-	epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
-
-.PHONEY:	dist
-dist:	all
-	$(RM) -r dist
-	$(MAKE) $(MFLAGS) epm
-	case `uname` in \
-		*BSD*) $(MAKE) $(MFLAGS) bsd;; \
-		Darwin*) $(MAKE) $(MFLAGS) osx;; \
-		IRIX*) $(MAKE) $(MFLAGS) tardist;; \
-		Linux*) $(MAKE) $(MFLAGS) rpm;; \
-		SunOS*) $(MAKE) $(MFLAGS) pkg;; \
-	esac
-
-
-#
-# End of "$Id$".
-#

README.txt

@@ -1,174 +1,37 @@
-README - CUPS v1.3.2 - 2007-09-18
----------------------------------
+README.txt - 2016-03-15
+-----------------------
 
-Looking for compile instructions?  Read the file "INSTALL.txt"
-instead...
+This directory contains an automated build and test environment for CUPS.
 
 
-INTRODUCTION
+ENVIRONMENT
 
-    CUPS provides a portable printing layer for UNIX(r)-based
-    operating systems.  It was developed by Easy Software Products
-    and is now owned and maintained by Apple Inc. to promote a
-    standard printing solution for all UNIX vendors and users.  CUPS
-    provides the System V and Berkeley command-line interfaces.
+If present, the buildtest.env file sets additional shell variables for the
+build and test scripts described below.  The following variables are
+currently supported:
 
-    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 includes an image file RIP that supports printing of
-    image files to non-PostScript printers.  GPL Ghostscript now
-    includes the "cups" driver to support printing of PostScript
-    files within the CUPS driver framework.  Sample drivers for
-    Dymo, EPSON, HP, OKIDATA, and Zebra printers are included that
-    use these filters.
-
-    CUPS is licensed under the GNU General Public License and GNU
-    Library General Public License versions 2.
+    BUILDOPTIONS      - Configure options that are passed to each target
+    BUILDNOTIFY       - An email address or URL that specifies where the
+                        build log should be sent.
+    BUILDSUBJECT      - A string to include in the subject (default is empty
+                        string)
 
 
-READING THE DOCUMENTATION
+SCRIPTS
 
-    Once you have installed the software you can access the
-    documentation (and a bunch of other stuff) on-line at:
+The build.sh script builds the current stable branch of CUPS along with
+master ("latest"), running "make check" in each.  Normally you will run the
+script via a cron job:
 
-	http://localhost:631/
+    0   0   *   *   0   /path/to/build.sh --update --quiet clean all
+    0   0   *   *   1-6 /path/to/build.sh --update --quiet
 
-    If you're having trouble getting that far, the documentation
-    is located under the "doc/help" directory.
+The "--update" option tells build.sh to do an "git pull" prior to building.
 
-    Please read the documentation before asking questions.
+The "--quiet" option tells build.sh to work quietly and optionally send the
+build log via email or HTTP POST for recording, automated processing, etc.
 
-
-GETTING SUPPORT AND OTHER RESOURCES
-
-    If you have problems, READ THE DOCUMENTATION FIRST!  We also
-    provide many discussion forums which are available at:
-
-	http://www.cups.org/newsgroups.php
-
-    See the CUPS web site at "http://www.cups.org/" for other
-    site links.
-
-
-SETTING UP PRINTER QUEUES USING YOUR WEB BROWSER
-
-    CUPS 1.3 includes a web-based administration tool that allows
-    you to manage printers, classes, and jobs on your server. 
-    Open the following URL in your browser to access the printer
-    administration tools:
-
-	http://localhost:631/admin/
-
-    DO NOT use the hostname for your machine - it will not work
-    with the default CUPS configuration.  To enable
-    administration access on other addresses, check the "Allow
-    Remote Administration" box and click on the "Change Settings"
-    button.
-
-    You will be asked for the administration password (root or
-    any other user in the sys/system/root group on your system)
-    when performing any administrative function.
-
-
-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 includes several sample PPD files you can use:
-
-	Driver                         PPD File
-	-----------------------------  ------------
-	Dymo Label Printers            dymo.ppd
-	Intellitech Intellibar         intelbar.ppd
-	EPSON Stylus Color Series      stcolor.ppd
-	EPSON Stylus Photo Series      stphoto.ppd
-	EPSON Stylus New Color Series  stcolor2.ppd
-	EPSON Stylus New Photo Series  stphoto2.ppd
-	EPSON 9-pin Series             epson9.ppd
-	EPSON 24-pin Series            epson24.ppd
-	HP DeskJet Series              deskjet.ppd
-	HP LaserJet Series             laserjet.ppd
-	OKIDATA 9-Pin Series           okidata9.ppd
-	OKIDATA 24-Pin Series          okidat24.ppd
-	Zebra CPCL Label Printer       zebracpl.ppd
-	Zebra EPL1 Label Printer       zebraep1.ppd
-	Zebra EPL2 Label Printer       zebraep2.ppd
-	Zebra ZPL Label Printer        zebra.ppd
-
-    Run the "lpinfo" command to list the available printers:
-
-        lpinfo -v
-
-    Then use the correct URI to add the printer using the
-    "lpadmin" command:
-
-        lpadmin -p printername -E -v URI -m filename.ppd
-
-    Network printers typically use "socket" or "lpd" URIs:
-
-        lpadmin -p printername -E -v socket://11.22.33.44 -m filename.ppd
-        lpadmin -p printername -E -v lpd://11.22.33.44/ -m filename.ppd
-
-    The sample drivers provide basic printing capabilities, but
-    generally do not exercise the full potential of the printers
-    or CUPS.
-
-
-PRINTING FILES
-
-    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:
-
-	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.
-
-    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.
-
-
-LEGAL STUFF
-
-    CUPS is Copyright 2007 by Apple Inc.  CUPS, the CUPS logo, and
-    the Common UNIX Printing System are the trademark property of
-    Apple Inc.
-
-    The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
-
-    The PDF filter (pdftops) is based on the Xpdf software,
-    Copyright 1996-2005 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
-    "doc/help/license.html" or "LICENSE.txt" files for more
-    information.
+The "clean" and "all" options specify build targets; the default target is
+"all".  In the example above, the first line tells cron to run the script at
+midnight each day; Sunday (day 0) also does a clean build, while every other
+day only builds files that have changed.

backend/Dependencies

@@ -1,50 +0,0 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-betest.o: betest.c ../cups/string.h ../config.h
-ipp.o: ipp.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h ../cups/backend.h \
-  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/language.h ../cups/i18n.h \
-  ../cups/transcode.h ../cups/string.h
-lpd.o: lpd.c ../cups/backend.h ../cups/http-private.h ../config.h \
-  ../cups/http.h ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h \
-  ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-pap.o: pap.c ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
-  ../cups/backend.h ../cups/sidechannel.h ../cups/i18n.h \
-  ../cups/transcode.h
-parallel.o: parallel.c backend-private.h ../cups/backend.h \
-  ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
-  ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
-  ../config.h
-scsi.o: scsi.c ../cups/backend.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
-  ../config.h scsi-linux.c
-serial.o: serial.c backend-private.h ../cups/backend.h \
-  ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
-  ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
-  ../config.h
-snmp.o: snmp.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../cups/array.h \
-  ../cups/file.h
-socket.o: socket.c ../cups/http-private.h ../config.h ../cups/http.h \
-  ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h \
-  ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h
-test1284.o: test1284.c ../cups/string.h ../config.h ieee1284.c \
-  backend-private.h ../cups/backend.h ../cups/sidechannel.h \
-  ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h
-usb.o: usb.c ../cups/backend.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h \
-  ../cups/transcode.h usb-unix.c ieee1284.c backend-private.h \
-  ../cups/sidechannel.h ../cups/debug.h

backend/Makefile

@@ -1,223 +0,0 @@
-#
-# "$Id$"
-#
-#   Backend makefile for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-#   This file is subject to the Apple OS-Developed Software exception.
-#
-
-include ../Makedefs
-
-RBACKENDS =	ipp lpd
-UBACKENDS =	$(PAP) $(LEGACY_BACKENDS) serial snmp socket usb
-TARGETS	=	betest test1284 libbackend.a $(RBACKENDS) $(UBACKENDS)
-LIBOBJS	=	ieee1284.o runloop.o
-OBJS	=	betest.o ipp.o lpd.o pap.o parallel.o scsi.o \
-		serial.o snmp.o socket.o test1284.o usb.o
-
-
-#
-# Make all targets...
-#
-
-all:	$(TARGETS)
-
-
-#
-# Clean all object files...
-#
-
-clean:
-	$(RM) $(OBJS) $(TARGETS) $(LIBOBJS) http
-
-
-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
-#
-# Install all targets...
-#
-
-install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
-	for file in $(RBACKENDS); do \
-		$(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
-	done
-	for file in $(UBACKENDS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-	done
-	$(RM) $(SERVERBIN)/backend/http
-	$(LN) ipp $(SERVERBIN)/backend/http
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Uninstall all targets...
-#
-
-uninstall:
-	for file in $(RBACKENDS) $(UBACKENDS); do \
-		$(RM) $(SERVERBIN)/backend/$$file; \
-	done
-	$(RM) $(SERVERBIN)/backend/http
-	-$(RMDIR) $(SERVERBIN)/backend
-	-$(RMDIR) $(SERVERBIN)
-
-
-#
-# betest
-#
-
-betest:	betest.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o betest betest.o $(LIBS)
-
-
-#
-# test1284
-#
-
-test1284:	test1284.o ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o test1284 test1284.o ../cups/libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# libbackend.a
-#
-
-libbackend.a:	$(LIBOBJS)
-	echo Archiving $@...
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-
-#
-# ieee1394
-#
-
-ieee1394:	ieee1394.o ieee1394-linux.o
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ieee1394 ieee1394.o ieee1394-linux.o -lraw1394 $(LIBS)
-
-ieee1394.o:		ieee1394.h
-ieee1394-linux.o:	ieee1394.h
-
-
-#
-# ipp
-#
-
-ipp:	ipp.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
-	$(RM) http
-	$(LN) ipp http
-
-
-#
-# lpd
-#
-
-lpd:	lpd.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)
-
-
-#
-# pap
-#
-
-pap:	pap.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o pap pap.o $(BACKLIBS) $(LIBS) -framework AppleTalk
-
-
-#
-# parallel
-#
-
-parallel:	parallel.o ../cups/$(LIBCUPS) libbackend.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o parallel parallel.o libbackend.a $(LIBS)
-
-
-#
-# scsi
-#
-
-scsi:	scsi.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o scsi scsi.o $(LIBS)
-
-scsi.o:	scsi.c scsi-irix.c scsi-linux.c
-
-
-#
-# serial
-#
-
-serial:	serial.o ../cups/$(LIBCUPS) libbackend.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o serial serial.o libbackend.a $(BACKLIBS) $(LIBS)
-
-
-#
-# snmp
-#
-
-snmp:	snmp.o ../cups/$(LIBCUPS) libbackend.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
-
-
-#
-# socket
-#
-
-socket:	socket.o ../cups/$(LIBCUPS) libbackend.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
-
-
-#
-# usb
-#
-
-usb:	usb.o ../cups/$(LIBCUPS) libbackend.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(BACKLIBS) $(LIBS)
-usb.o:	usb.c usb-darwin.c usb-unix.c
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
-
-
-#
-# End of "$Id$".
-#

backend/backend-private.h

@@ -1,69 +0,0 @@
-/*
- * "$Id$"
- *
- *   Backend support definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- */
-
-#ifndef _CUPS_BACKEND_PRIVATE_H_
-#  define _CUPS_BACKEND_PRIVATE_H_
-
-
-/*
- * Include necessary headers.
- */
-
-#  include <cups/backend.h>
-#  include <cups/sidechannel.h>
-#  include <cups/cups.h>
-#  include <cups/debug.h>
-#  include <cups/i18n.h>
-#  include <stdlib.h>
-#  include <errno.h>
-#  include <cups/string.h>
-#  include <signal.h>
-
-
-/*
- * C++ magic...
- */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif /* __cplusplus */
-
-
-/*
- * Prototypes...
- */
-
-extern int	backendDrainOutput(int print_fd, int device_fd);
-extern int	backendGetDeviceID(int fd, char *device_id, int device_id_size,
-		                   char *make_model, int make_model_size,
-				   const char *scheme, char *uri, int uri_size);
-extern int	backendGetMakeModel(const char *device_id, char *make_model,
-			            int make_model_size);
-extern ssize_t	backendRunLoop(int print_fd, int device_fd, int use_bc,
-		               void (*side_cb)(int print_fd, int device_fd,
-			                       int use_bc));
-
-
-#  ifdef __cplusplus
-}
-#  endif /* __cplusplus */
-#endif /* !_CUPS_BACKEND_PRIVATE_H_ */
-
-
-/*
- * End of "$Id$".
- */

backend/betest.c

@@ -1,78 +0,0 @@
-/*
- * "$Id$"
- *
- *   Backend test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Run the named backend.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <unistd.h>
-
-
-/*
- * 'main()' - Run the named backend.
- *
- * Usage:
- *
- *    betest device-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  char		backend[255];	/* Method in URI */
-
-
-  if (argc < 7 || argc > 8)
-  {
-    fputs("Usage: betest device-uri job-id user title copies options [file]\n",
-          stderr);
-    return (1);
-  }
-
- /*
-  * Extract the method from the device-uri - that's the program we want to
-  * execute.
-  */
-
-  if (sscanf(argv[1], "%254[^:]", backend) != 1)
-  {
-    fputs("betest: Bad device-uri - no colon!\n", stderr);
-    return (1);
-  }
-
- /*
-  * Execute and return
-  */
-
-  execl(backend, argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7],
-        NULL);
-
-  return (1);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/easysw-firewire-design.txt

@@ -1,71 +0,0 @@
-Preliminary Design for CUPS Firewire Printer Backend - 03/19/2002
------------------------------------------------------------------
-
-OVERVIEW
-
-    Easy Software Products will develop an IEEE-1394, a.k.a.
-    Firewire, printing interface for its Common UNIX Printing
-    System ("CUPS") for initial use under the Linux operating
-    system.  A follow-on implementation for MacOS X is
-    anticipated as well.
-
-    The operating system interfaces for IEEE-1394 ports vary
-    widely; the CUPS printing interface will abstract the OS
-    layer to a simpler interface geared towards discovering,
-    opening, reading from, writing to, and closing IEEE-1394
-    printers.
-
-    The initial development of the CUPS backend will be targeted
-    at the EPSON Stylus Pro 10000 large format printer, which
-    requires the bandwidth provided by Firewire in order to
-    print at full speed.  This printer supports printing via
-    Serial Bus Protocol 2 (SBP-2) using the SCSI and PWG command
-    sets. The CUPS backend will implement the PWG command set on
-    LUN 0 only.
-
-
-OS ABSTRACTION LAYER
-
-    The OS abstraction layer will be a thin client library that
-    implements the following functions:
-
-        ieee1394_list
-	ieee1394_open
-	ieee1394_close
-	ieee1394_read
-	ieee1394_write
-	ieee1394_error
-
-    The "ieee1394_list" function will list all of the available
-    printer devices on the bus.  The device information will
-    consist of the device URI (ieee1394:/something) used to
-    access the device and the make and model information, if
-    available, for the device ("EPSON Stylus Printer").
-
-    The "ieee1394_open" and "ieee1394_close" functions will open
-    and close a connection to the printer, respectively.
-
-    The "ieee1394_read" and "ieee1394_write" functions will read
-    and write data to and from the printer, respectively.  The
-    read function will be non-blocking, returning data only if
-    there is data coming back from the printer.
-
-    The "ieee1394_error" function will return a string
-    describing the last error or NULL if no error occurred.
-
-    The library will be responsible for creating any background
-    threads that are needed to monitor the connection to the
-    printer.
-
-
-CUPS BACKEND
-
-    The CUPS backend will use the OS abstraction layer to list
-    and access the Firewire printers.  The "main" function will
-    read and write printer data, while the "list_devices"
-    function will be called as necessary to identify the
-    available devices.
-
-    The CUPS 1.1 backend will record any status information in
-    the error log file, while the 1.2 backend will supply it to
-    the printer driver process.

backend/easysw-firewire-linux.txt

@@ -1,35 +0,0 @@
-Easy Software Products
-44141 Airport View Drive
-Suite 204
-Hollywood, Maryland 20636
-+1.301.373.9600
-March 8, 2002
-
-
-Subject: EPSON Firewire Printer Driver for Linux
-
-Currently, no Firewire printer support exists for Linux.  Since
-the latest EPSON printer products depend on the Firewire
-interface to print at full speed, a solution is needed to
-support customers using Linux as their server platform.
-
-The Linux Firewire subsystem provides a user-mode driver
-interface that allows driver programs to access Firewire
-devices.  Easy Software Products will utilize this interface to
-develop a "backend" program for the Common UNIX Printing System
-that will allow users to print to EPSON printers using the
-Firewire interface.
-
-After examining the Linux interface, we estimate that it will
-require approximately 30 hours of development time to write,
-test, and document the Firewire backend, for a total cost of
-$3,000. The new backend will become a standard part of the CUPS
-software distribution and will be included with at least the
-following Linux distributions:
-
-    - Caldera Linux
-    - Mandrake Linux
-    - Red Hat Linux
-    - SuSE Linux
-
-ESP will provide EPSON with binaries for Red Hat Linux 7.2.

backend/ieee1284.c

@@ -1,579 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendGetDeviceID()  - Get the IEEE-1284 device ID string and
- *                           corresponding URI.
- *   backendGetMakeModel() - Get the make and model string from the device ID.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-
-#ifdef __linux
-#  include <sys/ioctl.h>
-#  include <linux/lp.h>
-#  define IOCNR_GET_DEVICE_ID		1
-#  define LPIOC_GET_DEVICE_ID(len)	_IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-#  include <linux/parport.h>
-#  include <linux/ppdev.h>
-#  include <unistd.h>
-#  include <fcntl.h>
-#endif /* __linux */
-
-#ifdef __sun
-#  ifdef __sparc
-#    include <sys/ecppio.h>
-#  else
-#    include <sys/ioccom.h>
-#    include <sys/ecppsys.h>
-#  endif /* __sparc */
-#endif /* __sun */
-
-
-/*
- * 'backendGetDeviceID()' - Get the IEEE-1284 device ID string and
- *                          corresponding URI.
- */
-
-int					/* O - 0 on success, -1 on failure */
-backendGetDeviceID(
-    int        fd,			/* I - File descriptor */
-    char       *device_id,		/* O - 1284 device ID */
-    int        device_id_size,		/* I - Size of buffer */
-    char       *make_model,		/* O - Make/model */
-    int        make_model_size,		/* I - Size of buffer */
-    const char *scheme,			/* I - URI scheme */
-    char       *uri,			/* O - Device URI */
-    int        uri_size)		/* I - Size of buffer */
-{
-  char	*attr,				/* 1284 attribute */
-  	*delim,				/* 1284 delimiter */
-	*uriptr,			/* Pointer into URI */
-	manufacturer[256],		/* Manufacturer string */
-	serial_number[1024];		/* Serial number string */
-  int	manulen;			/* Length of manufacturer string */
-#ifdef __linux
-  int	length;				/* Length of device ID info */
-  int   got_id = 0;
-#endif /* __linux */
-#if defined(__sun) && defined(ECPPIOC_GETDEVID)
-  struct ecpp_device_id did;		/* Device ID buffer */
-#endif /* __sun && ECPPIOC_GETDEVID */
-
-
-  DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, "
-                "make_model=%p, make_model_size=%d, scheme=\"%s\", "
-		"uri=%p, uri_size=%d)\n", fd, device_id, device_id_size,
-		make_model, make_model_size, scheme ? scheme : "(null)",
-		uri, uri_size));
-
- /*
-  * Range check input...
-  */
-
-  if (!device_id || device_id_size < 32)
-  {
-    DEBUG_puts("backendGetDeviceID: Bad args!");
-    return (-1);
-  }
-
-  if (make_model)
-    *make_model = '\0';
-
-  if (fd >= 0)
-  {
-   /*
-    * Get the device ID string...
-    */
-
-    *device_id = '\0';
-
-#ifdef __linux
-  if (ioctl(fd, LPIOC_GET_DEVICE_ID(device_id_size), device_id))
-  {
-   /*
-    * Linux has to implement things differently for every device it seems.
-    * Since the standard parallel port driver does not provide a simple
-    * ioctl() to get the 1284 device ID, we have to open the "raw" parallel
-    * device corresponding to this port and do some negotiation trickery
-    * to get the current device ID.
-    */
-
-    if (uri && !strncmp(uri, "parallel:/dev/", 14))
-    {
-      char	devparport[16];		/* /dev/parportN */
-      int	devparportfd,		/* File descriptor for raw device */
-		status,			/* ioctl status */
-		mode;			/* Port mode */
-
-
-     /*
-      * Since the Linux parallel backend only supports 4 parallel port
-      * devices, just grab the trailing digit and use it to construct a
-      * /dev/parportN filename...
-      */
-
-      snprintf(devparport, sizeof(devparport), "/dev/parport%s",
-               uri + strlen(uri) - 1);
-
-      if ((devparportfd = open(devparport, O_RDWR | O_NOCTTY)) != -1)
-      {
-       /*
-        * Claim the device...
-        */
-
-	if (!ioctl(devparportfd, PPCLAIM))
-	{
-          fcntl(devparport, F_SETFL, fcntl(devparportfd, F_GETFL) | O_NONBLOCK);
-
-	  mode = IEEE1284_MODE_COMPAT;
-
-	  if (!ioctl(devparportfd, PPNEGOT, &mode))
-	  {
-	   /*
-	    * Put the device into Device ID mode...
-	    */
-
-	    mode = IEEE1284_MODE_NIBBLE | IEEE1284_DEVICEID;
-
-	    if (!ioctl(devparportfd, PPNEGOT, &mode))
-	    {
-	     /*
-	      * Read the 1284 device ID...
-	      */
-
-	      if ((length = read(devparportfd, device_id,
-	                         device_id_size - 1)) >= 2)
-              {
-	        device_id[length] = '\0';
-	        got_id = 1;
-	      }
-	    }
-	  }
-
-         /*
-	  * Release the device...
-	  */
-
-	  ioctl(devparportfd, PPRELEASE);
-	}
-
-        close(devparportfd);
-      }
-    }
-  }
-  else
-    got_id = 1;
-
-  if (got_id)
-    {
-     /*
-      * Extract the length of the device ID string from the first two
-      * bytes.  The 1284 spec says the length is stored MSB first...
-      */
-
-      length = (((unsigned)device_id[0] & 255) << 8) +
-	       ((unsigned)device_id[1] & 255);
-
-     /*
-      * Check to see if the length is larger than our buffer; first
-      * assume that the vendor incorrectly implemented the 1284 spec,
-      * and then limit the length to the size of our buffer...
-      */
-
-      if (length > (device_id_size - 2))
-	length = (((unsigned)device_id[1] & 255) << 8) +
-		 ((unsigned)device_id[0] & 255);
-
-      if (length > (device_id_size - 2))
-	length = device_id_size - 2;
-
-     /*
-      * Copy the device ID text to the beginning of the buffer and
-      * nul-terminate.
-      */
-
-      memmove(device_id, device_id + 2, length);
-      device_id[length] = '\0';
-    }
-#  ifdef DEBUG
-    else
-      printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
-#  endif /* DEBUG */
-#endif /* __linux */
-
-#if defined(__sun) && defined(ECPPIOC_GETDEVID)
-    did.mode = ECPP_CENTRONICS;
-    did.len  = device_id_size - 1;
-    did.rlen = 0;
-    did.addr = device_id;
-
-    if (!ioctl(fd, ECPPIOC_GETDEVID, &did))
-    {
-     /*
-      * Nul-terminate the device ID text.
-      */
-
-      if (did.rlen < (device_id_size - 1))
-	device_id[did.rlen] = '\0';
-      else
-	device_id[device_id_size - 1] = '\0';
-    }
-#  ifdef DEBUG
-    else
-      printf("backendGetDeviceID: ioctl failed - %s\n", strerror(errno));
-#  endif /* DEBUG */
-#endif /* __sun && ECPPIOC_GETDEVID */
-  }
-
-  DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id));
-
-  if (scheme && uri)
-    *uri = '\0';
-
-  if (!*device_id)
-    return (-1);
-
- /*
-  * Get the make and model...
-  */
-
-  if (make_model)
-    backendGetMakeModel(device_id, make_model, make_model_size);
-
- /*
-  * Then generate a device URI...
-  */
-
-  if (scheme && uri && uri_size > 32)
-  {
-   /*
-    * Look for the serial number field...
-    */
-
-    if ((attr = strstr(device_id, "SERN:")) != NULL)
-      attr += 5;
-    else if ((attr = strstr(device_id, "SERIALNUMBER:")) != NULL)
-      attr += 13;
-    else if ((attr = strstr(device_id, ";SN:")) != NULL)
-      attr += 4;
-
-    if (attr)
-    {
-      strlcpy(serial_number, attr, sizeof(serial_number));
-
-      if ((delim = strchr(serial_number, ';')) != NULL)
-	*delim = '\0';
-    }
-    else
-      serial_number[0] = '\0';
-
-   /*
-    * Generate the device URI from the manufacturer, make_model, and
-    * serial number strings.
-    */
-
-    snprintf(uri, uri_size, "%s://", scheme);
-
-    if ((attr = strstr(device_id, "MANUFACTURER:")) != NULL)
-      attr += 13;
-    else if ((attr = strstr(device_id, "Manufacturer:")) != NULL)
-      attr += 13;
-    else if ((attr = strstr(device_id, "MFG:")) != NULL)
-      attr += 4;
-
-    if (attr)
-    {
-      strlcpy(manufacturer, attr, sizeof(manufacturer));
-
-      if ((delim = strchr(manufacturer, ';')) != NULL)
-        *delim = '\0';
-
-      if (!strcasecmp(manufacturer, "Hewlett-Packard"))
-        strcpy(manufacturer, "HP");
-      else if (!strcasecmp(manufacturer, "Lexmark International"))
-        strcpy(manufacturer, "Lexmark");
-    }
-    else
-    {
-      strlcpy(manufacturer, make_model, sizeof(manufacturer));
-
-      if ((delim = strchr(manufacturer, ' ')) != NULL)
-        *delim = '\0';
-    }
-
-    manulen = strlen(manufacturer);
-
-    for (uriptr = uri + strlen(uri), delim = manufacturer;
-	 *delim && uriptr < (uri + uri_size - 3);
-	 delim ++)
-      if (*delim == ' ')
-      {
-	*uriptr++ = '%';
-	*uriptr++ = '2';
-	*uriptr++ = '0';
-      }
-      else
-	*uriptr++ = *delim;
-
-    *uriptr++ = '/';
-
-    if (!strncasecmp(make_model, manufacturer, manulen))
-    {
-      delim = make_model + manulen;
-
-      while (isspace(*delim & 255))
-        delim ++;
-    }
-    else
-      delim = make_model;
-
-    for (; *delim && uriptr < (uri + uri_size - 3); delim ++)
-      if (*delim == ' ')
-      {
-	*uriptr++ = '%';
-	*uriptr++ = '2';
-	*uriptr++ = '0';
-      }
-      else
-	*uriptr++ = *delim;
-
-    if (serial_number[0])
-    {
-     /*
-      * Add the serial number to the URI...
-      */
-
-      strlcpy(uriptr, "?serial=", uri_size - (uriptr - uri));
-      strlcat(uriptr, serial_number, uri_size - (uriptr - uri));
-    }
-    else
-      *uriptr = '\0';
-  }
-
-  return (0);
-}
-
-
-/*
- * 'backendGetMakeModel()' - Get the make and model string from the device ID.
- */
-
-int					/* O - 0 on success, -1 on failure */
-backendGetMakeModel(
-    const char *device_id,		/* O - 1284 device ID */
-    char       *make_model,		/* O - Make/model */
-    int        make_model_size)		/* I - Size of buffer */
-{
-  char	*attr,				/* 1284 attribute */
-  	*delim,				/* 1284 delimiter */
-	*mfg,				/* Manufacturer string */
-	*mdl;				/* Model string */
-
-
-  DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", "
-                "make_model=%p, make_model_size=%d)\n", device_id,
-		make_model, make_model_size));
-
- /*
-  * Range check input...
-  */
-
-  if (!device_id || !*device_id || !make_model || make_model_size < 32)
-  {
-    DEBUG_puts("backendGetMakeModel: Bad args!");
-    return (-1);
-  }
-
-  *make_model = '\0';
-
- /*
-  * Look for the description field...
-  */
-
-  if ((attr = strstr(device_id, "DES:")) != NULL)
-    attr += 4;
-  else if ((attr = strstr(device_id, "DESCRIPTION:")) != NULL)
-    attr += 12;
-
-  if (attr)
-  {
-   /*
-    * Make sure the description contains something useful, since some
-    * printer manufacturers (HP) apparently don't follow the standards
-    * they helped to define...
-    *
-    * Here we require the description to be 8 or more characters in length,
-    * containing at least one space and one letter.
-    */
-
-    if ((delim = strchr(attr, ';')) == NULL)
-      delim = attr + strlen(attr);
-
-    if ((delim - attr) < 8)
-      attr = NULL;
-    else
-    {
-      char	*ptr;			/* Pointer into description */
-      int	letters,		/* Number of letters seen */
-		spaces;			/* Number of spaces seen */
-
-
-      for (ptr = attr, letters = 0, spaces = 0; ptr < delim; ptr ++)
-      {
-        if (isspace(*ptr & 255))
-	  spaces ++;
-	else if (isalpha(*ptr & 255))
-	  letters ++;
-
-        if (spaces && letters)
-	  break;
-      }
-
-      if (!spaces || !letters)
-        attr = NULL;
-    }
-  }
-
-  if ((mfg = strstr(device_id, "MANUFACTURER:")) != NULL)
-    mfg += 13;
-  else if ((mfg = strstr(device_id, "Manufacturer:")) != NULL)
-    mfg += 13;
-  else if ((mfg = strstr(device_id, "MFG:")) != NULL)
-    mfg += 4;
-
-  if ((mdl = strstr(device_id, "MODEL:")) != NULL)
-    mdl += 6;
-  else if ((mdl = strstr(device_id, "Model:")) != NULL)
-    mdl += 6;
-  else if ((mdl = strstr(device_id, "MDL:")) != NULL)
-    mdl += 4;
-
-  if (mdl)
-  {
-   /*
-    * Build a make-model string from the manufacturer and model attributes...
-    */
-
-    if (mfg)
-    {
-      if (!strncasecmp(mfg, "Hewlett-Packard", 15))
-	strlcpy(make_model, "HP", make_model_size);
-      else if (!strncasecmp(mfg, "Lexmark International", 21))
-	strlcpy(make_model, "Lexmark", make_model_size);
-      else
-	strlcpy(make_model, mfg, make_model_size);
-
-      if ((delim = strchr(make_model, ';')) != NULL)
-	*delim = '\0';
-
-      if (!strncasecmp(make_model, mdl, strlen(make_model)))
-      {
-       /*
-	* Just copy model string, since it has the manufacturer...
-	*/
-
-	strlcpy(make_model, mdl, make_model_size);
-      }
-      else
-      {
-       /*
-	* Concatenate the make and model...
-	*/
-
-	strlcat(make_model, " ", make_model_size);
-	strlcat(make_model, mdl, make_model_size);
-      }
-    }
-    else
-    {
-     /*
-      * Just copy model string, since it has the manufacturer...
-      */
-
-      strlcpy(make_model, mdl, make_model_size);
-    }
-  }
-  else if (attr)
-  {
-   /*
-    * Use description...
-    */
-
-    if (!strncasecmp(attr, "Hewlett-Packard hp ", 19))
-    {
-     /*
-      * Check for a common HP bug...
-      */
-
-      strlcpy(make_model, "HP ", make_model_size);
-      strlcpy(make_model + 3, attr + 19, make_model_size - 3);
-    }
-    else if (!strncasecmp(attr, "Hewlett-Packard ", 16))
-    {
-      strlcpy(make_model, "HP ", make_model_size);
-      strlcpy(make_model + 3, attr + 16, make_model_size - 3);
-    }
-    else
-    {
-      strlcpy(make_model, attr, make_model_size);
-    }
-  }
-  else
-  {
-   /*
-    * Use "Unknown" as the printer make and model...
-    */
-
-    strlcpy(make_model, "Unknown", make_model_size);
-  }
-
- /*
-  * Strip trailing data...
-  */
-
-  if ((delim = strchr(make_model, ';')) != NULL)
-    *delim = '\0';
-
- /*
-  * Strip trailing whitespace...
-  */
-
-  for (delim = make_model + strlen(make_model) - 1; delim >= make_model; delim --)
-    if (isspace(*delim & 255))
-      *delim = '\0';
-    else
-      break;
-
- /*
-  * Return...
-  */
-
-  if (make_model[0])
-    return (0);
-  else
-    return (-1);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/ieee1394-linux.c

@@ -1,878 +0,0 @@
-/*
- * "$Id$"
- *
- *   Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   get_device_id()  - Get the IEEE-1284 device ID for a node...
- *   get_unit_type()  - Get the unit type for a node...
- *   show_data()      - Show a data node...
- *   show_dir()       - Show a directory list...
- *   ieee1394_list()  - List the available printer devices.
- *   ieee1394_open()  - Open a printer device.
- *   ieee1394_close() - Close a printer device.
- *   ieee1394_read()  - Read from a printer device.
- *   ieee1394_write() - Write data to a printer device.
- *   ieee1394_error() - Return the last error.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "ieee1394.h"
-#include <cups/debug.h>
-#include <libraw1394/raw1394.h>
-#include <libraw1394/csr.h>
-
-
-/*
- * Limits...
- */
-
-#define MAX_NODES	100
-
-
-/*
- * Structures...
- */
-
-typedef struct
-{
-  char			uri[HTTP_MAX_URI],/* URI for this node... */
-			description[128],/* Description of port */
-			make_model[128];/* Make and model */
-  int			port,		/* Port where this node is found */
-			node;		/* Node number */
-  unsigned long long	addr;		/* Management address */
-} linux1394_node_t;
-
-typedef struct
-{
-  raw1394handle_t	handle;		/* Handle for printer device */
-  int			node;		/* Node number for printer device */
-  unsigned long long	addr;		/* Management address */
-} linux1394_dev_t;
-
-
-/*
- * ORB messages for communication with the device...
- */
-
-typedef struct		/**** Login ORB Message */
-{
-  unsigned char		passwd_addr[8];	/* Password address */
-  unsigned char		resp_addr[8];	/* Login response address */
-  unsigned char		notify_excl;	/* Notify and exclusive bits */
-  unsigned char		recon_func;	/* Reconnect time and function */
-  unsigned char		lun[2];		/* Logical unit number */
-  unsigned char		passwd_len[2];	/* Length of password */
-  unsigned char		resp_len[2];	/* Length of login response */
-  unsigned char		fifo_addr[8];	/* Local status FIFO address */
-} login_orb_t;
-
-typedef struct		/**** Login Response Message ****/
-{
-  unsigned char		length[2];	/* Length of response */
-  unsigned char		login_id[2];	/* Login ID */
-  unsigned char		cmd_addr[8];	/* Command block agent address */
-  unsigned char		reserved[2];	/* Reserved (0) */
-  unsigned char		recon_hold[2];	/* Number of seconds to hold login */
-} login_resp_t;
-
-
-/*
- * Local globals...
- */
-
-static char		error_string[1024] = "";
-static int		num_nodes;
-static linux1394_node_t	nodes[MAX_NODES];
-
-
-/*
- * 'get_device_id()' - Get the IEEE-1284 device ID for a node...
- */
-
-static char *				/* O - Device ID */
-get_device_id(raw1394handle_t    handle,/* I - Handle for device */
-              int                node,	/* I - Node number */
-	      unsigned long long offset,/* I - Offset to directory */
-	      char               *id,	/* O - ID string */
-	      int                idlen)	/* I - Size of ID string */
-{
-  unsigned char		data[1024],	/* Data from ROM */
-			*dataptr;	/* Pointer into data */
-  int			length;		/* Length of directory */
-  int			datalen;	/* Length of data */
-  unsigned long long	dataoff;	/* Offset of data */
-
-
-  DEBUG_printf(("get_device_id(handle = %p, node = %d, offset = %llx, id = %p, idlen = %d)\n",
-                handle, node, offset, id, idlen));
-
-  *id = '\0';
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (NULL);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or device tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (NULL);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_device_id(handle, node, offset, id, idlen));
-    }
-    else if (data[0] == 0x81)
-    {
-     /*
-      * Found potential IEEE-1284 device ID...
-      */
-
-      dataoff = offset + (((((data[1] << 8) | data[2]) << 8) | data[3]) << 2);
-
-      if (raw1394_read(handle, 0xffc0 | node, dataoff, 4, (quadlet_t *)data) < 0)
-	return (NULL);
-
-      dataoff += 4;
-
-     /*
-      * Read the leaf value...
-      */
-
-      datalen = (data[0] << 8) | data[1];
-
-      if (datalen > (sizeof(data) / 4))
-        datalen = sizeof(data) / 4;
-
-      for (dataptr = data; datalen > 0; datalen --, dataptr += 4, dataoff += 4)
-	if (raw1394_read(handle, 0xffc0 | node, dataoff, 4,
-	                 (quadlet_t *)dataptr) < 0)
-	  return (NULL);
-
-      if (data[0] == 0 && memcmp(data + 8, "MFG:", 4) == 0)
-      {
-       /*
-        * Found the device ID...
-	*/
-
-        datalen = dataptr - data - 8;
-	if (datalen >= idlen)
-	  datalen --;
-
-	memcpy(id, data + 8, datalen);
-	id[datalen] = '\0';
-
-        return (id);
-      }
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'get_man_addr()' - Get the management address for a node...
- */
-
-static int				/* O - Unit type */
-get_man_addr(raw1394handle_t    handle,	/* I - Handle for device */
-             int                node,	/* I - Node number */
-	     unsigned long long offset)	/* I - Offset to directory */
-{
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of directory */
-
-
-  DEBUG_printf(("get_man_addr(handle = %p, node = %d, offset = %llx)\n",
-                handle, node, offset));
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (-1);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or type tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (-1);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_man_addr(handle, node, offset));
-    }
-    else if (data[0] == 0x54)
-    {
-     /*
-      * Found the management address...
-      */
-
-      return (((((data[1] << 8) | data[2]) << 8) | data[3]) << 2);
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (-1);
-}
-
-
-/*
- * 'get_unit_type()' - Get the unit type for a node...
- */
-
-static int				/* O - Unit type */
-get_unit_type(raw1394handle_t    handle,/* I - Handle for device */
-              int                node,	/* I - Node number */
-	      unsigned long long offset)/* I - Offset to directory */
-{
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of directory */
-
-
-  DEBUG_printf(("get_unit_type(handle = %p, node = %d, offset = %llx)\n",
-                handle, node, offset));
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return (-1);
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
-  DEBUG_printf(("    length = %d\n", length));
-
- /*
-  * Then read the directory, looking for unit directory or type tags...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return (-1);
-
-    DEBUG_printf(("    data = %02X %02X %02X %02X\n", data[0], data[1],
-                  data[2], data[3]));
-
-    if (data[0] == 0xd1)
-    {
-     /*
-      * Found the unit directory...
-      */
-
-      offset += ((((data[1] << 8) | data[2]) << 8) | data[3]) << 2;
-
-      return (get_unit_type(handle, node, offset));
-    }
-    else if (data[0] == 0x14)
-    {
-     /*
-      * Found the unit type...
-      */
-
-      return (data[1] & 0x1f);
-    }
-
-    offset += 4;
-    length --;
-  }
-
-  return (-1);
-}
-
-
-#ifdef DEBUG
-/*
- * 'show_data()' - Show a data node...
- */
-
-static void
-show_data(raw1394handle_t    handle,	/* I - Handle for device */
-          int                node,	/* I - Node number */
-	  unsigned long long offset,	/* I - Offset to directory */
-	  int                indent)	/* Amount to indent */
-{
-  int		i;			/* Looping var */
-  unsigned char	data[4];		/* Data from ROM */
-  int		length;			/* Length of data */
-
-
- /*
-  * Read the data length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return;
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
- /*
-  * Then read the data...
-  */
-
-  for (i = 0; i < indent; i ++)
-    putchar(' ');
-
-  printf("LEAF (%d quadlets)\n", length);
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return;
-
-    for (i = 0; i < indent; i ++)
-      putchar(' ');
-
-    printf("%02X %02X %02X %02X    '%c%c%c%c'\n",
-           data[0], data[1], data[2], data[3],
-           (data[0] < ' ' || data[0] >= 0x7f) ? '.' : data[0],
-           (data[1] < ' ' || data[1] >= 0x7f) ? '.' : data[1],
-           (data[2] < ' ' || data[2] >= 0x7f) ? '.' : data[2],
-           (data[3] < ' ' || data[3] >= 0x7f) ? '.' : data[3]);
-
-    offset += 4;
-    length --;
-  }
-}
-
-
-/*
- * 'show_dir()' - Show a directory list...
- */
-
-static void
-show_dir(raw1394handle_t    handle,	/* I - Handle for device */
-         int                node,	/* I - Node number */
-	 unsigned long long offset,	/* I - Offset to directory */
-	 int                indent)	/* Amount to indent */
-{
-  int			i;		/* Looping var */
-  unsigned char		data[4];	/* Data from ROM */
-  int			length;		/* Length of directory */
-  int			value;		/* Value in directory */
-
-
- /*
-  * Read the directory length from the first quadlet...
-  */
-
-  if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-    return;
-
-  offset += 4;
-
- /*
-  * The length is in the upper 16 bits...
-  */
-
-  length = (data[0] << 8) | data[1];
-
- /*
-  * Then read the directory...
-  */
-
-  while (length > 0)
-  {
-    if (raw1394_read(handle, 0xffc0 | node, offset, 4, (quadlet_t *)data) < 0)
-      return;
-
-    for (i = 0; i < indent; i ++)
-      putchar(' ');
-
-    printf("%02X %02X %02X %02X\n", data[0], data[1], data[2], data[3]);
-
-    value = (((data[1] << 8) | data[2]) << 8) | data[3];
-
-    switch (data[0] & 0xc0)
-    {
-      case 0x00 :
-	  for (i = -4; i < indent; i ++)
-	    putchar(' ');
-
-          printf("IMMEDIATE %d\n", value);
-	  break;
-
-      case 0x40 :
-	  for (i = -4; i < indent; i ++)
-	    putchar(' ');
-
-          printf("CSR OFFSET +%06X\n", value);
-	  break;
-
-      case 0x80 :
-          show_data(handle, node, offset + value * 4, indent + 4);
-	  break;
-
-      case 0xc0 :
-          show_dir(handle, node, offset + value * 4, indent + 4);
-	  break;
-    }
-
-    offset += 4;
-    length --;
-  }
-}
-#endif /* DEBUG */
-
-
-/*
- * 'ieee1394_list()' - List the available printer devices.
- */
-
-ieee1394_info_t	*			/* O - Printer information */
-ieee1394_list(int *num_devices)		/* O - Number of printers */
-{
-  int			i, j;		/* Looping vars */
-  raw1394handle_t	handle;		/* 1394 handle */
-  int			num_ports;	/* Number of ports */
-  struct raw1394_portinfo ports[100];	/* Port data... */
-  unsigned char		guid[8];	/* Global unique ID */
-  int			vendor;		/* Vendor portion of GUID */
-  int			unit_type;	/* Unit type */
-  int			addr;		/* Management address offset */
-  char			id[1024],	/* Device ID string */
-			*idptr,		/* Pointer into ID string */
-			*idsep;		/* Pointer to separator */
-  ieee1394_info_t	*devices;	/* Device list */
-
-
- /*
-  * Connect to the user-mode driver interface...
-  */
-
-  handle    = raw1394_new_handle();
-  num_ports = raw1394_get_port_info(handle, ports,
-                                    sizeof(ports) / sizeof(ports[0]));
-
-  DEBUG_printf(("num_ports = %d\n", num_ports));
-
- /*
-  * Loop through the ports to discover what nodes are available.
-  */
-
-  num_nodes = 0;
-
-  for (i = 0; i < num_ports; i ++)
-  {
-    DEBUG_printf(("ports[%d] = { nodes = %d, name = \"%s\" }\n", i,
-                  ports[i].nodes, ports[i].name));
-
-    raw1394_set_port(handle, i);
-
-    for (j = 0; j < ports[i].nodes; j ++)
-    {
-      if (raw1394_read(handle, 0xffc0 | j,
-                       CSR_REGISTER_BASE + CSR_CONFIG_ROM + 12, 4,
-		       (quadlet_t *)guid) < 0)
-      {
-        DEBUG_printf(("    Node #%d: Unable to contact (%s)!\n", j,
-	              strerror(errno)));
-        continue;
-      }
-      else
-      {
-        raw1394_read(handle, 0xffc0 | j,
-                     CSR_REGISTER_BASE + CSR_CONFIG_ROM + 16, 4,
-	             (quadlet_t *)(guid + 4));
-
-        DEBUG_printf(("    Node #%d: GUID = %02X%02X%02X%02X%02X%02X%02X%02X\n",
-		      j, guid[0], guid[1], guid[2], guid[3], guid[4],
-		      guid[5], guid[6], guid[7]));
-
-        vendor    = (((guid[0] << 8) | guid[1]) << 8) | guid[2];
-        unit_type = get_unit_type(handle, j,
-	                          CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20);
-
-        DEBUG_printf(("vendor = %x, unit_type = %d\n", vendor, unit_type));
-
-        if (unit_type == 2 && num_nodes < MAX_NODES)
-	{
-	 /*
-	  * Found a printer device; add it to the nodes list...
-	  */
-
-#ifdef DEBUG
-          show_dir(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20, 0);
-#endif /* DEBUG */
-
-          memset(nodes + num_nodes, 0, sizeof(linux1394_node_t));
-
-          sprintf(nodes[num_nodes].uri, "ieee1394://%02X%02X%02X%02X%02X%02X%02X%02X",
-		  guid[0], guid[1], guid[2], guid[3], guid[4],
-		  guid[5], guid[6], guid[7]);
-
-          nodes[num_nodes].port = i;
-	  nodes[num_nodes].node = j;
-
-          addr = get_man_addr(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20);
-
-          if (addr < 0)
-	    continue;
-
-          nodes[num_nodes].addr = CSR_REGISTER_BASE + addr;
-
-          DEBUG_printf(("Node address = %llx\n", nodes[num_nodes].addr));
-
-          get_device_id(handle, j, CSR_REGISTER_BASE + CSR_CONFIG_ROM + 20,
-	                id, sizeof(id));
-
-          if (id[0])
-	  {
-	   /*
-	    * Grab the manufacturer and model name from the device ID
-	    * string...
-	    */
-
-            idptr = id + 4;
-            idsep = strchr(id, ';');
-	    if (idsep)
-	      *idsep++ = '\0';
-	    else
-	      idsep = idptr;
-
-	    snprintf(nodes[num_nodes].description,
-	             sizeof(nodes[num_nodes].description),
-		     "%s Firewire Printer", idptr);
-
-            if ((idptr = strstr(idsep, "DES:")) == NULL)
-	      idptr = strstr(idsep, "MDL:");
-
-            if (idptr == NULL)
-              strcpy(nodes[num_nodes].make_model, "Unknown");
-	    else
-	    {
-	     /*
-	      * Grab the DES or MDL code...
-	      */
-
-	      idptr += 4;
-	      idsep = strchr(idptr, ';');
-	      if (idsep)
-	        *idsep = '\0';
-
-              if (strncmp(id + 4, idptr, strlen(id + 4)) == 0)
-	      {
-	       /*
-	        * Use the description directly...
-		*/
-
-        	strlcpy(nodes[num_nodes].make_model, idptr,
-	        	sizeof(nodes[num_nodes].make_model));
-              }
-	      else
-	      {
-	       /*
-	        * Add the manufacturer to the front of the name...
-		*/
-
-        	snprintf(nodes[num_nodes].make_model,
-	        	 sizeof(nodes[num_nodes].make_model),
-			 "%s %s", id + 4, idptr);
-              }
-            }
-	  }
-	  else
-	  {
-	   /*
-	    * Flag it as an unknown printer...
-	    */
-
-	    sprintf(nodes[num_nodes].description,
-	            "Unknown%06X Firewire Printer", vendor);
-            strcpy(nodes[num_nodes].make_model, "Unknown");
-	  }
-
-	  num_nodes ++;
-	}
-      }
-    }
-  }
-
- /*
-  * Done querying the Firewire bus...
-  */
-
-  raw1394_destroy_handle(handle);
-
- /*
-  * Build an array of device info structures as needed...
-  */
-
-  if (num_devices == NULL)
-    return (NULL);
-
-  *num_devices = num_nodes;
-
-  if (num_nodes)
-  {
-    if ((devices = calloc(sizeof(ieee1394_info_t), num_nodes)) != NULL)
-    {
-      for (i = 0; i < num_nodes; i ++)
-      {
-        strcpy(devices[i].uri, nodes[i].uri);
-	strcpy(devices[i].description, nodes[i].description);
-	strcpy(devices[i].make_model, nodes[i].make_model);
-      }
-    }
-
-    return (devices);
-  }
-  else
-    return (NULL);
-}
-
-
-/*
- * 'ieee1394_open()' - Open a printer device.
- */
-
-ieee1394_dev_t				/* O - Printer device or NULL */
-ieee1394_open(const char *uri)		/* I - Device URI */
-{
-  int			i;		/* Looping var */
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
- /*
-  * Return early if we can't see any printers...
-  */
-
-  if (num_nodes == 0)
-    ieee1394_list(NULL);
-
-  if (num_nodes == 0)
-  {
-    strcpy(error_string, "No IEEE-1394 printers found!");
-    return (NULL);
-  }
-
- /*
-  * Look for the URI...
-  */
-
-  for (i = 0; i < num_nodes; i ++)
-    if (strcmp(nodes[i].uri, uri) == 0)
-      break;
-
-  if (i >= num_nodes)
-  {
-    snprintf(error_string, sizeof(error_string), "Device %s not found!", uri);
-    return (NULL);
-  }
-
- /*
-  * Now create a new device structure...
-  */
-
-  if ((ldev = calloc(sizeof(linux1394_dev_t), 1)) == NULL)
-  {
-    strcpy(error_string, "Out of memory!");
-    return (NULL);
-  }
-
-  ldev->handle = raw1394_new_handle();
-  ldev->node   = nodes[i].node;
-  ldev->addr   = nodes[i].addr;
-
-  raw1394_set_port(ldev->handle, nodes[i].port);
-
-  error_string[0] = '\0';
-
-  return ((ieee1394_dev_t)ldev);
-}
-
-
-/*
- * 'ieee1394_close()' - Close a printer device.
- */
-
-int					/* O - 0 on success, -1 on failure */
-ieee1394_close(ieee1394_dev_t dev)	/* I - Printer device */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-  raw1394_destroy_handle(ldev->handle);
-
-  free(ldev);
-
-  return (0);
-}
-
-
-/*
- * 'ieee1394_read()' - Read from a printer device.
- */
-
-int					/* O - Number of bytes read or -1 */
-ieee1394_read(ieee1394_dev_t dev,	/* I - Printer device */
-              char           *buffer,	/* I - Read buffer */
-	      int            len)	/* I - Max bytes to read */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-
-  return (0);
-}
-
-
-/*
- * 'ieee1394_write()' - Write data to a printer device.
- */
-
-int					/* O - Number of bytes written or -1 */
-ieee1394_write(ieee1394_dev_t dev,	/* I - Printer device */
-               char           *buffer,	/* I - Buffer to write */
-	       int            len)	/* I - Number of bytes to write */
-{
-  linux1394_dev_t	*ldev;		/* Linux device */
-
-
-  ldev = (linux1394_dev_t *)dev;
-
-
-/*  if (raw1394_write(handle, 0xffc0 | j, 0, ,
-		       (quadlet_t *)guid) < 0)*/
-
-  return (len);
-}
-
-
-/*
- * 'ieee1394_error()' - Return the last error.
- */
-
-const char *				/* O - Error string or NULL */
-ieee1394_error(void)
-{
-  if (error_string[0])
-    return (error_string);
-  else
-    return (NULL);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/ieee1394.c

@@ -1,268 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1394 backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   main()         - Send a file to the printer.
- *   list_devices() - List all known printer devices...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "ieee1394.h"
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-
-
-/*
- * 'main()' - Send a file to the printer.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  ieee1394_dev_t dev;		/* Printer device */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		rbytes;		/* Number of bytes read from device */
-  size_t	nbytes,		/* Number of bytes read from file */
-		tbytes;		/* Total number of bytes written */
-  char		buffer[8192];	/* Input/output buffer */
-#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();
-
-    return (0);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
-            argv[0]);
-    return (1);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((fp = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (1);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Try to open the printer device...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-    if ((dev = ieee1394_open(argv[0])) == NULL)
-    {
-      fputs("INFO: Firewire printer busy; will retry in 30 seconds...\n", stderr);
-      sleep(30);
-    }
-  }
-  while (dev == NULL);
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (argc < 7)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  while (copies > 0)
-  {
-    copies --;
-
-    if (fp != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(fp, 0, SEEK_SET);
-    }
-
-    tbytes = 0;
-    while ((nbytes = read(fp, buffer, sizeof(buffer))) > 0)
-    {
-     /*
-      * Write the print data to the printer...
-      */
-
-      tbytes += nbytes;
-
-      if (ieee1394_write(dev, buffer, nbytes) < 0)
-      {
-	perror("ERROR: Unable to send print file to printer");
-	break;
-      }
-
-      if ((rbytes = ieee1394_read(dev, buffer, sizeof(buffer))) > 0)
-        fprintf(stderr, "INFO: Read %d bytes from printer...\n", rbytes);
-
-      if (argc > 6)
-	fprintf(stderr, "INFO: Sending print file, %lu bytes...\n",
-	        (unsigned long)tbytes);
-    }
-  }
-
- /*
-  * Close the printer device and input file and return...
-  */
-
-  ieee1394_close(dev);
-
-  if (fp != 0)
-    close(fp);
-
-  fputs("INFO: Ready to print.\n", stderr);
-
-  return (0);
-}
-
-
-/*
- * 'list_devices()' - List all known devices...
- */
-
-void
-list_devices(void)
-{
-  int			i,		/* Looping var */
-			num_info;	/* Number of devices */
-  ieee1394_info_t	*info;		/* Devices... */
-
-
- /*
-  * Get the available devices...
-  */
-
-  info = ieee1394_list(&num_info);
-
- /*
-  * List them as needed...
-  */
-
-  if (num_info > 0)
-  {
-    for (i = 0; i < num_info; i ++)
-      printf("direct %s \"%s\" \"%s\"\n", info[i].uri,
-             info[i].make_model, info[i].description);
-
-    free(info);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

backend/ieee1394.h

@@ -1,104 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1394 header for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2002 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <cups/string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#endif /* WIN32 */
-
-
-/*
- * Device information structure...
- */
-
-typedef struct
-{
-  char	uri[HTTP_MAX_URI],	/* Device URI */
-	description[128],	/* Description of port */
-	make_model[128];	/* Make and model */
-} ieee1394_info_t;
-
-
-/*
- * Private device connection information...
- */
-
-typedef void	*ieee1394_dev_t;
-
-
-/*
- * Prototypes for standard IEEE-1394 interface...
- */
-
-extern ieee1394_info_t	*ieee1394_list(int *num_devices);
-extern ieee1394_dev_t	ieee1394_open(const char *uri);
-extern int		ieee1394_close(ieee1394_dev_t dev);
-extern int		ieee1394_read(ieee1394_dev_t dev, char *buffer, int len);
-extern int		ieee1394_write(ieee1394_dev_t dev, char *buffer, int len);
-extern const char	*ieee1394_error(void);
-
-
-/*
- * End of "$Id$".
- */

backend/parallel.c

@@ -1,674 +0,0 @@
-/*
- * "$Id$"
- *
- *   Parallel port backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()         - Send a file to the specified parallel port.
- *   list_devices() - List all parallel devices.
- *   side_cb()      - Handle side-channel requests...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  include <termios.h>
-#  include <sys/socket.h>
-#endif /* WIN32 */
-
-#ifdef __sgi
-#  include <invent.h>
-#  ifndef INV_EPP_ECP_PLP
-#    define INV_EPP_ECP_PLP	6	/* From 6.3/6.4/6.5 sys/invent.h */
-#    define INV_ASO_SERIAL	14	/* serial portion of SGI ASO board */
-#    define INV_IOC3_DMA	16	/* DMA mode IOC3 serial */
-#    define INV_IOC3_PIO	17	/* PIO mode IOC3 serial */
-#    define INV_ISA_DMA		19	/* DMA mode ISA serial -- O2 */
-#  endif /* !INV_EPP_ECP_PLP */
-#endif /* __sgi */
-
-
-/*
- * Local functions...
- */
-
-static void	list_devices(void);
-static void	side_cb(int print_fd, int device_fd, int use_bc);
-
-
-/*
- * 'main()' - Send a file to the specified parallel port.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])			/* I - Command-line arguments */
-{
-  char		method[255],		/* Method in URI */
-		hostname[1024],		/* Hostname */
-		username[255],		/* Username info (not used) */
-		resource[1024],		/* Resource info (device and options) */
-		*options;		/* Pointer to options */
-  int		port;			/* Port number (not used) */
-  int		print_fd,		/* Print file */
-		device_fd,		/* Parallel device */
-		use_bc;			/* Read back-channel data? */
-  int		copies;			/* Number of copies to print */
-  size_t	tbytes;			/* Total number of bytes written */
-  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);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (CUPS_BACKEND_OK);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    _cupsLangPrintf(stderr,
-		    _("Usage: %s job-id user title copies options [file]\n"),
-		    argv[0]);
-    return (CUPS_BACKEND_FAILED);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    print_fd = 0;
-    copies   = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Extract the device name and options from the URI...
-  */
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
-
- /*
-  * See if there are any options...
-  */
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-  }
-
- /*
-  * Open the parallel port device...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-#if defined(__linux) || defined(__FreeBSD__)
-   /*
-    * The Linux and FreeBSD parallel port drivers currently are broken WRT
-    * select() and bidirection I/O...
-    */
-
-    device_fd = open(resource, O_WRONLY | O_EXCL);
-    use_bc    = 0;
-
-#else
-    if ((device_fd = open(resource, O_RDWR | O_EXCL)) < 0)
-    {
-      device_fd = open(resource, O_WRONLY | O_EXCL);
-      use_bc    = 0;
-    }
-    else
-      use_bc = 1;
-#endif /* __linux || __FreeBSD__ */
-
-    if (device_fd == -1)
-    {
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
-      if (errno == EBUSY)
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
-	sleep(30);
-      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT)
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer not connected; will retry in 30 "
-		        "seconds...\n"));
-	sleep(30);
-      }
-      else
-      {
-	_cupsLangPrintf(stderr,
-		        _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
-      }
-    }
-  }
-  while (device_fd < 0);
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Set any options provided...
-  */
-
-  tcgetattr(device_fd, &opts);
-
-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-
-  /**** No options supported yet ****/
-
-  tcsetattr(device_fd, TCSANOW, &opts);
-
- /*
-  * Finally, send the print file...
-  */
-
-  tbytes = 0;
-
-  while (copies > 0 && tbytes >= 0)
-  {
-    copies --;
-
-    if (print_fd != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(print_fd, 0, SEEK_SET);
-    }
-
-    tbytes = backendRunLoop(print_fd, device_fd, use_bc, side_cb);
-
-    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
-  }
-
- /*
-  * Close the socket connection and input file and return...
-  */
-
-  close(device_fd);
-
-  if (print_fd != 0)
-    close(print_fd);
-
-  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
-}
-
-
-/*
- * 'list_devices()' - List all parallel devices.
- */
-
-static 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 */
-	basedevice[255],	/* Base device filename for ports */
-	device_id[1024],	/* Device ID string */
-	make_model[1024],	/* Make and model */
-	uri[1024];		/* Device URI */
-
-
-  if (!access("/dev/parallel/", 0))
-    strcpy(basedevice, "/dev/parallel/");
-  else if (!access("/dev/printers/", 0))
-    strcpy(basedevice, "/dev/printers/");
-  else
-    strcpy(basedevice, "/dev/lp");
-
-  for (i = 0; i < 4; i ++)
-  {
-   /*
-    * Open the port, if available...
-    */
-
-    sprintf(device, "%s%d", basedevice, i);
-    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-      fd = open(device, O_WRONLY);
-
-    if (fd >= 0)
-    {
-     /*
-      * Now grab the IEEE 1284 device ID string...
-      */
-
-      snprintf(uri, sizeof(uri), "parallel:%s", device);
-
-      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
-                              make_model, sizeof(make_model),
-			      NULL, uri, sizeof(uri)))
-	printf("direct %s \"%s\" \"%s LPT #%d\" \"%s\"\n", uri,
-	       make_model, make_model, i + 1, device_id);
-      else
-	printf("direct %s \"Unknown\" \"LPT #%d\"\n", uri, i + 1);
-
-      close(fd);
-    }
-  }
-#elif defined(__sgi)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-  inventory_t	*inv;		/* Hardware inventory info */
-
-
- /*
-  * IRIX maintains a hardware inventory of most devices...
-  */
-
-  setinvent();
-
-  while ((inv = getinvent()) != NULL)
-  {
-    if (inv->inv_class == INV_PARALLEL &&
-        (inv->inv_type == INV_ONBOARD_PLP ||
-         inv->inv_type == INV_EPP_ECP_PLP))
-    {
-     /*
-      * Standard parallel port...
-      */
-
-      puts("direct parallel:/dev/plp \"Unknown\" \"Onboard Parallel Port\"");
-    }
-    else if (inv->inv_class == INV_PARALLEL &&
-             inv->inv_type == INV_EPC_PLP)
-    {
-     /*
-      * EPC parallel port...
-      */
-
-      printf("direct parallel:/dev/plp%d \"Unknown\" \"Integral EPC parallel port, Ebus slot %d\"\n",
-             inv->inv_controller, inv->inv_controller);
-    }
-  }
-
-  endinvent();
-
- /*
-  * Central Data makes serial and parallel "servers" that can be
-  * connected in a number of ways.  Look for ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)		/* EtherLite */
-          sprintf(device, "/dev/lpn%d%c", j, funky_hex[n]);
-        else if (i == 9)	/* PCI */
-          sprintf(device, "/dev/lpp%d%c", j, funky_hex[n]);
-        else			/* SCSI */
-          sprintf(device, "/dev/lp%d%d%c", i, j, funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-	  else if (i == 9)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data PCI Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__sun)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard parallel ports...
-  */
-
-  for (i = 0; i < 10; i ++)
-  {
-    sprintf(device, "/dev/ecpp%d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"Sun IEEE-1284 Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
-  for (i = 0; i < 10; i ++)
-  {
-    sprintf(device, "/dev/bpp%d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"Sun Standard Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
-  for (i = 0; i < 3; i ++)
-  {
-    sprintf(device, "/dev/lp%d", i);
-
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"PC Parallel Port #%d\"\n",
-             device, i + 1);
-  }
-
- /*
-  * MAGMA parallel ports...
-  */
-
-  for (i = 0; i < 40; i ++)
-  {
-    sprintf(device, "/dev/pm%02d", i);
-    if (access(device, 0) == 0)
-      printf("direct parallel:%s \"Unknown\" \"MAGMA Parallel Board #%d Port #%d\"\n",
-             device, (i / 10) + 1, (i % 10) + 1);
-  }
-
- /*
-  * Central Data parallel ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/sts/lpN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/sts/lp%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__hpux)
-  int		i, j, n;	/* Looping vars */
-  char		device[255];	/* Device filename */
-
-
- /*
-  * Standard parallel ports...
-  */
-
-  if (access("/dev/rlp", 0) == 0)
-    puts("direct parallel:/dev/rlp \"Unknown\" \"Standard Parallel Port (/dev/rlp)\"");
-
-  for (i = 0; i < 7; i ++)
-    for (j = 0; j < 7; j ++)
-    {
-      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);
-    }
-
- /*
-  * Central Data parallel ports...
-  */
-
-  for (i = 0; i < 9; i ++)
-    for (j = 0; j < 8; j ++)
-      for (n = 0; n < 32; n ++)
-      {
-        if (i == 8)	/* EtherLite */
-          sprintf(device, "/dev/lpN%d%c", j, funky_hex[n]);
-        else
-          sprintf(device, "/dev/lp%c%d%c", i + 'C', j,
-                  funky_hex[n]);
-
-	if (access(device, 0) == 0)
-	{
-	  if (i == 8)
-	    printf("direct parallel:%s \"Unknown\" \"Central Data EtherLite Parallel Port, ID %d, port %d\"\n",
-	           device, j, n);
-  	  else
-	    printf("direct parallel:%s \"Unknown\" \"Central Data SCSI Parallel Port, logical bus %d, ID %d, port %d\"\n",
-	           device, i, j, n);
-	}
-      }
-#elif defined(__osf__)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 3; i ++)
-  {
-    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);
-    }
-  }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 3; i ++)
-  {
-    sprintf(device, "/dev/lpt%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (interrupt-driven)\"\n", device, i + 1);
-    }
-
-    sprintf(device, "/dev/lpa%d", i);
-    if ((fd = open(device, O_WRONLY)) >= 0)
-    {
-      close(fd);
-      printf("direct parallel:%s \"Unknown\" \"Parallel Port #%d (polled)\"\n", device, i + 1);
-    }
-  }
-#elif defined(_AIX)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255];		/* Device filename */
-
-
-  for (i = 0; i < 8; i ++)
-  {
-    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);
-    }
-  }
-#endif
-}
-
-
-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int print_fd,			/* I - Print file */
-        int device_fd,			/* I - Device file */
-	int use_bc)			/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else if (tcdrain(device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        memset(data, 0, sizeof(data));
-
-        if (backendGetDeviceID(device_fd, data, sizeof(data) - 1,
-	                       NULL, 0, NULL, NULL, 0))
-        {
-	  status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	  datalen = 0;
-	}
-	else
-        {
-	  status  = CUPS_SC_STATUS_OK;
-	  datalen = strlen(data);
-	}
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/runloop.c

@@ -1,378 +0,0 @@
-/*
- * "$Id$"
- *
- *   Common run loop APIs for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   backendDrainOutput() - Drain pending print data to the device.
- *   backendRunLoop()     - Read and write print and back-channel data.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "backend-private.h"
-#ifdef __hpux
-#  include <sys/time.h>
-#else
-#  include <sys/select.h>
-#endif /* __hpux */
-
-
-/*
- * 'backendDrainOutput()' - Drain pending print data to the device.
- */
-
-int					/* O - 0 on success, -1 on error */
-backendDrainOutput(int print_fd,	/* I - Print file descriptor */
-                   int device_fd)	/* I - Device file descriptor */
-{
-  int		nfds;			/* Maximum file descriptor value + 1 */
-  fd_set	input;			/* Input set for reading */
-  ssize_t	print_bytes,		/* Print bytes read */
-		bytes;			/* Bytes written */
-  char		print_buffer[8192],	/* Print data buffer */
-		*print_ptr;		/* Pointer into print data buffer */
-  struct timeval timeout;		/* Timeout for read... */
-
-
-  fprintf(stderr, "DEBUG: backendDrainOutput(print_fd=%d, device_fd=%d)\n",
-          print_fd, device_fd);
-
- /*
-  * Figure out the maximum file descriptor value to use with select()...
-  */
-
-  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
-
- /*
-  * Now loop until we are out of data from print_fd...
-  */
-
-  for (;;)
-  {
-   /*
-    * Use select() to determine whether we have data to copy around...
-    */
-
-    FD_ZERO(&input);
-    FD_SET(print_fd, &input);
-
-    timeout.tv_sec  = 0;
-    timeout.tv_usec = 0;
-
-    if (select(nfds, &input, NULL, NULL, &timeout) < 0)
-      return (-1);
-
-    if (!FD_ISSET(print_fd, &input))
-      return (0);
-
-    if ((print_bytes = read(print_fd, print_buffer,
-			    sizeof(print_buffer))) < 0)
-    {
-     /*
-      * Read error - bail if we don't see EAGAIN or EINTR...
-      */
-
-      if (errno != EAGAIN || errno != EINTR)
-      {
-	perror("ERROR: Unable to read print data");
-	return (-1);
-      }
-
-      print_bytes = 0;
-    }
-    else if (print_bytes == 0)
-    {
-     /*
-      * End of file, return...
-      */
-
-      return (0);
-    }
-
-    fprintf(stderr, "DEBUG: Read %d bytes of print data...\n",
-	    (int)print_bytes);
-
-    for (print_ptr = print_buffer; print_bytes > 0;)
-    {
-      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
-      {
-       /*
-        * Write error - bail if we don't see an error we can retry...
-	*/
-
-        if (errno != ENOSPC && errno != ENXIO && errno != EAGAIN &&
-	    errno != EINTR && errno != ENOTTY)
-	{
-	  _cupsLangPrintf(stderr, _("ERROR: Unable to write print data: %s\n"),
-			  strerror(errno));
-	  return (-1);
-	}
-      }
-      else
-      {
-        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
-
-        print_bytes -= bytes;
-	print_ptr   += bytes;
-      }
-    }
-  }
-}
-
-
-/*
- * 'backendRunLoop()' - Read and write print and back-channel data.
- */
-
-ssize_t					/* O - Total bytes on success, -1 on error */
-backendRunLoop(
-    int  print_fd,			/* I - Print file descriptor */
-    int  device_fd,			/* I - Device file descriptor */
-    int  use_bc,			/* I - Use back-channel? */
-    void (*side_cb)(int, int, int))	/* I - Side-channel callback */
-{
-  int		nfds;			/* Maximum file descriptor value + 1 */
-  fd_set	input,			/* Input set for reading */
-		output;			/* Output set for writing */
-  ssize_t	print_bytes,		/* Print bytes read */
-		bc_bytes,		/* Backchannel bytes read */
-		total_bytes,		/* Total bytes written */
-		bytes;			/* Bytes written */
-  int		paperout;		/* "Paper out" status */
-  int		offline;		/* "Off-line" status */
-  char		print_buffer[8192],	/* Print data buffer */
-		*print_ptr,		/* Pointer into print data buffer */
-		bc_buffer[1024];	/* Back-channel data buffer */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-  fprintf(stderr,
-          "DEBUG: backendRunLoop(print_fd=%d, device_fd=%d, use_bc=%d, "
-	  "side_cb=%p)\n",
-          print_fd, device_fd, use_bc, side_cb);
-
- /*
-  * If we are printing data from a print driver on stdin, ignore SIGTERM
-  * so that the driver can finish out any page data, e.g. to eject the
-  * current page.  We only do this for stdin printing as otherwise there
-  * is no way to cancel a raw print job...
-  */
-
-  if (!print_fd)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
- /*
-  * Figure out the maximum file descriptor value to use with select()...
-  */
-
-  nfds = (print_fd > device_fd ? print_fd : device_fd) + 1;
-
- /*
-  * Now loop until we are out of data from print_fd...
-  */
-
-  for (print_bytes = 0, print_ptr = print_buffer, offline = -1,
-           paperout = -1, total_bytes = 0;;)
-  {
-   /*
-    * Use select() to determine whether we have data to copy around...
-    */
-
-    FD_ZERO(&input);
-    if (!print_bytes)
-      FD_SET(print_fd, &input);
-    if (use_bc)
-      FD_SET(device_fd, &input);
-    if (side_cb)
-      FD_SET(CUPS_SC_FD, &input);
-
-    FD_ZERO(&output);
-    if (print_bytes || !use_bc)
-      FD_SET(device_fd, &output);
-
-    if (use_bc || side_cb)
-    {
-      if (select(nfds, &input, &output, NULL, NULL) < 0)
-      {
-       /*
-	* Pause printing to clear any pending errors...
-	*/
-
-	if (errno == ENXIO && offline != 1)
-	{
-	  fputs("STATE: +offline-error\n", stderr);
-	  _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
-	  offline = 1;
-	}
-	else if (errno == EINTR && total_bytes == 0)
-	{
-	  fputs("DEBUG: Received an interrupt before any bytes were "
-	        "written, aborting!\n", stderr);
-          return (0);
-	}
-
-	sleep(1);
-	continue;
-      }
-    }
-
-   /*
-    * Check if we have a side-channel request ready...
-    */
-
-    if (side_cb && FD_ISSET(CUPS_SC_FD, &input))
-      (*side_cb)(print_fd, device_fd, use_bc);
-
-   /*
-    * Check if we have back-channel data ready...
-    */
-
-    if (FD_ISSET(device_fd, &input))
-    {
-      if ((bc_bytes = read(device_fd, bc_buffer, sizeof(bc_buffer))) > 0)
-      {
-	fprintf(stderr,
-	        "DEBUG: Received " CUPS_LLFMT " bytes of back-channel data!\n",
-	        CUPS_LLCAST bc_bytes);
-        cupsBackChannelWrite(bc_buffer, bc_bytes, 1.0);
-      }
-    }
-
-   /*
-    * Check if we have print data ready...
-    */
-
-    if (FD_ISSET(print_fd, &input))
-    {
-      if ((print_bytes = read(print_fd, print_buffer,
-                              sizeof(print_buffer))) < 0)
-      {
-       /*
-        * Read error - bail if we don't see EAGAIN or EINTR...
-	*/
-
-	if (errno != EAGAIN || errno != EINTR)
-	{
-	  perror("ERROR: Unable to read print data");
-	  return (-1);
-	}
-
-        print_bytes = 0;
-      }
-      else if (print_bytes == 0)
-      {
-       /*
-        * End of file, break out of the loop...
-	*/
-
-        break;
-      }
-
-      print_ptr = print_buffer;
-
-      fprintf(stderr, "DEBUG: Read %d bytes of print data...\n",
-              (int)print_bytes);
-    }
-
-   /*
-    * Check if the device is ready to receive data and we have data to
-    * send...
-    */
-
-    if (print_bytes && FD_ISSET(device_fd, &output))
-    {
-      if ((bytes = write(device_fd, print_ptr, print_bytes)) < 0)
-      {
-       /*
-        * Write error - bail if we don't see an error we can retry...
-	*/
-
-        if (errno == ENOSPC)
-	{
-	  if (paperout != 1)
-	  {
-	    fputs("STATE: +media-empty-error\n", stderr);
-	    _cupsLangPuts(stderr, _("ERROR: Out of paper!\n"));
-	    paperout = 1;
-	  }
-        }
-	else if (errno == ENXIO)
-	{
-	  if (offline != 1)
-	  {
-	    fputs("STATE: +offline-error\n", stderr);
-	    _cupsLangPuts(stderr, _("INFO: Printer is currently off-line.\n"));
-	    offline = 1;
-	  }
-	}
-	else if (errno != EAGAIN && errno != EINTR && errno != ENOTTY)
-	{
-	  fprintf(stderr, _("ERROR: Unable to write print data: %s\n"),
-	          strerror(errno));
-	  return (-1);
-	}
-      }
-      else
-      {
-        if (paperout)
-	{
-	  fputs("STATE: -media-empty-error\n", stderr);
-	  paperout = 0;
-	}
-
-	if (offline)
-	{
-	  fputs("STATE: -offline-error\n", stderr);
-	  _cupsLangPuts(stderr, _("INFO: Printer is now on-line.\n"));
-	  offline = 0;
-	}
-
-        fprintf(stderr, "DEBUG: Wrote %d bytes of print data...\n", (int)bytes);
-
-        print_bytes -= bytes;
-	print_ptr   += bytes;
-	total_bytes += bytes;
-      }
-    }
-  }
-
- /*
-  * Return with success...
-  */
-
-  return (total_bytes);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/scsi-irix.c

@@ -1,240 +0,0 @@
-/*
- * "$Id$"
- *
- *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <bstring.h>		/* memcpy() and friends */
-#include <sys/dsreq.h>		/* SCSI interface stuff */
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  dsreq_t	scsi_req;		/* SCSI request */
-  char		scsi_cmd[6];		/* SCSI command data */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure we have a valid resource name...
-  */
-
-  if (strncmp(resource, "/dev/scsi/", 10) != 0)
-  {
-    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
-                    resource);
-    return (CUPS_BACKEND_STOP);
-  }
-
- /*
-  * Open the SCSI device file...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -1)
-    {
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (1);
-      }
-
-      if (errno != EAGAIN && errno != EBUSY)
-      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
-      }
-      else
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
-        sleep(30);
-      }
-    }
-  }
-  while (scsi_fd == -1);
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (fd != 0)
-  {
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#else
-    signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-  }
-
- /*
-  * Copy the print file to the device...
-  */
-
-  while (copies > 0)
-  {
-    if (fd != 0)
-      lseek(fd, 0, SEEK_SET);
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-    {
-      memset(&scsi_req, 0, sizeof(scsi_req));
-
-      scsi_req.ds_flags   = DSRQ_WRITE;
-      scsi_req.ds_time    = 60 * 1000;
-      scsi_req.ds_cmdbuf  = scsi_cmd;
-      scsi_req.ds_cmdlen  = 6;
-      scsi_req.ds_databuf = buffer;
-      scsi_req.ds_datalen = bytes;
-
-      scsi_cmd[0] = 0x0a;	/* Group 0 print command */
-      scsi_cmd[1] = 0x00;
-      scsi_cmd[2] = bytes / 65536;
-      scsi_cmd[3] = bytes / 256;
-      scsi_cmd[4] = bytes;
-      scsi_cmd[5] = 0x00;
-
-      for (try = 0; try < 10; try ++)
-	if (ioctl(scsi_fd, DS_ENTER, &scsi_req) < 0 ||
-            scsi_req.ds_status != 0)
-        {
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: SCSI command timed out (%d); "
-			    "retrying...\n"), scsi_req.ds_status);
-          sleep(try + 1);
-	}
-	else
-          break;
-
-      if (try >= 10)
-      {
-	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
-			scsi_req.ds_status);
-        close(scsi_fd);
-	return (CUPS_BACKEND_FAILED);
-      }
-    }
-
-    copies --;
-  }
-
- /*
-  * Close the device and return...
-  */
-
-  close(fd);
-
-  return (CUPS_BACKEND_OK);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/scsi-linux.c

@@ -1,259 +0,0 @@
-/*
- * "$Id$"
- *
- *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2003-2005 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   list_devices() - List the available SCSI printer devices.
- *   print_device() - Print a file to a SCSI device.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <scsi/sg.h>
-#include <cups/i18n.h>
-
-
-/*
- * We currently only support the Linux 2.4 generic SCSI interface.
- */
-
-#ifndef SG_DXFER_TO_DEV
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (1); }
-#else
-
-
-/*
- * 'list_devices()' - List the available SCSI printer devices.
- */
-
-void
-list_devices(void)
-{
-  puts("direct scsi \"Unknown\" \"SCSI Printer\"");
-}
-
-
-/*
- * 'print_device()' - Print a file to a SCSI device.
- */
-
-int					/* O - Print status */
-print_device(const char *resource,	/* I - SCSI device */
-             int        fd,		/* I - File to print */
-	     int        copies)		/* I - Number of copies to print */
-{
-  int		scsi_fd;		/* SCSI file descriptor */
-  char		buffer[8192];		/* Data buffer */
-  int		bytes;			/* Number of bytes */
-  int		try;			/* Current try */
-  sg_io_hdr_t	scsi_req;		/* SCSI request */
-  unsigned char	scsi_cmd[6],		/* SCSI command data */
-		scsi_sense[32];		/* SCSI sense data */
-#  if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Actions for POSIX signals */
-#  endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Make sure we have a valid resource name...
-  */
-
-  if (strncmp(resource, "/dev/sg", 7) != 0)
-  {
-    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
-                    resource);
-    return (CUPS_BACKEND_STOP);
-  }
-
- /*
-  * Open the SCSI device file...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-    if ((scsi_fd = open(resource, O_RDWR | O_EXCL)) == -1)
-    {
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-		        "printer in class...\n"));
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
-      if (errno != EAGAIN && errno != EBUSY)
-      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
-      }
-      else
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 30 seconds...\n"));
-        sleep(30);
-      }
-    }
-  }
-  while (scsi_fd == -1);
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Now that we are "connected" to the port, ignore SIGTERM so that we
-  * can finish out any page data the driver sends (e.g. to eject the
-  * current page...  Only ignore SIGTERM if we are printing data from
-  * stdin (otherwise you can't cancel raw jobs...)
-  */
-
-  if (fd != 0)
-  {
-#  ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-    sigset(SIGTERM, SIG_IGN);
-#  elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = SIG_IGN;
-    sigaction(SIGTERM, &action, NULL);
-#  else
-    signal(SIGTERM, SIG_IGN);
-#  endif /* HAVE_SIGSET */
-  }
-
- /*
-  * Copy the print file to the device...
-  */
-
-  while (copies > 0)
-  {
-    if (fd != 0)
-      lseek(fd, 0, SEEK_SET);
-
-    while ((bytes = read(fd, buffer, sizeof(buffer))) > 0)
-    {
-      memset(&scsi_req, 0, sizeof(scsi_req));
-
-      scsi_req.interface_id    = 'S';
-      scsi_req.dxfer_direction = SG_DXFER_TO_DEV;
-      scsi_req.cmd_len         = 6;
-      scsi_req.mx_sb_len       = sizeof(scsi_sense);
-      scsi_req.iovec_count     = 0;
-      scsi_req.dxfer_len       = bytes;
-      scsi_req.dxferp          = buffer;
-      scsi_req.cmdp            = scsi_cmd;
-      scsi_req.sbp             = scsi_sense;
-      scsi_req.timeout         = 60 * 1000;
-      
-      scsi_cmd[0] = 0x0a;	/* Group 0 print command */
-      scsi_cmd[1] = 0x00;
-      scsi_cmd[2] = bytes / 65536;
-      scsi_cmd[3] = bytes / 256;
-      scsi_cmd[4] = bytes;
-      scsi_cmd[5] = 0x00;
-
-      for (try = 0; try < 10; try ++)
-	if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
-            scsi_req.status != 0)
-        {
-	  _cupsLangPrintf(stderr,
-			  _("WARNING: SCSI command timed out (%d); "
-			    "retrying...\n"), scsi_req.status);
-          sleep(try + 1);
-	}
-	else
-          break;
-
-      if (try >= 10)
-      {
-	_cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
-			scsi_req.status);
-        close(scsi_fd);
-	return (CUPS_BACKEND_FAILED);
-      }
-    }
-
-    copies --;
-  }
-
- /*
-  * Close the device and return...
-  */
-
-  close(fd);
-
-  return (CUPS_BACKEND_OK);
-}
-#endif /* !SG_DXFER_TO_DEV */
-
-
-/*
- * End of "$Id$".
- */

backend/scsi.c

@@ -1,229 +0,0 @@
-/*
- * "$Id$"
- *
- *   SCSI printer backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2003-2006 by Easy Software Products, all rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or
- *   without modification, are permitted provided that the
- *   following conditions are met:
- *
- *     1. Redistributions of source code must retain the above
- *	  copyright notice, this list of conditions and the
- *	  following disclaimer.
- *
- *     2. Redistributions in binary form must reproduce the
- *	  above copyright notice, this list of conditions and
- *	  the following disclaimer in the documentation and/or
- *	  other materials provided with the distribution.
- *
- *     3. All advertising materials mentioning features or use
- *	  of this software must display the following
- *	  acknowledgement:
- *
- *	    This product includes software developed by Easy
- *	    Software Products.
- *
- *     4. The name of Easy Software Products may not be used to
- *	  endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS
- *   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- *   BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *   DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
- *   BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- *   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- *   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- *   DAMAGE.
- *
- * Contents:
- *
- *   main() - Send a file to the specified SCSI printer.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/backend.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <cups/i18n.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  ifdef HAVE_SYS_IOCTL_H
-#    include <sys/ioctl.h>
-#  endif /* HAVE_SYS_IOCTL_H */
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-int	print_device(const char *resource, int fd, int copies);
-
-
-#if defined(__linux__) && defined(HAVE_SCSI_SG_H)
-#  include "scsi-linux.c"
-#elif defined(__sgi)
-#  include "scsi-irix.c"
-#else
-/*
- * Dummy functions that do nothing on unsupported platforms...
- */
-void	list_devices(void) {}
-int	print_device(const char *resource, int fd, int copies) { return (CUPS_BACKEND_FAILED); }
-#endif /* __linux && HAVE_SCSI_SG_H */
-
-
-/*
- * 'main()' - Send a file to the specified SCSI printer.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  char		method[255],	/* Method in URI */
-		hostname[1024],	/* Hostname */
-		username[255],	/* Username info (not used) */
-		resource[1024],	/* Resource info (device and options) */
-		*options;	/* Pointer to options */
-  int		port;		/* Port number (not used) */
-  int		fp;		/* Print file */
-  int		copies;		/* Number of copies to print */
-  int		status;		/* Exit status */
-#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);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (CUPS_BACKEND_OK);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-		    argv[0]);
-    return (CUPS_BACKEND_FAILED);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    fp     = 0;
-    copies = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((fp = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Extract the device name and options from the URI...
-  */
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
-
- /*
-  * See if there are any options...
-  */
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  status = print_device(resource, fp, copies);
-
- /*
-  * Close input file and return...
-  */
-
-  if (fp != 0)
-    close(fp);
-
-  return (status);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/snmp.txt

@@ -1,172 +0,0 @@
-snmp.txt - 2006-04-19
----------------------
-
-This file lists the "interesting" bits from the command:
-
-    snmpwalk -v 1 -c public HOST .1
-
-for many network print servers and internal cards.  It is mainly here
-for SNMP documentation and development purposes.
-
-
-AXIS 5600
-
-SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM J.sp.00,JETDIRECT EX,JD28,EEPROM 6.16.5
-SNMPv2-MIB::sysName.0 = STRING:
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Hewlett-Packard hp LaserJet 3380
-HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Axis AXIS 5600
-HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: Axis AXIS 5600
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.3 = OID: SNMPv2-SMI::zeroDotZero
-SNMPv2-SMI::enterprises.11.2.4.3.10.8.0 = STRING: "AXIS433AE8"
-SNMPv2-SMI::enterprises.368.2.3.2.601.0 = INTEGER: 9100
-SNMPv2-SMI::enterprises.368.2.3.2.602.0 = INTEGER: 9101
-SNMPv2-SMI::enterprises.368.2.3.2.603.0 = INTEGER: 9102
-SNMPv2-SMI::enterprises.368.2.3.10.901.0 = STRING: "AXIS433AE8"
-
-
-AXIS OfficeBasic
-
-SNMPv2-MIB::sysDescr.0 = STRING: AXIS OfficeBasic Parallel Network Print Server V6.43 Sep  4 2003
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: EPSON Stylus Photo 870
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
-
-
-DLink DP-301P+
-
-SNMPv2-MIB::sysDescr.0 = STRING: D-Link DP-301P+ Print Server
-
-
-Genicom ML280
-
-SNMPv2-MIB::sysDescr.0 = STRING: GENICOM microLaser 280
-SNMPv2-MIB::sysName.0 = STRING: PRQ_004F75
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: MANUFACTURER:GENICOM;MODEL:microLaser 280;
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.3369.1.1.2.4
-
-
-EPSON Type-B Network Card
-
-SNMPv2-MIB::sysDescr.0 = STRING: EPSON Type-B 10Base-T/100Base-TX Print Server
-SNMPv2-MIB::sysName.0 = STRING: StylusPro7600-BB87A8
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: EPSON Stylus Pro 7600
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.1248.1.2.1.22.69.109.117.108.97.116.101.83.116.121.108.117.115.32.80.114.111.32.55.54.48.48
-SNMPv2-SMI::enterprises.11.2.3.9.1.1.7.0 = STRING: "MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Pro 7600;CLS:PRINTER;DES:EPSON Stylus Pro 7600;"
-SNMPv2-SMI::enterprises.1248.1.2.2.1.1.1.1.1 = STRING: "MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Pro 7600;CLS:PRINTER;DES:EPSON Stylus Pro 7600;"
-
-
-EPSON Wireless 802.11b Print Server
-
-SNMPv2-MIB::sysDescr.0 = STRING: EPSON Wireless LAN Print Interface compatible with an HP JETDIRECT EX
-SNMPv2-MIB::sysName.0 = STRING: EAI_0F550B
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING:
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
-
-
-HP JetDirect EX3plus
-
-SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM D.04.03,JETDIRECT EX,JD26,EEPROM D.05.22
-SNMPv2-MIB::sysName.0 = STRING: NPID1EC0F
-
-
-HP LJ4000
-
-SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM G.05.34,JETDIRECT,JD30,EEPROM G.08.32
-SNMPv2-MIB::sysName.0 = STRING:
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: HP LaserJet 4000 Series
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.11.2.3.9.1.2.5
-
-
-HP CLJ4550
-
-SNMPv2-MIB::sysDescr.0 = STRING: HP ETHERNET MULTI-ENVIRONMENT,ROM L.20.07,JETDIRECT,JD84,EEPROM L.21.22,CIDATE 07/06/2001
-SNMPv2-MIB::sysName.0 = STRING: NPI02FDE7
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: HP Color LaserJet 4550
-HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Hewlett-Packard Dynamic RAM Disk
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.11.2.3.9.1.2.14
-
-
-Lexmark C522
-
-SNMPv2-MIB::sysDescr.0 = STRING: Lexmark C522 version NS.NP.N212 kernel 2.6.6 All-N-1
-SNMPv2-MIB::sysName.0 = STRING: ET0004000D0CCA
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolatileMemory
-HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDeviceProcessor
-HOST-RESOURCES-MIB::hrDeviceType.4 = OID: HOST-RESOURCES-TYPES::hrDeviceSerialPort
-HOST-RESOURCES-MIB::hrDeviceType.5 = OID: HOST-RESOURCES-TYPES::hrDeviceNetwork
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Lexmark C522 9421TTV LS.FA.P129
-HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: Nonvolatile RAM
-HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: IBM 750 Rev CXr
-HOST-RESOURCES-MIB::hrDeviceDescr.4 = STRING: USB Interface
-HOST-RESOURCES-MIB::hrDeviceDescr.5 = STRING: Network Interface
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.3 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.4 = OID: SNMPv2-SMI::zeroDotZero
-HOST-RESOURCES-MIB::hrDeviceID.5 = OID: SNMPv2-SMI::enterprises.641.1
-SNMPv2-SMI::enterprises.641.2.1.2.1.2.1 = STRING: "Lexmark C522"
-SNMPv2-SMI::enterprises.641.2.1.2.1.3.1 = STRING: "MANUFACTURER:Lexmark International;COMMAND SET:;MODEL:Lexmark C522"
-
-
-Linksys EPSX3
-
-SNMPv2-MIB::sysDescr.0 = STRING: ETHERNET MULTI-ENVIRONMENT.ROM, JETDIRECT EX, EEPROM 6016
-
-
-NetGear PS113
-
-SNMPv2-MIB::sysDescr.0 = STRING: A SNMP proxy agent.
-
-
-Okidata C7200
-
-SNMPv2-MIB::sysDescr.0 = STRING: OkiLAN 6200e
-SNMPv2-MIB::sysName.0 = STRING: OKI7009715
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolat
-ileMemory
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: C7200
-HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: FLASH0
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.2001.1.1.1.1
-HOST-RESOURCES-MIB::hrDeviceID.2 = OID: SNMPv2-SMI::zeroDotZero
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.1 = STRING: "IEEE 1284"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.2 = STRING: "EtherTalk Phase 2"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.3 = STRING: "LPD"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.4 = STRING: "Netware Rprinter"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.5 = STRING: "Netware Bindery or NDS Pserver"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.6 = STRING: "Raw TCP Port 9100"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.7 = STRING: "FTP"
-SNMPv2-SMI::mib-2.43.14.1.1.3.1.8 = STRING: "DLC/LLC"
-SNMPv2-SMI::enterprises.2001.1.1.1.1.1.3530.0 = STRING: "C7200"
-
-
-Xerox N2025
-
-SNMPv2-MIB::sysDescr.0 = STRING: Xerox DocuPrint N2025 Network Laser Printer - 2.12-02 
-SNMPv2-MIB::sysName.0 = STRING:
-HOST-RESOURCES-MIB::hrDeviceType.1 = OID: HOST-RESOURCES-TYPES::hrDevicePrinter
-HOST-RESOURCES-MIB::hrDeviceType.2 = OID: HOST-RESOURCES-TYPES::hrDeviceParallelPort
-HOST-RESOURCES-MIB::hrDeviceType.3 = OID: HOST-RESOURCES-TYPES::hrDeviceNetwork
-HOST-RESOURCES-MIB::hrDeviceType.6 = OID: HOST-RESOURCES-TYPES::hrDeviceProcessor
-HOST-RESOURCES-MIB::hrDeviceType.7 = OID: HOST-RESOURCES-TYPES::hrDeviceOther
-HOST-RESOURCES-MIB::hrDeviceType.9 = OID: HOST-RESOURCES-TYPES::hrDeviceVolatileMemory
-HOST-RESOURCES-MIB::hrDeviceType.10 = OID: HOST-RESOURCES-TYPES::hrDeviceNonVolatileMemory
-HOST-RESOURCES-MIB::hrDeviceDescr.1 = STRING: Xerox DocuPrint N2025 Network Laser Printer - 2.12-02 
-HOST-RESOURCES-MIB::hrDeviceDescr.2 = STRING: IEEE 1284 port
-HOST-RESOURCES-MIB::hrDeviceDescr.3 = STRING: Ethernet port
-HOST-RESOURCES-MIB::hrDeviceDescr.6 = STRING: Motorola Power PC
-HOST-RESOURCES-MIB::hrDeviceDescr.7 = STRING: USB Port
-HOST-RESOURCES-MIB::hrDeviceDescr.9 = STRING: RAM Memory
-HOST-RESOURCES-MIB::hrDeviceDescr.10 = STRING: ROM Memory
-HOST-RESOURCES-MIB::hrDeviceID.1 = OID: SNMPv2-SMI::enterprises.253.8.62.1.3.2.17.1
-

backend/socket.c

@@ -1,537 +0,0 @@
-/*
- * "$Id$"
- *
- *   AppSocket backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()    - Send a file to the printer or server.
- *   side_cb() - Handle side-channel requests...
- *   wait_bc() - Wait for back-channel data...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/http-private.h>
-#include "backend-private.h"
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef WIN32
-#  include <winsock.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  include <sys/socket.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <netdb.h>
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-static void	side_cb(int print_fd, int device_fd, int use_bc);
-static int	wait_bc(int device_fd, int secs);
-
-
-/*
- * 'main()' - Send a file to the printer or server.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])			/* I - Command-line arguments */
-{
-  char		method[255],		/* Method in URI */
-		hostname[1024],		/* Hostname */
-		username[255],		/* Username info (not used) */
-		resource[1024],		/* Resource info (not used) */
-		*options,		/* Pointer to options */
-		*name,			/* Name of option */
-		*value,			/* Value of option */
-		sep;			/* Option separator */
-  int		print_fd;		/* Print file */
-  int		copies;			/* Number of copies to print */
-  time_t	start_time;		/* Time of first connect */
-  int		recoverable;		/* Recoverable error shown? */
-  int		contimeout;		/* Connection timeout */
-  int		waiteof;		/* Wait for end-of-file? */
-  int		port;			/* Port number */
-  char		portname[255];		/* Port name */
-  int		delay;			/* Delay for retries... */
-  int		device_fd;		/* AppSocket */
-  int		error;			/* Error code (if any) */
-  http_addrlist_t *addrlist,		/* Address list */
-		*addr;			/* Connected address */
-  char		addrname[256];		/* Address name */
-  ssize_t	tbytes;			/* Total number of bytes written */
-#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);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    puts("network socket \"Unknown\" \"AppSocket/HP JetDirect\"");
-    return (CUPS_BACKEND_OK);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-                    argv[0]);
-    return (CUPS_BACKEND_FAILED);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    print_fd = 0;
-    copies   = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
-    {
-      perror("ERROR: unable to open print file");
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Extract the hostname and port number from the URI...
-  */
-
-  httpSeparateURI(HTTP_URI_CODING_ALL, cupsBackendDeviceURI(argv),
-                  method, sizeof(method), username, sizeof(username),
-		  hostname, sizeof(hostname), &port,
-		  resource, sizeof(resource));
-
-  if (port == 0)
-    port = 9100;	/* Default to HP JetDirect/Tektronix PhaserShare */
-
- /*
-  * Get options, if any...
-  */
-
-  waiteof    = 1;
-  contimeout = 7 * 24 * 60 * 60;
-
-  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...
-      */
-
-      name = options;
-
-      while (*options && *options != '=' && *options != '+' && *options != '&')
-        options ++;
-
-      if ((sep = *options) != '\0')
-        *options++ = '\0';
-
-      if (sep == '=')
-      {
-       /*
-        * Get the value...
-	*/
-
-        value = options;
-
-	while (*options && *options != '+' && *options != '&')
-	  options ++;
-
-        if (*options)
-	  *options++ = '\0';
-      }
-      else
-        value = (char *)"";
-
-     /*
-      * Process the option...
-      */
-
-      if (!strcasecmp(name, "waiteof"))
-      {
-       /*
-        * Set the wait-for-eof value...
-	*/
-
-        waiteof = !value[0] || !strcasecmp(value, "on") ||
-		  !strcasecmp(value, "yes") || !strcasecmp(value, "true");
-      }
-      else if (!strcasecmp(name, "contimeout"))
-      {
-       /*
-        * Set the connection timeout...
-	*/
-
-	if (atoi(value) > 0)
-	  contimeout = atoi(value);
-      }
-    }
-  }
-
- /*
-  * Then try to connect to the remote host...
-  */
-
-  recoverable = 0;
-  start_time  = time(NULL);
-
-  sprintf(portname, "%d", port);
-
-  if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
-  {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
-                    hostname);
-    return (CUPS_BACKEND_STOP);
-  }
-
-  _cupsLangPrintf(stderr,
-                  _("INFO: Attempting to connect to host %s on port %d\n"),
-                  hostname, port);
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  for (delay = 5;;)
-  {
-    if ((addr = httpAddrConnect(addrlist, &device_fd)) == NULL)
-    {
-      error     = errno;
-      device_fd = -1;
-
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
-      if (error == ECONNREFUSED || error == EHOSTDOWN ||
-          error == EHOSTUNREACH)
-      {
-        if (contimeout && (time(NULL) - start_time) > contimeout)
-	{
-	  _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
-	  return (CUPS_BACKEND_FAILED);
-	}
-
-        recoverable = 1;
-
-	_cupsLangPrintf(stderr,
-			_("WARNING: recoverable: Network host \'%s\' is busy; "
-			  "will retry in %d seconds...\n"),
-			hostname, delay);
-
-	sleep(delay);
-
-	if (delay < 30)
-	  delay += 5;
-      }
-      else
-      {
-        recoverable = 1;
-
-        _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
-	                strerror(errno));
-	_cupsLangPuts(stderr,
-	              _("ERROR: recoverable: Unable to connect to printer; "
-		        "will retry in 30 seconds...\n"));
-	sleep(30);
-      }
-    }
-    else
-      break;
-  }
-
-  if (recoverable)
-  {
-   /*
-    * If we've shown a recoverable error make sure the printer proxies
-    * have a chance to see the recovered message. Not pretty but
-    * necessary for now...
-    */
-
-    fputs("INFO: recovered: \n", stderr);
-    sleep(5);
-  }
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-  _cupsLangPrintf(stderr, _("INFO: Connected to %s...\n"), hostname);
-
-#ifdef AF_INET6
-  if (addr->addr.addr.sa_family == AF_INET6)
-    fprintf(stderr, "DEBUG: Connected to [%s]:%d (IPv6)...\n", 
-	    httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-	    ntohs(addr->addr.ipv6.sin6_port));
-  else
-#endif /* AF_INET6 */
-    if (addr->addr.addr.sa_family == AF_INET)
-      fprintf(stderr, "DEBUG: Connected to %s:%d (IPv4)...\n",
-	      httpAddrString(&addr->addr, addrname, sizeof(addrname)),
-	      ntohs(addr->addr.ipv4.sin_port));
-
- /*
-  * Print everything...
-  */
-
-  tbytes = 0;
-
-  while (copies > 0 && tbytes >= 0)
-  {
-    copies --;
-
-    if (print_fd != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(print_fd, 0, SEEK_SET);
-    }
-
-    tbytes = backendRunLoop(print_fd, device_fd, 1, side_cb);
-
-    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
-  }
-
- /*
-  * Get any pending back-channel data...
-  */
-
-  while (wait_bc(device_fd, 5) > 0);
-
-  if (waiteof)
-  {
-   /*
-    * Shutdown the socket and wait for the other end to finish...
-    */
-
-    _cupsLangPuts(stderr,
-                  _("INFO: Print file sent, waiting for printer to finish...\n"));
-
-    shutdown(device_fd, 1);
-
-    while (wait_bc(device_fd, 90) > 0);
-  }
-
- /*
-  * Close the socket connection...
-  */
-
-  close(device_fd);
-
-  httpAddrFreeList(addrlist);
-
- /*
-  * Close the input file and return...
-  */
-
-  if (print_fd != 0)
-    close(print_fd);
-
-  if (tbytes >= 0)
-    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
-
-  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
-}
-
-
-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int print_fd,			/* I - Print file */
-        int device_fd,			/* I - Device file */
-	int use_bc)			/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-  const char		*device_id;	/* 1284DEVICEID env var */
-
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-       /*
-        * Our sockets disable the Nagle algorithm and data is sent immediately.
-	*/
-
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else 
-          status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        if ((device_id = getenv("1284DEVICEID")) != NULL)
-	{
-	  strlcpy(data, device_id, sizeof(data));
-	  datalen = (int)strlen(data);
-	  break;
-	}
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
-/*
- * 'wait_bc()' - Wait for back-channel data...
- */
-
-static int				/* O - # bytes read or -1 on error */
-wait_bc(int device_fd,			/* I - Socket */
-        int secs)			/* I - Seconds to wait */
-{
-  struct timeval timeout;		/* Timeout for select() */
-  fd_set	input;			/* Input set for select() */
-  ssize_t	bytes;			/* Number of back-channel bytes read */
-  char		buffer[1024];		/* Back-channel buffer */
-
-
- /*
-  * Wait up to "secs" seconds for backchannel data...
-  */
-
-  timeout.tv_sec  = secs;
-  timeout.tv_usec = 0;
-
-  FD_ZERO(&input);
-  FD_SET(device_fd, &input);
-
-  if (select(device_fd + 1, &input, NULL, NULL, &timeout) > 0)
-  {
-   /*
-    * Grab the data coming back and spit it out to stderr...
-    */
-
-    if ((bytes = read(device_fd, buffer, sizeof(buffer))) > 0)
-    {
-      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
-	      (int)bytes);
-      cupsBackChannelWrite(buffer, bytes, 1.0);
-    }
-
-    return (bytes);
-  }
-  else
-    return (-1);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/test1284.c

@@ -1,88 +0,0 @@
-/*
- * "$Id$"
- *
- *   IEEE-1284 support functions test program for the Common UNIX Printing
- *   System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Test the device-ID functions.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <cups/string.h>
-#include <stdlib.h>
-#include <errno.h>
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#endif /* WIN32 */
-
-#define DEBUG
-#include "ieee1284.c"
-
-
-/*
- * 'main()' - Test the device-ID functions.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line args */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int	i,				/* Looping var */
-	fd;				/* File descriptor */
-  char	device_id[1024],		/* 1284 device ID string */
-	make_model[1024],		/* make-and-model string */
-	uri[1024];			/* URI string */
-
-
-  if (argc < 2)
-  {
-    puts("Usage: test1284 device-file [... device-file-N]");
-    exit(1);
-  }
-
-  for (i = 1; i < argc; i ++)
-  {
-    if ((fd = open(argv[i], O_RDWR)) < 0)
-    {
-      perror(argv[i]);
-      return (errno);
-    }
-
-    printf("%s:\n", argv[i]);
-
-    backendGetDeviceID(fd, device_id, sizeof(device_id), make_model,
-                       sizeof(make_model), "test", uri, sizeof(uri));
-
-    printf("    device_id=\"%s\"\n", device_id);
-    printf("    make_model=\"%s\"\n", make_model);
-    printf("    uri=\"%s\"\n", uri);
-
-    close(fd);
-  }
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/usb-unix.c

@@ -1,619 +0,0 @@
-/*
- * "$Id$"
- *
- *   USB port backend for the Common UNIX Printing System (CUPS).
- *
- *   This file is included from "usb.c" when compiled on UNIX/Linux.
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   print_device() - Print a file to a USB device.
- *   list_devices() - List all USB devices.
- *   open_device()  - Open a USB device...
- *   side_cb()      - Handle side-channel requests...
- */
-
-/*
- * Include necessary headers.
- */
-
-#include "ieee1284.c"
-#include <sys/select.h>
-
-
-/*
- * Local functions...
- */
-
-static int	open_device(const char *uri, int *use_bc);
-static void	side_cb(int print_fd, int device_fd, int use_bc);
-
-
-/*
- * 'print_device()' - Print a file to a USB device.
- */
-
-int					/* O - Exit status */
-print_device(const char *uri,		/* I - Device URI */
-             const char *hostname,	/* I - Hostname/manufacturer */
-             const char *resource,	/* I - Resource/modelname */
-	     char       *options,	/* I - Device options/serial number */
-	     int        print_fd,	/* I - File descriptor to print */
-	     int        copies,		/* I - Copies to print */
-	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
-	     char	*argv[])	/* I - Command-line arguments */
-{
-  int		use_bc;			/* Use backchannel path? */
-  int		device_fd;		/* USB device */
-  size_t	tbytes;			/* Total number of bytes written */
-  struct termios opts;			/* Parallel port options */
-
-
-  (void)argc;
-  (void)argv;
-
- /*
-  * Open the USB port device...
-  */
-
-  fputs("STATE: +connecting-to-device\n", stderr);
-
-  do
-  {
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-   /*
-    * *BSD's ulpt driver currently does not support the
-    * back-channel, incorrectly returns data ready on a select(),
-    * and locks up on read()...
-    */
-
-    use_bc = 0;
-
-#else
-   /*
-    * Disable backchannel data when printing to Brother, Canon, or
-    * Minolta USB printers - apparently these printers will return
-    * the IEEE-1284 device ID over and over and over when they get
-    * a read request...
-    */
-
-    use_bc = strcasecmp(hostname, "Brother") &&
-             strcasecmp(hostname, "Canon") &&
-             strcasecmp(hostname, "Konica Minolta") &&
-             strcasecmp(hostname, "Minolta");
-#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
-
-    if ((device_fd = open_device(uri, &use_bc)) == -1)
-    {
-      if (getenv("CLASS") != NULL)
-      {
-       /*
-        * If the CLASS environment variable is set, the job was submitted
-	* to a class and not to a specific queue.  In this case, we want
-	* to abort immediately so that the job can be requeued on the next
-	* available printer in the class.
-	*/
-
-        _cupsLangPuts(stderr,
-	              _("INFO: Unable to contact printer, queuing on next "
-			"printer in class...\n"));
-
-       /*
-        * Sleep 5 seconds to keep the job from requeuing too rapidly...
-	*/
-
-	sleep(5);
-
-        return (CUPS_BACKEND_FAILED);
-      }
-
-      if (errno == EBUSY)
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 10 seconds...\n"));
-	sleep(10);
-      }
-      else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
-               errno == ENODEV)
-      {
-        _cupsLangPuts(stderr,
-	              _("INFO: Printer not connected; will retry in 30 "
-		        "seconds...\n"));
-	sleep(30);
-      }
-      else
-      {
-	_cupsLangPrintf(stderr,
-	                _("ERROR: Unable to open device file \"%s\": %s\n"),
-			resource, strerror(errno));
-	return (CUPS_BACKEND_FAILED);
-      }
-    }
-  }
-  while (device_fd < 0);
-
-  fputs("STATE: -connecting-to-device\n", stderr);
-
- /*
-  * Set any options provided...
-  */
-
-  tcgetattr(device_fd, &opts);
-
-  opts.c_lflag &= ~(ICANON | ECHO | ISIG);	/* Raw mode */
-
-  /**** No options supported yet ****/
-
-  tcsetattr(device_fd, TCSANOW, &opts);
-
- /*
-  * Finally, send the print file...
-  */
-
-  tbytes = 0;
-
-  while (copies > 0 && tbytes >= 0)
-  {
-    copies --;
-
-    if (print_fd != 0)
-    {
-      fputs("PAGE: 1 1\n", stderr);
-      lseek(print_fd, 0, SEEK_SET);
-    }
-
-    tbytes = backendRunLoop(print_fd, device_fd, use_bc, side_cb);
-
-    if (print_fd != 0 && tbytes >= 0)
-      _cupsLangPrintf(stderr,
-#ifdef HAVE_LONG_LONG
-		      _("INFO: Sent print file, %lld bytes...\n"),
-#else
-		      _("INFO: Sent print file, %ld bytes...\n"),
-#endif /* HAVE_LONG_LONG */
-		      CUPS_LLCAST tbytes);
-  }
-
- /*
-  * Close the USB port and return...
-  */
-
-  close(device_fd);
-
-  return (tbytes < 0 ? CUPS_BACKEND_FAILED : CUPS_BACKEND_OK);
-}
-
-
-/*
- * 'list_devices()' - List all USB devices.
- */
-
-void
-list_devices(void)
-{
-#ifdef __linux
-  int	i;				/* Looping var */
-  int	fd;				/* File descriptor */
-  char	device[255],			/* Device filename */
-	device_id[1024],		/* Device ID string */
-	device_uri[1024],		/* Device URI string */
-	make_model[1024];		/* Make and model */
-
- /*
-  * Try to open each USB device...
-  */
-
-  for (i = 0; i < 16; i ++)
-  {
-   /*
-    * Linux has a long history of changing the standard filenames used
-    * for USB printer devices.  We get the honor of trying them all...
-    */
-
-    sprintf(device, "/dev/usblp%d", i);
-
-    if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-    {
-      if (errno != ENOENT)
-	continue;
-
-      sprintf(device, "/dev/usb/lp%d", i);
-
-      if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-      {
-	if (errno != ENOENT)
-	  continue;
-
-	sprintf(device, "/dev/usb/usblp%d", i);
-
-    	if ((fd = open(device, O_RDWR | O_EXCL)) < 0)
-	  continue;
-      }
-    }
-
-    if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
-                            make_model, sizeof(make_model),
-			    "usb", device_uri, sizeof(device_uri)))
-      printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
-	     make_model, make_model, i + 1, device_id);
-
-    close(fd);
-  }
-#elif defined(__sgi)
-#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-  int	i;			/* Looping var */
-  int	fd;			/* File descriptor */
-  char	device[255],		/* Device filename */
-	device_id[1024],	/* Device ID string */
-	device_uri[1024],	/* Device URI string */
-	make_model[1024];	/* Make and model */
-
-
- /*
-  * Open each USB device...
-  */
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/usb/printer%d", i);
-
-    if ((fd = open(device, O_WRONLY | O_EXCL)) >= 0)
-    {
-      if (!backendGetDeviceID(fd, device_id, sizeof(device_id),
-                              make_model, sizeof(make_model),
-			      "usb", device_uri, sizeof(device_uri)))
-	printf("direct %s \"%s\" \"%s USB #%d\" \"%s\"\n", device_uri,
-	       make_model, make_model, i + 1, device_id);
-
-      close(fd);
-    }
-  }
-#elif defined(__hpux)
-#elif defined(__osf)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-  int   i;                      /* Looping var */
-  char  device[255];            /* Device filename */
-
-
-  for (i = 0; i < 8; i ++)
-  {
-    sprintf(device, "/dev/ulpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-
-    sprintf(device, "/dev/unlpt%d", i);
-    if (!access(device, 0))
-      printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
-  }
-#endif
-}
-
-
-/*
- * 'open_device()' - Open a USB device...
- */
-
-static int				/* O - File descriptor or -1 on error */
-open_device(const char *uri,		/* I - Device URI */
-            int        *use_bc)		/* O - Set to 0 for unidirectional */
-{
-  int	fd;				/* File descriptor */
-
-
- /*
-  * The generic implementation just treats the URI as a device filename...
-  * Specific operating systems may also support using the device serial
-  * number and/or make/model.
-  */
-
-  if (!strncmp(uri, "usb:/dev/", 9))
-#ifdef __linux
-  {
-   /*
-    * Do not allow direct devices anymore...
-    */
-
-    errno = ENODEV;
-    return (-1);
-  }
-  else if (!strncmp(uri, "usb://", 6))
-  {
-   /*
-    * For Linux, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		busy;			/* Are any ports busy? */
-    char	device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-
-
-   /*
-    * Find the correct USB device...
-    */
-
-    do
-    {
-      for (busy = 0, i = 0; i < 16; i ++)
-      {
-       /*
-	* Linux has a long history of changing the standard filenames used
-	* for USB printer devices.  We get the honor of trying them all...
-	*/
-
-	sprintf(device, "/dev/usblp%d", i);
-
-	if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	{
-	  sprintf(device, "/dev/usb/lp%d", i);
-
-	  if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	  {
-	    sprintf(device, "/dev/usb/usblp%d", i);
-
-    	    if ((fd = open(device, O_RDWR | O_EXCL)) < 0 && errno == ENOENT)
-	      continue;
-	  }
-	}
-
-	if (fd >= 0)
-	{
-	  backendGetDeviceID(fd, device_id, sizeof(device_id),
-                             make_model, sizeof(make_model),
-			     "usb", device_uri, sizeof(device_uri));
-	}
-	else
-	{
-	 /*
-	  * If the open failed because it was busy, flag it so we retry
-	  * as needed...
-	  */
-
-	  if (errno == EBUSY)
-	    busy = 1;
-
-	  device_uri[0] = '\0';
-        }
-
-        if (!strcmp(uri, device_uri))
-	{
-	 /*
-	  * Yes, return this file descriptor...
-	  */
-
-	  fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n",
-		  device);
-
-	  return (fd);
-	}
-
-       /*
-	* This wasn't the one...
-	*/
-
-        if (fd >= 0)
-	  close(fd);
-      }
-
-     /*
-      * If we get here and at least one of the printer ports showed up
-      * as "busy", then sleep for a bit and retry...
-      */
-
-      if (busy)
-      {
-	_cupsLangPuts(stderr,
-	              _("INFO: Printer busy; will retry in 5 seconds...\n"));
-	sleep(5);
-      }
-    }
-    while (busy);
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-  {
-   /*
-    * Do not allow direct devices anymore...
-    */
-
-    errno = ENODEV;
-    return (-1);
-  }
-  else if (!strncmp(uri, "usb://", 6))
-  {
-   /*
-    * For Solaris, try looking up the device serial number or model...
-    */
-
-    int		i;			/* Looping var */
-    int		busy;			/* Are any ports busy? */
-    char	device[255],		/* Device filename */
-		device_id[1024],	/* Device ID string */
-		make_model[1024],	/* Make and model */
-		device_uri[1024];	/* Device URI string */
-
-
-   /*
-    * Find the correct USB device...
-    */
-
-    do
-    {
-      for (i = 0, busy = 0; i < 8; i ++)
-      {
-	sprintf(device, "/dev/usb/printer%d", i);
-
-	if ((fd = open(device, O_WRONLY | O_EXCL)) >= 0)
-	  backendGetDeviceID(fd, device_id, sizeof(device_id),
-                             make_model, sizeof(make_model),
-			     "usb", device_uri, sizeof(device_uri));
-	else
-	{
-	 /*
-	  * If the open failed because it was busy, flag it so we retry
-	  * as needed...
-	  */
-
-	  if (errno == EBUSY)
-	    busy = 1;
-
-	  device_uri[0] = '\0';
-        }
-
-        if (!strcmp(uri, device_uri))
-	{
-	 /*
-	  * Yes, return this file descriptor...
-	  */
-
-          fputs("DEBUG: Setting use_bc to 0!\n", stderr);
-
-          *use_bc = 0;
-
-	  return (fd);
-	}
-
-       /*
-	* This wasn't the one...
-	*/
-
-        if (fd >= 0)
-	  close(fd);
-      }
-
-     /*
-      * If we get here and at least one of the printer ports showed up
-      * as "busy", then sleep for a bit and retry...
-      */
-
-      if (busy)
-      {
-	_cupsLangPuts(stderr,
-	              _("INFO: Printer is busy; will retry in 5 seconds...\n"));
-	sleep(5);
-      }
-    }
-    while (busy);
-
-   /*
-    * Couldn't find the printer, return "no such device or address"...
-    */
-
-    errno = ENODEV;
-
-    return (-1);
-  }
-#else
-  {
-    if (use_bc)
-      fd = open(uri + 4, O_RDWR | O_EXCL);
-    else
-      fd = -1;
-
-    if (fd < 0)
-    {
-      fd      = open(uri + 4, O_WRONLY | O_EXCL);
-      *use_bc = 0;
-    }
-
-    return (fd);
-  }
-#endif /* __linux */
-  else
-  {
-    errno = ENODEV;
-    return (-1);
-  }
-}
-
-
-/*
- * 'side_cb()' - Handle side-channel requests...
- */
-
-static void
-side_cb(int print_fd,			/* I - Print file */
-        int device_fd,			/* I - Device file */
-	int use_bc)			/* I - Using back-channel? */
-{
-  cups_sc_command_t	command;	/* Request command */
-  cups_sc_status_t	status;		/* Request/response status */
-  char			data[2048];	/* Request/response data */
-  int			datalen;	/* Request/response data size */
-
-
-  datalen = sizeof(data);
-
-  if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
-  {
-    _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-    return;
-  }
-
-  switch (command)
-  {
-    case CUPS_SC_CMD_DRAIN_OUTPUT :
-        if (backendDrainOutput(print_fd, device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else if (tcdrain(device_fd))
-	  status = CUPS_SC_STATUS_IO_ERROR;
-	else
-	  status = CUPS_SC_STATUS_OK;
-
-	datalen = 0;
-        break;
-
-    case CUPS_SC_CMD_GET_BIDI :
-        data[0] = use_bc;
-        datalen = 1;
-        break;
-
-    case CUPS_SC_CMD_GET_DEVICE_ID :
-        memset(data, 0, sizeof(data));
-
-        if (backendGetDeviceID(device_fd, data, sizeof(data) - 1,
-	                       NULL, 0, NULL, NULL, 0))
-        {
-	  status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	  datalen = 0;
-	}
-	else
-        {
-	  status  = CUPS_SC_STATUS_OK;
-	  datalen = strlen(data);
-	}
-        break;
-
-    default :
-        status  = CUPS_SC_STATUS_NOT_IMPLEMENTED;
-	datalen = 0;
-	break;
-  }
-
-  cupsSideChannelWrite(command, status, data, datalen, 1.0);
-}
-
-
-/*
- * End of "$Id$".
- */

backend/usb.c

@@ -1,270 +0,0 @@
-/*
- * "$Id$"
- *
- *   USB port backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   list_devices() - List all available USB devices to stdout.
- *   print_device() - Print a file to a USB device.
- *   main()         - Send a file to the specified USB port.
- */
-
-/*
- * Include necessary headers.
- */
-
-#ifdef __APPLE__
-   /* A header order dependency requires this be first */
-#  include <ApplicationServices/ApplicationServices.h>
-#endif /* __APPLE__ */
-
-#include <cups/backend.h>
-#include <cups/cups.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <cups/string.h>
-#include <cups/i18n.h>
-#include <signal.h>
-
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#  include <fcntl.h>
-#  include <termios.h>
-#endif /* WIN32 */
-
-
-/*
- * Local functions...
- */
-
-void	list_devices(void);
-int	print_device(const char *uri, const char *hostname,
-	             const char *resource, char *options,
-		     int print_fd, int copies, int argc, char *argv[]);
-
-
-/*
- * Include the vendor-specific USB implementation...
- */
-
-#ifdef __APPLE__
-#  include "usb-darwin.c"
-#elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#  include "usb-unix.c"
-#else
-/*
- * Use dummy functions that do nothing on unsupported platforms...
- * These can be used as templates for implementing USB printing on new
- * platforms...
- */
-
-/*
- * 'list_devices()' - List all available USB devices to stdout.
- */
-
-void
-list_devices(void)
-{
- /*
-  * Don't have any devices to list... Use output of the form:
-  *
-  *     direct usb:/make/model?serial=foo "Make Model" "USB Printer"
-  *
-  * Note that "Hewlett Packard" or any other variation MUST be mapped to
-  * "HP" for compatibility with the PPD and ICC specs.
-  */
-}
-
-
-/*
- * 'print_device()' - Print a file to a USB device.
- */
-
-int					/* O - Exit status */
-print_device(const char *uri,		/* I - Device URI */
-             const char *hostname,	/* I - Hostname/manufacturer */
-             const char *resource,	/* I - Resource/modelname */
-	     char       *options,	/* I - Device options/serial number */
-	     int        print_fd,	/* I - File descriptor to print */
-	     int        copies,		/* I - Copies to print */
-	     int	argc,		/* I - Number of command-line arguments (6 or 7) */
-	     char	*argv[])	/* I - Command-line arguments */
-{
- /*
-  * Can't print, so just reference the arguments to eliminate compiler
-  * warnings and return and exit status of 1.  Normally you would use the
-  * arguments to send a file to the printer and return 0 if everything
-  * worked OK and non-zero if there was an error.
-  */
-
-  (void)uri;
-  (void)hostname;
-  (void)resource;
-  (void)options;
-  (void)print_fd;
-  (void)copies;
-  (void)argc;
-  (void)argv;
-
-  return (CUPS_BACKEND_FAILED);
-}
-#endif /* __APPLE__ */
-
-
-/*
- * 'main()' - Send a file to the specified USB port.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int		print_fd;		/* Print file */
-  int		copies;			/* Number of copies to print */
-  int		status;			/* Exit status */
-  int		port;			/* Port number (not used) */
-  const char	*uri;			/* Device URI */
-  char		method[255],		/* Method in URI */
-		hostname[1024],		/* Hostname */
-		username[255],		/* Username info (not used) */
-		resource[1024],		/* Resource info (device and options) */
-		*options;		/* Pointer to 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);
-
- /*
-  * Ignore SIGPIPE signals...
-  */
-
-#ifdef HAVE_SIGSET
-  sigset(SIGPIPE, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGPIPE, &action, NULL);
-#else
-  signal(SIGPIPE, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
- /*
-  * Check command-line...
-  */
-
-  if (argc == 1)
-  {
-    list_devices();
-    return (CUPS_BACKEND_OK);
-  }
-  else if (argc < 6 || argc > 7)
-  {
-    _cupsLangPrintf(stderr,
-                    _("Usage: %s job-id user title copies options [file]\n"),
-                    argv[0]);
-    return (CUPS_BACKEND_FAILED);
-  }
-
- /*
-  * Extract the device name and options from the URI...
-  */
-
-  uri = cupsBackendDeviceURI(argv);
-
-  if (httpSeparateURI(HTTP_URI_CODING_ALL, uri,
-                      method, sizeof(method), username, sizeof(username),
-		      hostname, sizeof(hostname), &port,
-		      resource, sizeof(resource)) < HTTP_URI_OK)
-  {
-    _cupsLangPuts(stderr,
-                  _("ERROR: No device URI found in argv[0] or in DEVICE_URI "
-	            "environment variable!\n"));
-    return (1);
-  }
-
- /*
-  * See if there are any options...
-  */
-
-  if ((options = strchr(resource, '?')) != NULL)
-  {
-   /*
-    * Yup, terminate the device name string and move to the first
-    * character of the options...
-    */
-
-    *options++ = '\0';
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, send stdin instead...
-  */
-
-  if (argc == 6)
-  {
-    print_fd = 0;
-    copies   = 1;
-  }
-  else
-  {
-   /*
-    * Try to open the print file...
-    */
-
-    if ((print_fd = open(argv[6], O_RDONLY)) < 0)
-    {
-      _cupsLangPrintf(stderr, _("ERROR: Unable to open print file %s - %s\n"),
-                      argv[6], strerror(errno));
-      return (CUPS_BACKEND_FAILED);
-    }
-
-    copies = atoi(argv[4]);
-  }
-
- /*
-  * Finally, send the print file...
-  */
-
-  status = print_device(uri, hostname, resource, options, print_fd, copies,
-                        argc, argv);
-
- /*
-  * Close the input file and return...
-  */
-
-  if (print_fd != 0)
-    close(print_fd);
-
-  return (status);
-}
-
-
-/*
- * End of "$Id$".
- */

berkeley/Dependencies

@@ -1,13 +0,0 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-lpc.o: lpc.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h \
-  ../cups/transcode.h ../cups/debug.h ../cups/string.h ../config.h
-lpq.o: lpq.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/i18n.h ../cups/transcode.h ../cups/debug.h
-lpr.o: lpr.c ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/i18n.h ../cups/transcode.h
-lprm.o: lprm.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h \
-  ../cups/array.h ../cups/file.h ../cups/language.h ../cups/i18n.h \
-  ../cups/transcode.h ../cups/string.h ../config.h

berkeley/Makefile

@@ -1,122 +0,0 @@
-#
-# "$Id$"
-#
-#   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-include ../Makedefs
-
-TARGETS	=	lpc lpq lpr lprm
-OBJS	=	lpc.o lpq.o lpr.o lprm.o
-
-
-#
-# Make all targets...
-#
-
-all:	$(TARGETS)
-
-
-#
-# Clean all object files...
-#
-
-clean:
-	$(RM) $(OBJS) $(TARGETS)
-
-
-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
-#
-# Install all targets...
-#
-
-install:	all
-	$(INSTALL_DIR) -m 755 $(BINDIR)
-	$(INSTALL_BIN) lpq $(BINDIR)
-	$(INSTALL_BIN) lpr $(BINDIR)
-	$(INSTALL_BIN) lprm $(BINDIR)
-	$(INSTALL_DIR) -m 755 $(SBINDIR)
-	$(INSTALL_BIN) lpc $(SBINDIR)
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Uninstall all targets...
-#
-
-uninstall:
-	$(RM) $(BINDIR)/lpq
-	$(RM) $(BINDIR)/lpr
-	$(RM) $(BINDIR)/lprm
-	$(RM) $(SBINDIR)/lpc
-	-$(RMDIR) $(SBINDIR)
-	-$(RMDIR) $(BINDIR)
-
-
-#
-# lpc
-#
-
-lpc:	lpc.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
-
-
-#
-# lpq
-#
-
-lpq:	lpq.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
-
-
-#
-# lpr
-#
-
-lpr:	lpr.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
-
-
-#
-# lprm
-#
-
-lprm:	lprm.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
-
-
-#
-# End of "$Id$".
-#

berkeley/lpc.c

@@ -1,466 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lpc" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()            - Parse options and commands.
- *   compare_strings() - Compare two command-line strings.
- *   do_command()      - Do an lpc command...
- *   show_help()       - Show help messages.
- *   show_status()     - Show printers.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
-#include <cups/string.h>
-
-
-/*
- * Local functions...
- */
-
-static int	compare_strings(const char *, const char *, int);
-static void	do_command(http_t *, const char *, const char *);
-static void	show_help(const char *);
-static void	show_status(http_t *, const char *);
-
-
-/*
- * 'main()' - Parse options and commands.
- */
-
-int
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  http_t	*http;			/* Connection to server */
-  char		line[1024],		/* Input line from user */
-		*params;		/* Pointer to parameters */
-
-
-  _cupsSetLocale(argv);
-
- /*
-  * Connect to the scheduler...
-  */
-
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
-
-  if (argc > 1)
-  {
-   /*
-    * Process a single command on the command-line...
-    */
-
-    do_command(http, argv[1], argv[2]);
-  }
-  else
-  {
-   /*
-    * Do the command prompt thing...
-    */
-
-    _cupsLangPuts(stdout, _("lpc> "));
-    while (fgets(line, sizeof(line), stdin) != NULL)
-    {
-     /*
-      * Strip trailing whitespace...
-      */
-
-      for (params = line + strlen(line) - 1; params >= line;)
-        if (!isspace(*params & 255))
-	  break;
-	else
-	  *params-- = '\0';
-
-     /*
-      * Strip leading whitespace...
-      */
-
-      for (params = line; isspace(*params & 255); params ++);
-
-      if (params > line)
-        _cups_strcpy(line, params);
-
-      if (!line[0])
-      {
-       /*
-        * Nothing left, just show a prompt...
-	*/
-
-	_cupsLangPuts(stdout, _("lpc> "));
-	continue;
-      }
-
-     /*
-      * Find any options in the string...
-      */
-
-      for (params = line; *params != '\0'; params ++)
-        if (isspace(*params & 255))
-	  break;
-
-     /*
-      * Remove whitespace between the command and parameters...
-      */
-
-      while (isspace(*params & 255))
-        *params++ = '\0';
-
-     /*
-      * The "quit" and "exit" commands exit; otherwise, process as needed...
-      */
-
-      if (!compare_strings(line, "quit", 1) ||
-          !compare_strings(line, "exit", 2))
-        break;
-
-      if (*params == '\0')
-        do_command(http, line, NULL);
-      else
-        do_command(http, line, params);
-
-     /*
-      * Put another prompt out to the user...
-      */
-
-      _cupsLangPuts(stdout, _("lpc> "));
-    }
-  }
-
- /*
-  * Close the connection to the server and return...
-  */
-
-  httpClose(http);
-
-  return (0);
-}
-
-
-/*
- * 'compare_strings()' - Compare two command-line strings.
- */
-
-static int				/* O - -1 or 1 = no match, 0 = match */
-compare_strings(const char *s,		/* I - Command-line string */
-                const char *t,		/* I - Option string */
-                int        tmin)	/* I - Minimum number of unique chars in option */
-{
-  int	slen;				/* Length of command-line string */
-
-
-  slen = strlen(s);
-  if (slen < tmin)
-    return (-1);
-  else
-    return (strncmp(s, t, slen));
-}
-
-
-/*
- * 'do_command()' - Do an lpc command...
- */
-
-static void
-do_command(http_t     *http,		/* I - HTTP connection to server */
-           const char *command,		/* I - Command string */
-	   const char *params)		/* I - Parameters for command */
-{
-  if (!compare_strings(command, "status", 4))
-    show_status(http, params);
-  else if (!compare_strings(command, "help", 1) || !strcmp(command, "?"))
-    show_help(params);
-  else
-    _cupsLangPrintf(stdout,
-                    _("%s is not implemented by the CUPS version of lpc.\n"),
-		    command);
-}
-
-
-/*
- * 'show_help()' - Show help messages.
- */
-
-static void
-show_help(const char *command)		/* I - Command to describe or NULL */
-{
-  if (!command)
-  {
-    _cupsLangPrintf(stdout,
-                    _("Commands may be abbreviated.  Commands are:\n"
-		      "\n"
-		      "exit    help    quit    status  ?\n"));
-  }
-  else if (!compare_strings(command, "help", 1) || !strcmp(command, "?"))
-    _cupsLangPrintf(stdout, _("help\t\tget help on commands\n"));
-  else if (!compare_strings(command, "status", 4))
-    _cupsLangPrintf(stdout, _("status\t\tshow status of daemon and queue\n"));
-  else
-    _cupsLangPrintf(stdout, _("?Invalid help command unknown\n"));
-}
-
-
-/*
- * 'show_status()' - Show printers.
- */
-
-static void
-show_status(http_t     *http,		/* I - HTTP connection to server */
-            const char *dests)		/* I - Destinations */
-{
-  ipp_t		*request,		/* IPP Request */
-		*response;		/* IPP Response */
-  ipp_attribute_t *attr;		/* Current attribute */
-  cups_lang_t	*language;		/* Default language */
-  char		*printer,		/* Printer name */
-		*device,		/* Device URI */
-                *delimiter;		/* Char search result */
-  ipp_pstate_t	pstate;			/* Printer state */
-  int		accepting;		/* Is printer accepting jobs? */
-  int		jobcount;		/* Count of current jobs */
-  const char	*dptr,			/* Pointer into destination list */
-		*ptr;			/* Pointer into printer name */
-  int		match;			/* Non-zero if this job matches */
-  static const char *requested[] =	/* Requested attributes */
-		{
-		  "device-uri",
-		  "printer-is-accepting-jobs",
-		  "printer-name",
-		  "printer-state",
-		  "queued-job-count"
-		};
-
-
-  DEBUG_printf(("show_status(http=%p, dests=\"%s\")\n", http, dests));
-
-  if (http == NULL)
-    return;
-
- /*
-  * Build a CUPS_GET_PRINTERS request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_PRINTERS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                "requested-attributes", sizeof(requested) / sizeof(requested[0]),
-		NULL, requested);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    DEBUG_puts("show_status: request succeeded...");
-
-   /*
-    * Loop through the printers returned in the list and display
-    * their status...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      printer   = NULL;
-      device    = "file:/dev/null";
-      pstate    = IPP_PRINTER_IDLE;
-      jobcount  = 0;
-      accepting = 1;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
-      {
-        if (!strcmp(attr->name, "device-uri") &&
-	    attr->value_tag == IPP_TAG_URI)
-	  device = attr->values[0].string.text;
-        else if (!strcmp(attr->name, "printer-is-accepting-jobs") &&
-	         attr->value_tag == IPP_TAG_BOOLEAN)
-	  accepting = attr->values[0].boolean;
-        else if (!strcmp(attr->name, "printer-name") &&
-	         attr->value_tag == IPP_TAG_NAME)
-	  printer = attr->values[0].string.text;
-        else if (!strcmp(attr->name, "printer-state") &&
-	         attr->value_tag == IPP_TAG_ENUM)
-	  pstate = (ipp_pstate_t)attr->values[0].integer;
-        else if (!strcmp(attr->name, "queued-job-count") &&
-	         attr->value_tag == IPP_TAG_INTEGER)
-	  jobcount = attr->values[0].integer;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (printer == NULL)
-      {
-        if (attr == NULL)
-	  break;
-	else
-          continue;
-      }
-
-     /*
-      * A single 'all' printer name is special, meaning all printers.
-      */
-
-      if (dests != NULL && !strcmp(dests, "all"))
-        dests = NULL;
-
-     /*
-      * See if this is a printer we're interested in...
-      */
-
-      match = dests == NULL;
-
-      if (dests != NULL)
-      {
-        for (dptr = dests; *dptr != '\0';)
-	{
-	 /*
-	  * Skip leading whitespace and commas...
-	  */
-
-	  while (isspace(*dptr & 255) || *dptr == ',')
-	    dptr ++;
-
-	  if (*dptr == '\0')
-	    break;
-
-         /*
-	  * Compare names...
-	  */
-
-	  for (ptr = printer;
-	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-	       ptr ++, dptr ++);
-
-          if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
-	                       isspace(*dptr & 255)))
-	  {
-	    match = 1;
-	    break;
-	  }
-
-         /*
-	  * Skip trailing junk...
-	  */
-
-          while (!isspace(*dptr & 255) && *dptr != '\0')
-	    dptr ++;
-	  while (isspace(*dptr & 255) || *dptr == ',')
-	    dptr ++;
-
-	  if (*dptr == '\0')
-	    break;
-        }
-      }
-
-     /*
-      * Display the printer entry if needed...
-      */
-
-      if (match)
-      {
-       /*
-        * Display it...
-	*/
-
-        printf("%s:\n", printer);
-	if (!strncmp(device, "file:", 5))
-	  _cupsLangPrintf(stdout,
-	                  _("\tprinter is on device \'%s\' speed -1\n"),
-			  device + 5);
-	else
-	{
-	 /*
-	  * Just show the scheme...
-	  */
-
-	  if ((delimiter = strchr(device, ':')) != NULL )
-	  {
-	    *delimiter = '\0';
-	    _cupsLangPrintf(stdout,
-	                    _("\tprinter is on device \'%s\' speed -1\n"),
-			    device);
-	  }
-	}
-
-        if (accepting)
-	  _cupsLangPuts(stdout, _("\tqueuing is enabled\n"));
-	else
-	  _cupsLangPuts(stdout, _("\tqueuing is disabled\n"));
-
-        if (pstate != IPP_PRINTER_STOPPED)
-	  _cupsLangPuts(stdout, _("\tprinting is enabled\n"));
-	else
-	  _cupsLangPuts(stdout, _("\tprinting is disabled\n"));
-
-	if (jobcount == 0)
-	  _cupsLangPuts(stdout, _("\tno entries\n"));
-	else
-	  _cupsLangPrintf(stdout, _("\t%d entries\n"), jobcount);
-
-	_cupsLangPuts(stdout, _("\tdaemon present\n"));
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpq.c

@@ -1,671 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lpq" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()         - Parse options and commands.
- *   show_jobs()    - Show jobs.
- *   show_printer() - Show printer status.
- *   usage()        - Show program usage.
- */
-
-/*
- * Include necessary headers...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
-
-
-/*
- * Local functions...
- */
-
-static http_t	*connect_server(const char *, http_t *);
-static int	show_jobs(const char *, http_t *, const char *,
-		          const char *, const int, const int);
-static void	show_printer(const char *, http_t *, const char *);
-static void	usage(void);
-
-
-/*
- * 'main()' - Parse options and commands.
- */
-
-int
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int		i;			/* Looping var */
-  http_t	*http;			/* Connection to server */
-  const char	*dest,			/* Desired printer */
-		*user,			/* Desired user */
-		*val;			/* Environment variable name */
-  char		*instance;		/* Printer instance */
-  int		id,			/* Desired job ID */
-		all,			/* All printers */
-		interval,		/* Reporting interval */
-		longstatus;		/* Show file details */
-  int		num_dests;		/* Number of destinations */
-  cups_dest_t	*dests;			/* Destinations */
-
-
-  _cupsSetLocale(argv);
-
- /*
-  * Check for command-line options...
-  */
-
-  http       = NULL;
-  dest       = NULL;
-  user       = NULL;
-  id         = 0;
-  interval   = 0;
-  longstatus = 0;
-  all        = 0;
-  num_dests  = 0;
-  dests      = NULL;
-
-  for (i = 1; i < argc; i ++)
-    if (argv[i][0] == '+')
-      interval = atoi(argv[i] + 1);
-    else if (argv[i][0] == '-')
-    {
-      switch (argv[i][1])
-      {
-        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
-	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
-
-	    if (http)
-	      httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
-#else
-            _cupsLangPrintf(stderr,
-	                    _("%s: Sorry, no encryption support compiled in!\n"),
-	                    argv[0]);
-#endif /* HAVE_SSL */
-	    break;
-
-        case 'U' : /* Username */
-	    if (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\'-U\' option!\n"),
-		        	argv[0]);
-	        return (1);
-	      }
-
-              cupsSetUser(argv[i]);
-	    }
-	    break;
-	    
-        case 'P' : /* Printer */
-	    if (argv[i][2])
-	      dest = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-
-	      if (i >= argc)
-	      {
-		httpClose(http);
-		cupsFreeDests(num_dests, dests);
-	        
-	        usage();
-	      }
-
-	      dest = argv[i];
-	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance++ = '\0';
-
-            http = connect_server(argv[0], http);
-
-            if (num_dests == 0)
-              num_dests = cupsGetDests2(http, &dests);
-
-            if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
-	    {
-	      if (instance)
-		_cupsLangPrintf(stderr,
-		                _("%s: Error - unknown destination \"%s/%s\"!\n"),
-		        	argv[0], dest, instance);
-              else
-		_cupsLangPrintf(stderr,
-		                _("%s: Unknown destination \"%s\"!\n"),
-				argv[0], dest);
-
-	      return (1);
-	    }
-	    break;
-
-	case 'a' : /* All printers */
-	    all = 1;
-	    break;
-
-        case 'h' : /* Connect to host */
-	    if (http)
-	    {
-	      httpClose(http);
-	      http = NULL;
-	    }
-
-	    if (argv[i][2] != '\0')
-              cupsSetServer(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected hostname after "
-			          "\'-h\' option!\n"),
-				argv[0]);
-		return (1);
-              }
-	      else
-                cupsSetServer(argv[i]);
-	    }
-	    break;
-
-	case 'l' : /* Long status */
-	    longstatus = 1;
-	    break;
-
-	default :
-	    httpClose(http);
-	    cupsFreeDests(num_dests, dests);
-
-	    usage();
-	    break;
-      }
-    }
-    else if (isdigit(argv[i][0] & 255))
-      id = atoi(argv[i]);
-    else
-      user = argv[i];
-
-  http = connect_server(argv[0], http);
-
-  if (dest == NULL && !all)
-  {
-    if (num_dests == 0)
-      num_dests = cupsGetDests2(http, &dests);
-
-    for (i = 0; i < num_dests; i ++)
-      if (dests[i].is_default)
-	dest = dests[i].name;
-
-    if (dest == NULL)
-    {
-      val = NULL;
-
-      if ((dest = getenv("LPDEST")) == NULL)
-      {
-	if ((dest = getenv("PRINTER")) != NULL)
-	{
-          if (!strcmp(dest, "lp"))
-            dest = NULL;
-	  else
-	    val = "PRINTER";
-	}
-      }
-      else
-	val = "LPDEST";
-
-      if (dest && !cupsGetDest(dest, NULL, num_dests, dests))
-	_cupsLangPrintf(stderr,
-	                _("%s: error - %s environment variable names "
-			  "non-existent destination \"%s\"!\n"),
-        	        argv[0], val, dest);
-      else
-	_cupsLangPrintf(stderr,
-	                _("%s: error - no default destination available.\n"),
-			argv[0]);
-      httpClose(http);
-      cupsFreeDests(num_dests, dests);
-      return (1);
-    }
-  }
-
- /*
-  * Show the status in a loop...
-  */
-
-  for (;;)
-  {
-    if (dest)
-      show_printer(argv[0], http, dest);
-
-    i = show_jobs(argv[0], http, dest, user, id, longstatus);
-
-    if (i && interval)
-    {
-      fflush(stdout);
-      sleep(interval);
-    }
-    else
-      break;
-  }
-
- /*
-  * Close the connection to the server and return...
-  */
-
-  cupsFreeDests(num_dests, dests);
-  httpClose(http);
-
-  return (0);
-}
-
-
-/*
- * 'connect_server()' - Connect to the server as necessary...
- */
-
-static http_t *				/* O - New HTTP connection */
-connect_server(const char *command,	/* I - Command name */
-               http_t     *http)	/* I - Current HTTP connection */
-{
-  if (!http)
-  {
-    http = httpConnectEncrypt(cupsServer(), ippPort(),
-	                      cupsEncryption());
-
-    if (http == NULL)
-    {
-      _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command);
-      exit(1);
-    }
-  }
-
-  return (http);
-}
-
-
-/*
- * 'show_jobs()' - Show jobs.
- */
-
-static int				/* O - Number of jobs in queue */
-show_jobs(const char *command,		/* I - Command name */
-          http_t     *http,		/* I - HTTP connection to server */
-          const char *dest,		/* I - Destination */
-	  const char *user,		/* I - User */
-	  const int  id,		/* I - Job ID */
-	  const int  longstatus)	/* I - 1 if long report desired */
-{
-  ipp_t		*request,		/* IPP Request */
-		*response;		/* IPP Response */
-  ipp_attribute_t *attr;		/* Current attribute */
-  const char	*jobdest,		/* Pointer into job-printer-uri */
-		*jobuser,		/* Pointer to job-originating-user-name */
-		*jobname;		/* Pointer to job-name */
-  ipp_jstate_t	jobstate;		/* job-state */
-  int		jobid,			/* job-id */
-		jobsize,		/* job-k-octets */
-#ifdef __osf__
-		jobpriority,		/* job-priority */
-#endif /* __osf__ */
-		jobcount,		/* Number of jobs */
-		jobcopies,		/* Number of copies */
-		rank;			/* Rank of job */
-  char		resource[1024];		/* Resource string */
-  char		rankstr[255];		/* Rank string */
-  char		namestr[1024];		/* Job name string */
-  static const char *ranks[10] =	/* Ranking strings */
-		{
-		  "th",
-		  "st",
-		  "nd",
-		  "rd",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th"
-		};
-
-
-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
-
-  if (http == NULL)
-    return (0);
-
- /*
-  * Build an IPP_GET_JOBS or IPP_GET_JOB_ATTRIBUTES request, which requires
-  * the following attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri
-  */
-
-  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
-
-  if (dest == NULL)
-  {
-    if (id)
-      sprintf(resource, "ipp://localhost/jobs/%d", id);
-    else
-      strcpy(resource, "ipp://localhost/jobs");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-                 NULL, resource);
-  }
-  else
-  {
-    httpAssembleURIf(HTTP_URI_CODING_ALL, resource, sizeof(resource), "ipp",
-                     NULL, "localhost", 0, "/printers/%s", dest);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-                 NULL, resource);
-  }
-
-  if (user)
-  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                 "requesting-user-name", NULL, user);
-    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
-  }
-
- /*
-  * Do the request and get back a response...
-  */
-
-  jobcount = 0;
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    if (response->request.status.status_code > IPP_OK_CONFLICT)
-    {
-      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
-      ippDelete(response);
-      return (0);
-    }
-
-    rank = 1;
-
-   /*
-    * Loop through the job list and display them...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid       = 0;
-      jobsize     = 0;
-#ifdef __osf__
-      jobpriority = 50;
-#endif /* __osf__ */
-      jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
-      jobdest     = NULL;
-      jobcopies   = 1;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (!strcmp(attr->name, "job-id") &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
-
-        if (!strcmp(attr->name, "job-k-octets") &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobsize = attr->values[0].integer;
-
-#ifdef __osf__
-        if (!strcmp(attr->name, "job-priority") &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobpriority = attr->values[0].integer;
-#endif /* __osf__ */
-
-        if (!strcmp(attr->name, "job-state") &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  jobstate = (ipp_jstate_t)attr->values[0].integer;
-
-        if (!strcmp(attr->name, "job-printer-uri") &&
-	    attr->value_tag == IPP_TAG_URI)
-	  if ((jobdest = strrchr(attr->values[0].string.text, '/')) != NULL)
-	    jobdest ++;
-
-        if (!strcmp(attr->name, "job-originating-user-name") &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobuser = attr->values[0].string.text;
-
-        if (!strcmp(attr->name, "job-name") &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobname = attr->values[0].string.text;
-
-        if (!strcmp(attr->name, "copies") &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobcopies = attr->values[0].integer;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (jobdest == NULL || jobid == 0)
-      {
-        if (attr == NULL)
-	  break;
-	else
-          continue;
-      }
-
-      if (!longstatus && jobcount == 0)
-#ifdef __osf__
-	_cupsLangPuts(stdout,
-	              _("Rank   Owner      Pri  Job        Files"
-		        "                       Total Size\n"));
-#else
-	_cupsLangPuts(stdout,
-	              _("Rank    Owner   Job     File(s)"
-		        "                         Total Size\n"));
-#endif /* __osf__ */
-
-      jobcount ++;
-
-     /*
-      * Display the job...
-      */
-
-      if (jobstate == IPP_JOB_PROCESSING)
-	strcpy(rankstr, "active");
-      else
-      {
-       /*
-        * Make the rank show the "correct" suffix for each number
-	* (11-13 are the only special cases, for English anyways...)
-	*/
-
-	if ((rank % 100) >= 11 && (rank % 100) <= 13)
-	  snprintf(rankstr, sizeof(rankstr), "%dth", rank);
-	else
-	  snprintf(rankstr, sizeof(rankstr), "%d%s", rank, ranks[rank % 10]);
-
-	rank ++;
-      }
-
-      if (longstatus)
-      {
-        _cupsLangPuts(stdout, "\n");
-
-        if (jobcopies > 1)
-	  snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
-	           jobname);
-	else
-	  strlcpy(namestr, jobname, sizeof(namestr));
-
-        _cupsLangPrintf(stdout, _("%s: %-33.33s [job %d localhost]\n"),
-	                jobuser, rankstr, jobid);
-        _cupsLangPrintf(stdout, _("        %-39.39s %.0f bytes\n"),
-	                namestr, 1024.0 * jobsize);
-      }
-      else
-#ifdef __osf__
-        _cupsLangPrintf(stdout,
-	                _("%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes\n"),
-			rankstr, jobuser, jobpriority, jobid, jobname,
-			1024.0 * jobsize);
-#else
-        _cupsLangPrintf(stdout,
-	                _("%-7s %-7.7s %-7d %-31.31s %.0f bytes\n"),
-			rankstr, jobuser, jobid, jobname, 1024.0 * jobsize);
-#endif /* __osf */
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-  else
-  {
-    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
-    return (0);
-  }
-
-  if (jobcount == 0)
-    _cupsLangPuts(stdout, _("no entries\n"));
-
-  return (jobcount);
-}
-
-
-/*
- * 'show_printer()' - Show printer status.
- */
-
-static void
-show_printer(const char *command,	/* I - Command name */
-             http_t     *http,		/* I - HTTP connection to server */
-             const char *dest)		/* I - Destination */
-{
-  ipp_t		*request,		/* IPP Request */
-		*response;		/* IPP Response */
-  ipp_attribute_t *attr;		/* Current attribute */
-  ipp_pstate_t	state;			/* Printer state */
-  char		uri[HTTP_MAX_URI];	/* Printer URI */
-
-
-  if (http == NULL)
-    return;
-
- /*
-  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/printers/%s", dest);
-  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 (response->request.status.status_code > IPP_OK_CONFLICT)
-    {
-      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
-      ippDelete(response);
-      return;
-    }
-
-    if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
-      state = (ipp_pstate_t)attr->values[0].integer;
-    else
-      state = IPP_PRINTER_STOPPED;
-
-    switch (state)
-    {
-      case IPP_PRINTER_IDLE :
-          _cupsLangPrintf(stdout, _("%s is ready\n"), dest);
-	  break;
-      case IPP_PRINTER_PROCESSING :
-          _cupsLangPrintf(stdout, _("%s is ready and printing\n"),
-	                  dest);
-	  break;
-      case IPP_PRINTER_STOPPED :
-          _cupsLangPrintf(stdout, _("%s is not ready\n"), dest);
-	  break;
-    }
-
-    ippDelete(response);
-  }
-  else
-    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
-}
-
-
-/*
- * 'usage()' - Show program usage.
- */
-
-static void
-usage(void)
-{
-  _cupsLangPuts(stderr,
-                _("Usage: lpq [-P dest] [-U username] [-h hostname[:port]] "
-		  "[-l] [+interval]\n"));
-  exit(1);
-}
-
-
-/*
- * End of "$Id$".
- */

berkeley/lpr.c

@@ -1,524 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lpr" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()       - Parse options and send files for printing.
- *   sighandler() - Signal catcher for when we print from stdin...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <cups/string.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-
-#ifndef WIN32
-#  include <unistd.h>
-#  include <signal.h>
-
-
-/*
- * Local functions.
- */
-
-void	sighandler(int);
-#endif /* !WIN32 */
-
-
-/*
- * Globals...
- */
-
-char	tempfile[1024];		/* Temporary file for printing from stdin */
-
-
-/*
- * 'main()' - Parse options and send files for printing.
- */
-
-int
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int		i, j;			/* Looping var */
-  int		job_id;			/* Job ID */
-  char		ch;			/* Option character */
-  char		*printer,		/* Destination printer or class */
-		*instance;		/* Instance */
-  const char	*title,			/* Job title */
-		*val;			/* Environment variable name */
-  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_options;		/* Number of options */
-  cups_option_t	*options;		/* Options */
-  int		deletefile;		/* Delete file after print? */
-  char		buffer[8192];		/* Copy buffer */
-  ssize_t	bytes;			/* Bytes copied */
-  off_t		filesize;		/* Size of temp file */
-  int		temp;			/* Temporary file descriptor */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;		/* Signal action */
-  struct sigaction oldaction;		/* Old signal action */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
-  _cupsSetLocale(argv);
-
-  deletefile  = 0;
-  printer     = NULL;
-  num_dests   = 0;
-  dests       = NULL;
-  num_options = 0;
-  options     = NULL;
-  num_files   = 0;
-  title       = NULL;
-
-  for (i = 1; i < argc; i ++)
-    if (argv[i][0] == '-')
-      switch (ch = argv[i][1])
-      {
-        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
-	    cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
-#else
-            _cupsLangPrintf(stderr,
-	                    _("%s: Sorry, no encryption support compiled in!\n"),
-	                    argv[0]);
-#endif /* HAVE_SSL */
-	    break;
-
-        case 'U' : /* Username */
-	    if (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\'-U\' option!\n"),
-		        	argv[0]);
-	        return (1);
-	      }
-
-              cupsSetUser(argv[i]);
-	    }
-	    break;
-	    
-        case 'H' : /* Connect to host */
-	    if (argv[i][2] != '\0')
-              cupsSetServer(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected hostname after "
-			          "\'-H\' option!\n"),
-				argv[0]);
-		return (1);
-              }
-	      else
-                cupsSetServer(argv[i]);
-	    }
-	    break;
-
-	case '1' : /* TROFF font set 1 */
-	case '2' : /* TROFF font set 2 */
-	case '3' : /* TROFF font set 3 */
-	case '4' : /* TROFF font set 4 */
-	case 'i' : /* indent */
-	case 'w' : /* width */
-	    if (argv[i][2] == '\0')
-	    {
-	      i ++;
-
-	      if (i >= argc)
-	      {
-		_cupsLangPrintf(stderr,
-		                _("%s: Error - expected value after \'-%c\' "
-				  "option!\n"), argv[0], ch);
-		return (1);
-	      }
-	    }
-
-        case 'c' : /* CIFPLOT */
-	case 'd' : /* DVI */
-	case 'f' : /* FORTRAN */
-	case 'g' : /* plot */
-	case 'n' : /* Ditroff */
-	case 't' : /* Troff */
-	case 'v' : /* Raster image */
-	    _cupsLangPrintf(stderr,
-	                    _("%s: Warning - \'%c\' format modifier not "
-			      "supported - output may not be correct!\n"),
-			    argv[0], ch);
-	    break;
-
-	case 'o' : /* Option */
-	    if (argv[i][2] != '\0')
-	      num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: error - expected option=value after "
-			          "\'-o\' option!\n"),
-				argv[0]);
-		return (1);
-	      }
-
-	      num_options = cupsParseOptions(argv[i], num_options, &options);
-	    }
-	    break;
-
-	case 'l' : /* Literal/raw */
-            num_options = cupsAddOption("raw", "true", num_options, &options);
-	    break;
-
-	case 'p' : /* Prettyprint */
-            num_options = cupsAddOption("prettyprint", "true", 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;
-
-	case 'm' : /* Mail on completion */
-	    {
-	      char	email[1024];	/* EMail address */
-
-
-	      snprintf(email, sizeof(email), "mailto:%s@%s", cupsUser(),
-	               httpGetHostname(NULL, buffer, sizeof(buffer)));
-	      num_options = cupsAddOption("notify-recipient-uri", email,
-	                                  num_options, &options);
-	    }
-	    break;
-
-	case 'q' : /* Queue file but don't print */
-            num_options = cupsAddOption("job-hold-until", "indefinite",
-	                                num_options, &options);
-	    break;
-
-	case 'r' : /* Remove file after printing */
-	    deletefile = 1;
-	    break;
-
-        case 'P' : /* Destination printer or class */
-	    if (argv[i][2] != '\0')
-	      printer = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected destination after "
-			          "\'-P\' option!\n"),
-				argv[0]);
-		return (1);
-	      }
-
-	      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);
-	    }
-	    break;
-
-	case '#' : /* Number of copies */
-	    if (argv[i][2] != '\0')
-	      num_copies = atoi(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected copy count after "
-			          "\'-#\' option!\n"),
-				argv[0]);
-		return (1);
-	      }
-
-	      num_copies = atoi(argv[i]);
-	    }
-
-            sprintf(buffer, "%d", num_copies);
-            num_options = cupsAddOption("copies", buffer, num_options, &options);
-	    break;
-
-	case 'C' : /* Class */
-	case 'J' : /* Job name */
-	case 'T' : /* Title */
-	    if (argv[i][2] != '\0')
-	      title = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-		_cupsLangPrintf(stderr,
-		                _("%s: Error - expected name after \'-%c\' "
-				  "option!\n"), argv[0], ch);
-		return (1);
-	      }
-
-	      title = argv[i];
-	    }
-	    break;
-
-	default :
-	    _cupsLangPrintf(stderr,
-	                    _("%s: Error - unknown option \'%c\'!\n"),
-			    argv[0], argv[i][1]);
-	    return (1);
-      }
-    else if (num_files < 1000)
-    {
-     /*
-      * Print a file...
-      */
-
-      if (access(argv[i], R_OK) != 0)
-      {
-        _cupsLangPrintf(stderr,
-	                _("%s: Error - unable to access \"%s\" - %s\n"),
-		        argv[0], argv[i], strerror(errno));
-        return (1);
-      }
-
-      files[num_files] = argv[i];
-      num_files ++;
-
-      if (title == NULL)
-      {
-        if ((title = strrchr(argv[i], '/')) != NULL)
-	  title ++;
-	else
-          title = argv[i];
-      }
-    }
-    else
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - too many files - \"%s\"\n"),
-		      argv[0], argv[i]);
- /*
-  * See if we have any files to print; if not, print from stdin...
-  */
-
-  if (printer == NULL)
-  {
-    if (num_dests == 0)
-      num_dests = cupsGetDests(&dests);
-
-    if ((dest = cupsGetDest(NULL, NULL, num_dests, dests)) != NULL)
-    {
-      printer = dest->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);
-    }
-  }
-
-  if (printer == NULL)
-  {
-    val = NULL;
-
-    if ((printer = getenv("LPDEST")) == NULL)
-    {
-      if ((printer = getenv("PRINTER")) != NULL)
-      {
-        if (!strcmp(printer, "lp"))
-          printer = NULL;
-	else
-	  val = "PRINTER";
-      }
-    }
-    else
-      val = "LPDEST";
-
-    if (printer && !cupsGetDest(printer, NULL, num_dests, dests))
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - %s environment variable names "
-		        "non-existent destination \"%s\"!\n"),
-        	      argv[0], val, printer);
-    else if (cupsLastError() == IPP_NOT_FOUND)
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - no default destination available.\n"),
-		      argv[0]);
-    else
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - scheduler not responding!\n"),
-		      argv[0]);
-
-    return (1);
-  }
-
-  if (num_files > 0)
-  {
-    job_id = cupsPrintFiles(printer, num_files, files, title, num_options, options);
-
-    if (deletefile && job_id > 0)
-    {
-     /*
-      * Delete print files after printing...
-      */
-
-      for (i = 0; i < num_files; i ++)
-        unlink(files[i]);
-    }
-  }
-  else
-  {
-    num_files = 1;
-
-#ifndef WIN32
-#  if defined(HAVE_SIGSET)
-    sigset(SIGHUP, sighandler);
-    if (sigset(SIGINT, sighandler) == SIG_IGN)
-      sigset(SIGINT, SIG_IGN);
-    sigset(SIGTERM, sighandler);
-#  elif defined(HAVE_SIGACTION)
-    memset(&action, 0, sizeof(action));
-    action.sa_handler = sighandler;
-
-    sigaction(SIGHUP, &action, NULL);
-    sigaction(SIGINT, NULL, &oldaction);
-    if (oldaction.sa_handler != SIG_IGN)
-      sigaction(SIGINT, &action, NULL);
-    sigaction(SIGTERM, &action, NULL);
-#  else
-    signal(SIGHUP, sighandler);
-    if (signal(SIGINT, sighandler) == SIG_IGN)
-      signal(SIGINT, SIG_IGN);
-    signal(SIGTERM, sighandler);
-#  endif
-#endif /* !WIN32 */
-
-    if ((temp = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
-    {
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - unable to create temporary file "
-		        "\"%s\" - %s\n"),
-        	      argv[0], tempfile, strerror(errno));
-      return (1);
-    }
-
-    while ((bytes = read(0, buffer, sizeof(buffer))) > 0)
-      if (write(temp, buffer, bytes) < 0)
-      {
-	_cupsLangPrintf(stderr,
-	                _("%s: Error - unable to write to temporary file "
-			  "\"%s\" - %s\n"),
-        		argv[0], tempfile, strerror(errno));
-        close(temp);
-        unlink(tempfile);
-	return (1);
-      }
-
-    filesize = lseek(temp, 0, SEEK_CUR);
-    close(temp);
-
-    if (filesize <= 0)
-    {
-      _cupsLangPrintf(stderr,
-                      _("%s: Error - stdin is empty, so no job has been sent.\n"),
-		      argv[0]);
-      unlink(tempfile);
-      return (1);
-    }
-
-    if (title)
-      job_id = cupsPrintFile(printer, tempfile, title, num_options, options);
-    else
-      job_id = cupsPrintFile(printer, tempfile, "(stdin)", num_options, options);
-
-    unlink(tempfile);
-  }
-
-  if (job_id < 1)
-  {
-    _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
-    return (1);
-  }
-
-  return (0);
-}
-
-
-#ifndef WIN32
-/*
- * 'sighandler()' - Signal catcher for when we print from stdin...
- */
-
-void
-sighandler(int s)			/* I - Signal number */
-{
- /*
-  * Remove the temporary file we're using to print from stdin...
-  */
-
-  unlink(tempfile);
-
- /*
-  * Exit...
-  */
-
-  exit(s);
-}
-#endif /* !WIN32 */
-
-
-/*
- * End of "$Id$".
- */

berkeley/lprm.c

@@ -1,289 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lprm" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main() - Parse options and cancel jobs.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
-
-
-/*
- * 'main()' - Parse options and cancel jobs.
- */
-
-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments */
-     char *argv[])		/* I - Command-line arguments */
-{
-  http_t	*http;		/* HTTP connection to server */
-  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 */
-  int		num_dests;	/* Number of destinations */
-  cups_dest_t	*dests,		/* Destinations */
-		*defdest;	/* Default destination */
-  http_encryption_t encryption;	/* Encryption? */
-
-
-  _cupsSetLocale(argv);
-
- /*
-  * Setup to cancel individual print jobs...
-  */
-
-  op         = IPP_CANCEL_JOB;
-  job_id     = 0;
-  dest       = NULL;
-  response   = NULL;
-  http       = NULL;
-  encryption = cupsEncryption();
-
- /*
-  * Open a connection to the server...
-  */
-
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(), encryption)) == NULL)
-  {
-    _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
-    return (1);
-  }
-
-  num_dests  = cupsGetDests2(http, &dests);
-  defdest    = cupsGetDest(NULL, NULL, num_dests, dests);
-  dest       = defdest ? defdest->name : NULL;
-
- /*
-  * Process command-line arguments...
-  */
-
-  for (i = 1; i < argc; i ++)
-    if (argv[i][0] == '-' && argv[i][1] != '\0')
-      switch (argv[i][1])
-      {
-        case 'E' : /* Encrypt */
-#ifdef HAVE_SSL
-	    encryption = HTTP_ENCRYPT_REQUIRED;
-
-	    httpEncryption(http, encryption);
-	    cupsSetEncryption(encryption);
-#else
-            _cupsLangPrintf(stderr,
-	                    _("%s: Sorry, no encryption support compiled in!\n"),
-	                    argv[0]);
-#endif /* HAVE_SSL */
-	    break;
-
-        case 'P' : /* Cancel jobs on a printer */
-	    if (argv[i][2])
-	      dest = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-	      dest = argv[i];
-	    }
-
-	    if ((instance = strchr(dest, '/')) != NULL)
-	      *instance = '\0';
-
-	    if (cupsGetDest(dest, NULL, num_dests, dests) == NULL)
-	    {
-	      _cupsLangPrintf(stderr,
-	                      _("%s: Error - unknown destination \"%s\"!\n"),
-			      argv[0], dest);
-              cupsFreeDests(num_dests, dests);
-	      httpClose(http);
-	      return(1);
-	    }
-	    break;
-
-        case 'U' : /* Username */
-	    if (argv[i][2] != '\0')
-	      cupsSetUser(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		                _("%s: Error - expected username after "
-				  "\'-U\' option!\n"),
-		        	argv[0]);
-	        return (1);
-	      }
-
-              cupsSetUser(argv[i]);
-	    }
-	    break;
-	    
-        case 'h' : /* Connect to host */
-	    if (argv[i][2] != '\0')
-              cupsSetServer(argv[i] + 2);
-	    else
-	    {
-	      i ++;
-
-	      if (i >= argc)
-	      {
-	        _cupsLangPrintf(stderr,
-		        	_("%s: Error - expected hostname after "
-			          "\'-h\' option!\n"),
-				argv[0]);
-		return (1);
-              }
-	      else
-                cupsSetServer(argv[i]);
-	    }
-
-            httpClose(http);
-            cupsFreeDests(num_dests, dests);
-
-	    if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-	                                   encryption)) == NULL)
-	    {
-	      _cupsLangPuts(stderr, _("lprm: Unable to contact server!\n"));
-	      return (1);
-	    }
-
-	    num_dests  = cupsGetDests2(http, &dests);
-	    defdest    = cupsGetDest(NULL, NULL, num_dests, dests);
-	    dest       = defdest ? defdest->name : NULL;
-	    break;
-
-	default :
-	    _cupsLangPrintf(stderr,
-	                    _("%s: Error - unknown option \'%c\'!\n"),
-			    argv[0], argv[i][1]);
-            cupsFreeDests(num_dests, dests);
-	    httpClose(http);
-	    return (1);
-      }
-    else
-    {
-     /*
-      * Cancel a job or printer...
-      */
-
-      if (isdigit(argv[i][0] & 255) &&
-          cupsGetDest(argv[i], NULL, num_dests, dests) == NULL)
-      {
-        dest   = NULL;
-	op     = IPP_CANCEL_JOB;
-        job_id = atoi(argv[i]);
-      }
-      else if (!strcmp(argv[i], "-"))
-      {
-       /*
-        * Cancel all jobs
-        */
-
-        op = IPP_PURGE_JOBS;
-      }
-      else
-      {
-        dest   = argv[i];
-        job_id = 0;
-      }
-
-     /*
-      * Build an IPP request, which requires the following
-      * attributes:
-      *
-      *    attributes-charset
-      *    attributes-natural-language
-      *    printer-uri + job-id *or* job-uri
-      *    [requesting-user-name]
-      */
-
-      request = ippNewRequest(op);
-
-      if (dest)
-      {
-        httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-	                 "localhost", 0, "/printers/%s", dest);
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	             "printer-uri", NULL, uri);
-	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
-	              job_id);
-      }
-      else
-      {
-        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
-	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
-	             uri);
-      }
-
-      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                   "requesting-user-name", NULL, cupsUser());
-
-     /*
-      * Do the request and get back a response...
-      */
-
-      if (op == IPP_PURGE_JOBS)
-        response = cupsDoRequest(http, request, "/admin/");
-      else
-        response = cupsDoRequest(http, request, "/jobs/");
-
-      ippDelete(response);
-
-      if (cupsLastError() > IPP_OK_CONFLICT)
-      {
-        _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
-
-        cupsFreeDests(num_dests, dests);
-        httpClose(http);
-	return (1);
-      }
-    }
-
- /*
-  * If nothing has been canceled yet, cancel the current job on the specified
-  * (or default) printer...
-  */
-
-  if (response == NULL)
-    if (!cupsCancelJob(dest, 0))
-    {
-      _cupsLangPrintf(stderr, "%s: %s\n", argv[0], cupsLastErrorString());
-      cupsFreeDests(num_dests, dests);
-      httpClose(http);
-      return (1);
-    }
-
-  cupsFreeDests(num_dests, dests);
-  httpClose(http);
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */

build.mak

@@ -0,0 +1,143 @@
+#
+# Makefile for CUPS build and test repository.
+#
+# This makefile MUST be used from the build.sh script, otherwise the
+# environment will not be configured properly...
+#
+# Copyright 2007-2016 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
+
+# Subdirectories to be built...
+DIRS	=	\
+		stable/.all \
+		development/.all \
+
+
+# Make everything...
+all:	tools/.all $(DIRS)
+
+
+# Clean everything...
+clean:	tools/.clean $(DIRS:.all=.clean)
+	@echo Removing \"temp\" directory...
+	rm -rf temp
+	@echo Removing old failed test reports...
+	find . -name 'cups-str*.html' -mtime +7 -print -exec rm -f '{}' \;
+	find . -name 'error_log-*' -mtime +7 -print -exec rm -f '{}' \;
+
+
+# Make CUPS stable
+stable/.all:	stable/Makedefs
+	@echo Making all in CUPS stable...
+	cd stable && $(MAKE) all check
+
+stable/.clean:
+	@cd stable; if test -f Makedefs; then \
+		echo Cleaning CUPS stable...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+
+stable/Makedefs:	stable/Makedefs.in stable/configure \
+			stable/packaging/cups.list.in \
+			stable/config.h.in
+	@cd stable; if test -f Makedefs; then \
+		echo Cleaning CUPS stable...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+	@echo Configuring CUPS stable...
+	cd stable && ./configure $(BUILDOPTIONS) \
+		--enable-static \
+		--enable-unit-tests --enable-debug-printfs
+
+stable/configure: stable/configure.ac \
+	stable/config-scripts/cups-common.m4 \
+	stable/config-scripts/cups-compiler.m4 \
+	stable/config-scripts/cups-defaults.m4 \
+	stable/config-scripts/cups-directories.m4 \
+	stable/config-scripts/cups-dnssd.m4 \
+	stable/config-scripts/cups-gssapi.m4 \
+	stable/config-scripts/cups-largefile.m4 \
+	stable/config-scripts/cups-libtool.m4 \
+	stable/config-scripts/cups-manpages.m4 \
+	stable/config-scripts/cups-network.m4 \
+	stable/config-scripts/cups-opsys.m4 \
+	stable/config-scripts/cups-pam.m4 \
+	stable/config-scripts/cups-poll.m4 \
+	stable/config-scripts/cups-scripting.m4 \
+	stable/config-scripts/cups-sharedlibs.m4 \
+	stable/config-scripts/cups-ssl.m4 \
+	stable/config-scripts/cups-startup.m4 \
+	stable/config-scripts/cups-threads.m4
+	@echo Updating CUPS stable configure script...
+	cd stable; rm -rf autom4te.cache configure; autoconf
+
+
+# Make CUPS master (bleeding edge development)
+development/.all:	development/Makedefs
+	@echo Making all in CUPS development...
+	cd development && $(MAKE) all check
+
+development/.clean:
+	@cd development; if test -f Makedefs; then \
+		echo Cleaning CUPS development...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+
+development/Makedefs:	development/Makedefs.in development/configure \
+			development/packaging/cups.list.in \
+			development/config.h.in
+	@cd development; if test -f Makedefs; then \
+		echo Cleaning CUPS development...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+	@echo Configuring CUPS development...
+	cd development && ./configure $(BUILDOPTIONS) \
+		--enable-static \
+		--enable-unit-tests --enable-debug-printfs
+
+development/configure: development/configure.ac \
+	development/config-scripts/cups-common.m4 \
+	development/config-scripts/cups-compiler.m4 \
+	development/config-scripts/cups-defaults.m4 \
+	development/config-scripts/cups-directories.m4 \
+	development/config-scripts/cups-dnssd.m4 \
+	development/config-scripts/cups-gssapi.m4 \
+	development/config-scripts/cups-largefile.m4 \
+	development/config-scripts/cups-libtool.m4 \
+	development/config-scripts/cups-manpages.m4 \
+	development/config-scripts/cups-network.m4 \
+	development/config-scripts/cups-opsys.m4 \
+	development/config-scripts/cups-pam.m4 \
+	development/config-scripts/cups-poll.m4 \
+	development/config-scripts/cups-scripting.m4 \
+	development/config-scripts/cups-sharedlibs.m4 \
+	development/config-scripts/cups-ssl.m4 \
+	development/config-scripts/cups-startup.m4 \
+	development/config-scripts/cups-threads.m4
+	@echo Updating CUPS development configure script...
+	cd development; rm -rf autom4te.cache configure; autoconf
+
+# Make the build tools
+tools/.all:	tools/Makefile
+	@echo Making all in tools...
+	cd tools && $(MAKE) install
+
+tools/.clean:
+	@cd tools; if test -f Makefile; then \
+		echo Cleaning tools...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+
+tools/Makefile:	tools/Makefile.in tools/configure
+	@cd tools; if test -f Makefile; then \
+		echo Cleaning tools...; \
+		$(MAKE) distclean || exit 1; \
+	fi
+	@echo Configuring Tools...
+	cd tools && ./configure $(BUILDOPTIONS) --prefix=$(BASEDIR)/temp

build.sh

@@ -0,0 +1,233 @@
+#!/bin/sh
+#
+# Common script for building the current stable and development (master)
+# branches of CUPS.
+#
+# Copyright 2007-2016 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
+#
+# Usage:
+#
+#     build.sh [--if-changed] [--quiet] [--update] [target(s)]
+#
+
+# Copy any build/test environment variables...
+BUILDOPTIONS=""
+BUILDNOTIFY=""
+BUILDSUBJECT="[`hostname`]"
+if test -f buildtest.env; then
+	. ./buildtest.env
+fi
+
+# Get the path to this script...
+BASEDIR=`dirname $0`
+if test $BASEDIR = .; then
+	BASEDIR=`pwd`
+fi
+
+# Make sure the temporary directory is there...
+if test ! -d $BASEDIR/temp; then
+	mkdir -p $BASEDIR/temp
+fi
+
+# Setup common path stuff...
+PATH=""
+for dir in /usr/xpg4/bin /usr/ccs/bin /opt/SUNWspro/bin /opt/sfw/bin \
+	/usr/sfw/bin /usr/bsd /usr/freeware/bin /opt/aCC/bin /usr/contrib/bin \
+	/usr/local/bin $HOME/oss/bin; do
+	if test -d $dir; then
+		PATH="$PATH:$dir"
+	fi
+done
+
+if test "x$PATH" = x; then
+	PATH="$BASEDIR/temp/bin:/usr/bin:/bin"
+else
+	PATH="$BASEDIR/temp/bin$PATH:/usr/bin:/bin"
+fi
+
+export PATH
+
+if test -x /usr/xpg4/bin/grep; then
+	grep=/usr/xpg4/bin/grep
+else
+	grep=grep
+fi
+
+if test -x /usr/local/bin/gmake; then
+	make=/usr/local/bin/gmake
+else
+	make=make
+fi
+
+# Parse command-line arguments:
+ifchanged=no
+quiet=no
+update=no
+targets=""
+
+while test $# -gt 0; do
+	case "$1" in
+		--ifchanged | --if-changed) ifchanged=yes;;
+		--quiet) quiet=yes;;
+		--update | update) update=yes;;
+		*) targets="$targets $1";;
+	esac
+
+	shift
+done
+
+
+# Start the build...
+if test $quiet = yes; then
+	if test $update = yes; then
+		exec >/dev/null 2>&1
+	else
+		if test -f build.log; then
+			mv build.log build.log.O
+		fi
+
+		exec >build.log 2>&1
+	fi
+fi
+
+if test "x$targets" = x; then
+	targets="all"
+fi
+
+echo "Starting build of '$targets' on `date`"
+
+if test -f git.log; then
+	# Show Subversion updates...
+	echo git pull --recurse-submodules; git submodule update --recursive
+	cat git.log
+	git status | $grep modified: >git.log
+	if test -s git.log; then
+		echo ""
+		echo ERROR: Local files have modifications:
+		echo ""
+		cat git.log
+		echo ""
+	fi
+	rm -f git.log
+fi
+
+# Update and then build safely...
+if test $update = yes; then
+	cd $BASEDIR
+	(git pull --recurse-submodules; git submodule update --recursive) 2>&1 >git.log
+
+	# Need to exec since this script might change...
+	options=""
+	if test $quiet = yes; then
+		options="--quiet $options"
+	fi
+	if test $ifchanged = yes; then
+		options="--ifchanged $options"
+	fi
+
+	exec ./build.sh $options $targets
+fi
+
+# Make sure submodules are initialized...
+if test ! -f stable/Makedefs.in; then
+	echo Initializing submodules...
+	git submodule init
+	git submodule update
+fi
+
+# Look for changes to the dependent projects
+changed=0
+
+for dir in . tools stable development; do
+	rev=`git rev-parse HEAD $dir`
+	if test -f $dir/.buildrev; then
+		oldrev=`cat $dir/.buildrev`
+	else
+		oldrev=""
+	fi
+
+	if test "x$rev" != "x$oldrev"; then
+		changed=1
+	fi
+
+	echo $rev >$dir/.buildrev
+done
+
+if test $ifchanged = yes -a $changed = 0; then
+	echo No changes to build.
+	exit 0
+fi
+
+# Setup the compiler flags to point to all of the dependent libraries...
+#CFLAGS="-I$BASEDIR/temp/include"
+#CPPFLAGS="-I$BASEDIR/temp/include"
+#CXXFLAGS="-I$BASEDIR/temp/include"
+#DSOFLAGS="-L$BASEDIR/temp/lib"
+#LDFLAGS="-L$BASEDIR/temp/lib"
+
+CFLAGS="${CFLAGS:=}"
+CPPFLAGS="${CPPFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+DSOFLAGS="${DSOFLAGS:=}"
+LDFLAGS="${LDFLAGS:=}"
+
+export CFLAGS
+export CPPFLAGS
+export CXXFLAGS
+export DSOFLAGS
+export LDFLAGS
+
+case `uname` in
+	Linux*)
+		if test "`uname -m`" = x86_64; then
+			# 64-bit Linux needs this, at least for now...
+			X_LIBS="-L/usr/X11R6/lib64"
+			export X_LIBS
+		fi
+		;;
+	*BSD*)
+		CFLAGS="$CFLAGS -I/usr/local/include"
+		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+		DSOFLAGS="$DSOFLAGS -L/usr/local/lib"
+		LDFLAGS="$LDFLAGS -L/usr/local/lib"
+		;;
+esac
+
+# Show the environment...
+echo Environment:
+env
+
+# Do the build using the top-level makefile...
+echo $make -f build.mak BASEDIR=$BASEDIR BUILDOPTIONS="$BUILDOPTIONS" $targets
+$make -f build.mak BASEDIR=$BASEDIR BUILDOPTIONS="$BUILDOPTIONS" $targets </dev/null
+status=$?
+
+if test $status = 0; then
+	echo Build succeeded on `date`
+else
+	echo Build failed on `date`
+fi
+
+# If configured, send the build log to a central server for processing...
+if test "x$BUILDNOTIFY" != x -a -x temp/bin/sendbuildlog -a $quiet = yes; then
+	attachments=""
+
+	date=`date "+%Y-%m-%d"`
+
+	if test -f stable/test/cups-str-2.1-$date-$USER.html; then
+		attachments="$attachments -a stable/test/cups-str-2.1-$date-$USER.html"
+	fi
+
+	if test -f developent/test/cups-str-2.2-$date-$USER.html; then
+		attachments="$attachments -a developent/test/cups-str-2.2-$date-$USER.html"
+	fi
+
+	temp/bin/sendbuildlog -b $status -s "$BUILDSUBJECT r$rev" $attachments "$BUILDNOTIFY" build.log
+fi

cgi-bin/Dependencies

@@ -1,56 +0,0 @@
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-help-index.o: help-index.c cgi-private.h cgi.h ../cups/cups.h \
-  ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h \
-  ../cups/file.h ../cups/language.h ../cups/array.h help-index.h \
-  ../cups/debug.h ../cups/i18n.h ../cups/transcode.h ../cups/string.h \
-  ../config.h ../cups/dir.h
-html.o: html.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-ipp-var.o: ipp-var.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-search.o: search.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-template.o: template.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h \
-  ../cups/adminutil.h ../cups/cups.h ../cups/file.h
-classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-printers.o: printers.c cgi-private.h cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h ../cups/debug.h \
-  ../cups/i18n.h ../cups/transcode.h ../cups/string.h ../config.h
-testcgi.o: testcgi.c cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
-  ../cups/array.h help-index.h
-testhi.o: testhi.c cgi.h ../cups/cups.h ../cups/ipp.h ../cups/http.h \
-  ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h \
-  ../cups/array.h help-index.h
-testtemplate.o: testtemplate.c cgi.h ../cups/cups.h ../cups/ipp.h \
-  ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h \
-  ../cups/language.h ../cups/array.h help-index.h

cgi-bin/Makefile

@@ -1,171 +0,0 @@
-#
-# "$Id$"
-#
-#   CGI makefile for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-include ../Makedefs
-
-CGIS	=	admin.cgi classes.cgi help.cgi jobs.cgi printers.cgi
-TARGETS	=	libcgi.a $(CGIS) testcgi testhi testtemplate
-LIBOBJS	=	help-index.o html.o ipp-var.o search.o template.o var.o
-OBJS	=	$(LIBOBJS) admin.o classes.o help.o \
-		jobs.o printers.o testcgi.o testhi.o testtemplate.o
-
-
-#
-# Make all targets...
-#
-
-all:	$(TARGETS)
-
-
-#
-# Clean all object files...
-#
-
-clean:
-	$(RM) $(OBJS) $(TARGETS)
-
-
-#
-# Update dependencies (without system header dependencies...)
-#
-
-depend:
-	makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
-
-
-#
-# Install all targets...
-#
-
-install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
-	for file in $(CGIS); do \
-		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
-	done
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
-			cp $$file $(SYMROOT); \
-		done \
-	fi
-
-
-#
-# Uninstall all targets...
-#
-
-uninstall:
-	for file in $(CGIS); do \
-		$(RM) $(SERVERBIN)/cgi-bin/$$file; \
-	done
-	-$(RMDIR) $(SERVERBIN)/cgi-bin
-
-
-#
-# libcgi.a
-#
-
-libcgi.a:	$(LIBOBJS)
-	echo Archiving $@...
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-
-#
-# admin.cgi
-#
-
-admin.cgi:	admin.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ admin.o libcgi.a $(LIBS)
-
-
-#
-# classes.cgi
-#
-
-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o libcgi.a $(LIBS)
-
-
-#
-# help.cgi
-#
-
-help.cgi:	help.o ../Makedefs libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ help.o libcgi.a $(LIBS)
-
-
-#
-# jobs.cgi
-#
-
-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o libcgi.a $(LIBS)
-
-
-#
-# printers.cgi
-#
-
-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS) libcgi.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ printers.o libcgi.a $(LIBS)
-
-
-#
-# testcgi
-#
-
-testcgi:	testcgi.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testcgi.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-
-
-#
-# testhi
-#
-
-testhi:	testhi.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhi.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-
-
-#
-# testtemplate
-#
-
-testtemplate:	testtemplate.o ../Makedefs libcgi.a ../cups/libcups.a
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testtemplate.o libcgi.a ../cups/libcups.a \
-		$(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
-
-
-#
-# Dependencies...
-#
-
-include Dependencies
-
-
-#
-# End of "$Id$".
-#

cgi-bin/cgi-private.h

@@ -1,35 +0,0 @@
-/*
- * "$Id$"
- *
- *   Private CGI definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi.h"
-#include <cups/debug.h>
-#include <cups/i18n.h>
-#include <cups/string.h>
-
-
-/*
- * Limits...
- */
-
-#define CUPS_PAGE_MAX	10		/* Maximum items per page */
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/cgi.h

@@ -1,100 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI support library definitions.
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- */
-
-#ifndef _CUPS_CGI_H_
-#  define _CUPS_CGI_H_
-
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <time.h>
-#  include <sys/stat.h>
-
-#  ifdef WIN32
-#    include <direct.h>
-#    include <io.h>
-#  else
-#    include <unistd.h>
-#  endif /* WIN32 */
-
-#  include <cups/cups.h>
-#  include <cups/array.h>
-#  include "help-index.h"
-
-
-/*
- * Types...
- */
-
-typedef struct cgi_file_s		/**** Uploaded file data ****/
-{
-  char		tempfile[1024],		/* Temporary file containing data */
-		*name,			/* Variable name */
-		*filename,		/* Original filename */
-		*mimetype;		/* MIME media type */
-  size_t	filesize;		/* Size of uploaded file */
-} cgi_file_t;
-
-
-/*
- * Prototypes...
- */
-
-extern void		cgiAbort(const char *title, const char *stylesheet,
-			         const char *format, ...);
-extern int		cgiCheckVariables(const char *names);
-extern void		*cgiCompileSearch(const char *query);
-extern void		cgiCopyTemplateFile(FILE *out, const char *tmpl);
-extern void		cgiCopyTemplateLang(const char *tmpl);
-extern int		cgiDoSearch(void *search, const char *text);
-extern void		cgiEndHTML(void);
-extern char		*cgiFormEncode(char *dst, const char *src, size_t dstsize);
-extern void		cgiFreeSearch(void *search);
-extern const char	*cgiGetArray(const char *name, int element);
-extern void		cgiGetAttributes(ipp_t *request, const char *tmpl);
-extern char		*cgiGetCookie(const char *name, char *buf, int buflen);
-extern const cgi_file_t	*cgiGetFile(void);
-extern cups_array_t	*cgiGetIPPObjects(ipp_t *response, void *search);
-extern int		cgiGetSize(const char *name);
-extern char		*cgiGetTemplateDir(void);
-extern const char	*cgiGetVariable(const char *name);
-extern int		cgiInitialize(void);
-extern int		cgiIsPOST(void);
-extern void		cgiMoveJobs(http_t *http, const char *dest, int job_id);
-extern void		cgiPrintTestPage(http_t *http, const char *dest);
-extern char		*cgiRewriteURL(const char *uri, char *url, int urlsize,
-			               const char *newresource);
-extern void		cgiSetArray(const char *name, int element,
-			            const char *value);
-extern void		cgiSetCookie(const char *name, const char *value,
-			             const char *path, const char *domain,
-				     time_t expires, int secure);
-extern ipp_attribute_t	*cgiSetIPPObjectVars(ipp_attribute_t *obj,
-			                     const char *prefix, int element);
-extern int		cgiSetIPPVars(ipp_t *response, const char *filter_name,
-			              const char *filter_value,
-			              const char *prefix, int parent_el);
-extern void		cgiSetServerVersion(void);
-extern void		cgiSetSize(const char *name, int size);
-extern void		cgiSetVariable(const char *name, const char *value);
-extern void		cgiShowIPPError(const char *message);
-extern void		cgiShowJobs(http_t *http, const char *dest);
-extern void		cgiStartHTML(const char *title);
-extern const char	*cgiText(const char *message);
-
-#endif /* !_CUPS_CGI_H_ */
-
-/*
- * End of "$Id$".
- */

cgi-bin/classes.c

@@ -1,458 +0,0 @@
-/*
- * "$Id$"
- *
- *   Class status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()             - Main entry for CGI.
- *   show_all_classes() - Show all classes...
- *   show_class()       - Show a single class.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-
-
-/*
- * Local functions...
- */
-
-void	show_all_classes(http_t *http, const char *username);
-void	show_class(http_t *http, const char *printer);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  const char	*pclass;		/* Class name */
-  const char	*user;			/* Username */
-  http_t	*http;			/* Connection to the server */
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  ipp_attribute_t *attr;		/* IPP attribute */
-  const char	*op;			/* Operation to perform, if any */
-  static const char *def_attrs[] =	/* Attributes for default printer */
-		{
-		  "printer-name",
-		  "printer-uri-supported"
-		};
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-
-  op = cgiGetVariable("OP");
-
- /*
-  * Set the web interface section...
-  */
-
-  cgiSetVariable("SECTION", "classes");
-
- /*
-  * See if we are displaying a printer or all classes...
-  */
-
-  if ((pclass = getenv("PATH_INFO")) != NULL)
-  {
-    pclass ++;
-
-    if (!*pclass)
-      pclass = NULL;
-  }
-
- /*
-  * See who is logged in...
-  */
-
-  user = getenv("REMOTE_USER");
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
-
- /*
-  * Get the default printer...
-  */
-
-  if (!op)
-  {
-   /*
-    * Get the default destination...
-    */
-
-    request = ippNewRequest(CUPS_GET_DEFAULT);
-
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes",
-		  sizeof(def_attrs) / sizeof(def_attrs[0]), NULL, def_attrs);
-
-    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	url[HTTP_MAX_URI];	/* New URL */
-
-
-        cgiSetVariable("DEFAULT_URI",
-	               cgiRewriteURL(attr->values[0].string.text,
-		                     url, sizeof(url), NULL));
-      }
-
-      ippDelete(response);
-    }
-
-   /*
-    * See if we need to show a list of classes or the status of a
-    * single printer...
-    */
-
-    if (!pclass)
-      show_all_classes(http, user);
-    else
-      show_class(http, pclass);
-  }
-  else if (!strcasecmp(op, "print-test-page") && pclass)
-    cgiPrintTestPage(http, pclass);
-  else if (!strcasecmp(op, "move-jobs") && pclass)
-    cgiMoveJobs(http, pclass, 0);
-  else
-  {
-   /*
-    * Unknown/bad operation...
-    */
-
-    if (pclass)
-      cgiStartHTML(pclass);
-    else
-      cgiStartHTML(cgiText(_("Classes")));
-
-    cgiCopyTemplateLang("error-op.tmpl");
-    cgiEndHTML();
-  }
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'show_all_classes()' - Show all classes...
- */
-
-void
-show_all_classes(http_t     *http,	/* I - Connection to server */
-                 const char *user)	/* I - Username */
-{
-  int			i;		/* Looping var */
-  ipp_t			*request,	/* IPP request */
-			*response;	/* IPP response */
-  cups_array_t		*classes;	/* Array of class objects */
-  ipp_attribute_t	*pclass;	/* Class object */
-  int			ascending,	/* Order of classes (0 = descending) */
-			first,		/* First class to show */
-			count;		/* Number of classes */
-  const char		*var;		/* Form variable */
-  void			*search;	/* Search data */
-  char			url[1024],	/* URL for prev/next/this */
-			*urlptr,	/* Position in URL */
-			*urlend;	/* End of URL */
-
-
- /*
-  * Show the standard header...
-  */
-
-  cgiStartHTML(cgiText(_("Classes")));
-
- /*
-  * Build a CUPS_GET_CLASSES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    requesting-user-name
-  */
-
-  request = ippNewRequest(CUPS_GET_CLASSES);
-
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-        	 "requesting-user-name", NULL, user);
-
-  cgiGetAttributes(request, "classes.tmpl");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-   /*
-    * Get a list of matching job objects.
-    */
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-      search = cgiCompileSearch(var);
-    else
-      search = NULL;
-
-    classes = cgiGetIPPObjects(response, search);
-    count   = cupsArrayCount(classes);
-
-    if (search)
-      cgiFreeSearch(search);
-
-   /*
-    * Figure out which classes to display...
-    */
-
-    if ((var = cgiGetVariable("FIRST")) != NULL)
-      first = atoi(var);
-    else
-      first = 0;
-
-    if (first >= count)
-      first = count - CUPS_PAGE_MAX;
-
-    first = (first / CUPS_PAGE_MAX) * CUPS_PAGE_MAX;
-
-    if (first < 0)
-      first = 0;
-
-    sprintf(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
-
-    if ((var = cgiGetVariable("ORDER")) != NULL)
-      ascending = !strcasecmp(var, "asc");
-    else
-      ascending = 1;
-
-    if (ascending)
-    {
-      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, first);
-	   i < CUPS_PAGE_MAX && pclass;
-	   i ++, pclass = (ipp_attribute_t *)cupsArrayNext(classes))
-        cgiSetIPPObjectVars(pclass, NULL, i);
-    }
-    else
-    {
-      for (i = 0, pclass = (ipp_attribute_t *)cupsArrayIndex(classes, count - first - 1);
-	   i < CUPS_PAGE_MAX && pclass;
-	   i ++, pclass = (ipp_attribute_t *)cupsArrayPrev(classes))
-        cgiSetIPPObjectVars(pclass, NULL, i);
-    }
-
-   /*
-    * Save navigation URLs...
-    */
-
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/classes/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/classes/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
-
-    if (first > 0)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
-    }
-
-    if ((first + CUPS_PAGE_MAX) < count)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
-    }
-
-   /*
-    * Then show everything...
-    */
-
-    cgiCopyTemplateLang("search.tmpl");
-
-    cgiCopyTemplateLang("classes-header.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-    cgiCopyTemplateLang("classes.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-   /*
-    * Delete the response...
-    */
-
-    cupsArrayDelete(classes);
-    ippDelete(response);
-  }
-  else
-  {
-   /*
-    * Show the error...
-    */
-
-    cgiShowIPPError(_("Unable to get class list:"));
-  }
-
-   cgiEndHTML();
-}
-
-
-/*
- * 'show_class()' - Show a single class.
- */
-
-void
-show_class(http_t     *http,		/* I - Connection to server */
-           const char *pclass)		/* I - Name of class */
-{
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  ipp_attribute_t *attr;		/* IPP attribute */
-  char		uri[HTTP_MAX_URI];	/* Printer URI */
-  char		refresh[1024];		/* Refresh URL */
-
-
- /*
-  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/classes/%s", pclass);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-               uri);
-
-  cgiGetAttributes(request, "classes.tmpl");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-   /*
-    * Got the result; set the CGI variables and check the status of a
-    * single-queue request...
-    */
-
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-
-    if (pclass && (attr = ippFindAttribute(response, "printer-state",
-                                            IPP_TAG_ENUM)) != NULL &&
-        attr->values[0].integer == IPP_PRINTER_PROCESSING)
-    {
-     /*
-      * Class is processing - automatically refresh the page until we
-      * are done printing...
-      */
-
-      cgiFormEncode(uri, pclass, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "10;URL=/classes/%s", uri);
-      cgiSetVariable("refresh_page", refresh);
-    }
-
-   /*
-    * Delete the response...
-    */
-
-    ippDelete(response);
-
-   /*
-    * Show the standard header...
-    */
-
-    cgiStartHTML(pclass);
-
-   /*
-    * Show the class status...
-    */
-
-    cgiCopyTemplateLang("classes.tmpl");
-
-   /*
-    * Show jobs for the specified class...
-    */
-
-    cgiCopyTemplateLang("class-jobs-header.tmpl");
-    cgiShowJobs(http, pclass);
-  }
-  else
-  {
-   /*
-    * Show the IPP error...
-    */
-
-    cgiStartHTML(pclass);
-    cgiShowIPPError(_("Unable to get class status:"));
-  }
-
-   cgiEndHTML();
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/help-index.h

@@ -1,75 +0,0 @@
-/*
- * "$Id$"
- *
- *   On-line help index definitions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- */
-
-#ifndef _CUPS_HELP_INDEX_H_
-#  define _CUPS_HELP_INDEX_H_
-
-/*
- * Include necessary headers...
- */
-
-#  include <cups/array.h>
-
-
-/*
- * Data structures...
- */
-
-typedef struct help_word_s		/**** Help word structure... ****/
-{
-  int		count;			/* Number of occurrences */
-  char		*text;			/* Word text */
-} help_word_t;
-
-typedef struct help_node_s		/**** Help node structure... ****/
-{
-  char		*filename;		/* Filename, relative to help dir */
-  char		*section;		/* Section name (NULL if none) */
-  char		*anchor;		/* Anchor name (NULL if none) */
-  char		*text;			/* Text in anchor */
-  cups_array_t	*words;			/* Words after this node */
-  time_t	mtime;			/* Last modification time */
-  off_t		offset;			/* Offset in file */
-  size_t	length;			/* Length in bytes */
-  int		score;			/* Search score */
-} help_node_t;
-
-typedef struct help_index_s		/**** Help index structure ****/
-{
-  int		search;			/* 1 = search index, 0 = normal */
-  cups_array_t	*nodes;			/* Nodes sorted by filename */
-  cups_array_t	*sorted;		/* Nodes sorted by score + text */
-} help_index_t;
-
-
-/*
- * Functions...
- */
-
-extern void		helpDeleteIndex(help_index_t *hi);
-extern help_node_t	*helpFindNode(help_index_t *hi, const char *filename,
-			              const char *anchor);
-extern help_index_t	*helpLoadIndex(const char *hifile, const char *directory);
-extern int		helpSaveIndex(help_index_t *hi, const char *hifile);
-extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
-			                 const char *section,
-					 const char *filename);
-
-
-#endif /* !_CUPS_HELP_INDEX_H_ */
-
-/*
- * End of "$Id$".
- */

cgi-bin/help.c

@@ -1,379 +0,0 @@
-/*
- * "$Id$"
- *
- *   On-line help CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main() - Main entry for CGI.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  help_index_t	*hi,			/* Help index */
-		*si;			/* Search index */
-  help_node_t	*n;			/* Current help node */
-  int		i;			/* Looping var */
-  const char	*query;			/* Search query */
-  const char	*cache_dir;		/* CUPS_CACHEDIR environment variable */
-  const char	*docroot;		/* CUPS_DOCROOT environment variable */
-  const char	*helpfile;		/* Current help file */
-  const char	*topic;			/* Current topic */
-  char		topic_data[1024];	/* Topic form data */
-  const char	*section;		/* Current section */
-  char		filename[1024],		/* Filename */
-		directory[1024];	/* Directory */
-  cups_file_t	*fp;			/* Help file */
-  char		line[1024];		/* Line from file */
-  int		printable;		/* Show printable version? */
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-
-  printable = cgiGetVariable("PRINTABLE") != NULL;
-
- /*
-  * Set the web interface section...
-  */
-
-  cgiSetVariable("SECTION", "help");
-
- /*
-  * Load the help index...
-  */
-
-  if ((cache_dir = getenv("CUPS_CACHEDIR")) == NULL)
-    cache_dir = CUPS_CACHEDIR;
-
-  snprintf(filename, sizeof(filename), "%s/help.index", cache_dir);
-
-  if ((docroot = getenv("CUPS_DOCROOT")) == NULL)
-    docroot = CUPS_DOCROOT;
-
-  snprintf(directory, sizeof(directory), "%s/help", docroot);
-
-  fprintf(stderr, "DEBUG: helpLoadIndex(filename=\"%s\", directory=\"%s\")\n",
-          filename, directory);
-
-  hi = helpLoadIndex(filename, directory);
-  if (!hi)
-  {
-    perror(filename);
-
-    cgiStartHTML(cgiText(_("Help")));
-    cgiSetVariable("ERROR", "Unable to load help index!");
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-
-    return (1);
-  }
-
-  fprintf(stderr, "DEBUG: %d nodes in help index...\n",
-          cupsArrayCount(hi->nodes));
-
- /*
-  * See if we are viewing a file...
-  */
-
-  for (i = 0; i < argc; i ++)
-    fprintf(stderr, "argv[%d]=\"%s\"\n", i, argv[i]);
-
-  if ((helpfile = getenv("PATH_INFO")) != NULL)
-  {
-    helpfile ++;
-
-    if (!*helpfile)
-      helpfile = NULL;
-  }
-
-  if (helpfile)
-  {
-   /*
-    * Verify that the help file exists and is part of the index...
-    */
-
-    snprintf(filename, sizeof(filename), "%s/help/%s", docroot, helpfile);
-
-    fprintf(stderr, "DEBUG: helpfile=\"%s\", filename=\"%s\"\n",
-            helpfile, filename);
-
-    if (access(filename, R_OK))
-    {
-      perror(filename);
-
-      cgiStartHTML(cgiText(_("Help")));
-      cgiSetVariable("ERROR", "Unable to access help file!");
-      cgiCopyTemplateLang("error.tmpl");
-      cgiEndHTML();
-
-      return (1);
-    }
-
-    if ((n = helpFindNode(hi, helpfile, NULL)) == NULL)
-    {
-      cgiStartHTML(cgiText(_("Help")));
-      cgiSetVariable("ERROR", "Help file not in index!");
-      cgiCopyTemplateLang("error.tmpl");
-      cgiEndHTML();
-
-      return (1);
-    }
-
-   /*
-    * Set the page title and save the help file...
-    */
-
-    cgiSetVariable("HELPFILE", helpfile);
-    cgiSetVariable("HELPTITLE", n->text);
-    cgiSetVariable("TOPIC", n->section);
-
-   /*
-    * Send a standard page header...
-    */
-
-    if (printable)
-      puts("Content-Type: text/html;charset=utf-8\n");
-    else
-      cgiStartHTML(n->text);
-  }
-  else
-  {
-   /*
-    * Send a standard page header...
-    */
-
-    cgiStartHTML(cgiText(_("Help")));
-  }
-
- /*
-  * Do a search as needed...
-  */
-
-  query = cgiGetVariable("QUERY");
-  topic = cgiGetVariable("TOPIC");
-  si    = helpSearchIndex(hi, query, topic, helpfile);
-
-  fprintf(stderr, "DEBUG: query=\"%s\", topic=\"%s\"\n",
-          query ? query : "(null)", topic ? topic : "(null)");
-
-  if (si)
-  {
-    help_node_t	*nn;			/* Parent node */
-
-
-    fprintf(stderr,
-            "DEBUG: si=%p, si->sorted=%p, cupsArrayCount(si->sorted)=%d\n", si,
-            si->sorted, cupsArrayCount(si->sorted));
-
-    for (i = 0, n = (help_node_t *)cupsArrayFirst(si->sorted);
-         n;
-	 i ++, n = (help_node_t *)cupsArrayNext(si->sorted))
-    {
-      if (helpfile && n->anchor)
-        snprintf(line, sizeof(line), "#%s", n->anchor);
-      else if (n->anchor)
-        snprintf(line, sizeof(line), "/help/%s?QUERY=%s#%s", n->filename,
-	         query ? query : "", n->anchor);
-      else
-        snprintf(line, sizeof(line), "/help/%s?QUERY=%s", n->filename,
-	         query ? query : "");
-
-      cgiSetArray("QTEXT", i, n->text);
-      cgiSetArray("QLINK", i, line);
-
-      if (!helpfile && n->anchor)
-      {
-        nn = helpFindNode(hi, n->filename, NULL);
-
-        snprintf(line, sizeof(line), "/help/%s?QUERY=%s", nn->filename,
-	         query ? query : "");
-
-        cgiSetArray("QPTEXT", i, nn->text);
-	cgiSetArray("QPLINK", i, line);
-      }
-      else
-      {
-        cgiSetArray("QPTEXT", i, "");
-	cgiSetArray("QPLINK", i, "");
-      }
-
-      fprintf(stderr, "DEBUG: [%d] = \"%s\" @ \"%s\"\n", i, n->text, line);
-    }
-
-    helpDeleteIndex(si);
-  }
-
- /*
-  * OK, now list the bookmarks within the index...
-  */
-
-  for (i = 0, section = NULL, n = (help_node_t *)cupsArrayFirst(hi->sorted);
-       n;
-       n = (help_node_t *)cupsArrayNext(hi->sorted))
-  {
-    if (n->anchor)
-      continue;
-
-   /*
-    * Add a section link as needed...
-    */
-
-    if (n->section &&
-        (!section || strcmp(n->section, section)))
-    {
-     /*
-      * Add a link for this node...
-      */
-
-      snprintf(line, sizeof(line), "/help/?TOPIC=%s&QUERY=%s",
-               cgiFormEncode(topic_data, n->section, sizeof(topic_data)),
-	       query ? query : "");
-      cgiSetArray("BMLINK", i, line);
-      cgiSetArray("BMTEXT", i, n->section);
-      cgiSetArray("BMINDENT", i, "0");
-
-      i ++;
-      section = n->section;
-    }
-
-    if (!topic || strcmp(n->section, topic))
-      continue;
-
-   /*
-    * Add a link for this node...
-    */
-
-    snprintf(line, sizeof(line), "/help/%s?TOPIC=%s&QUERY=%s", n->filename,
-             cgiFormEncode(topic_data, n->section, sizeof(topic_data)),
-	     query ? query : "");
-    cgiSetArray("BMLINK", i, line);
-    cgiSetArray("BMTEXT", i, n->text);
-    cgiSetArray("BMINDENT", i, "1");
-
-    i ++;
-
-    if (helpfile && !strcmp(helpfile, n->filename))
-    {
-      help_node_t	*nn;		/* Pointer to sub-node */
-
-
-      cupsArraySave(hi->sorted);
-
-      for (nn = (help_node_t *)cupsArrayFirst(hi->sorted);
-           nn;
-	   nn = (help_node_t *)cupsArrayNext(hi->sorted))
-        if (nn->anchor && !strcmp(helpfile, nn->filename))
-	{
-	 /*
-	  * Add a link for this node...
-	  */
-
-	  snprintf(line, sizeof(line), "#%s", nn->anchor);
-	  cgiSetArray("BMLINK", i, line);
-	  cgiSetArray("BMTEXT", i, nn->text);
-	  cgiSetArray("BMINDENT", i, "2");
-
-	  i ++;
-	}
-
-      cupsArrayRestore(hi->sorted);
-    }
-  }
-
- /*
-  * Show the search and bookmark content...
-  */
-
-  if (!helpfile || !printable)
-    cgiCopyTemplateLang("help-header.tmpl");
-  else
-    cgiCopyTemplateLang("help-printable.tmpl");
-
- /*
-  * If we are viewing a file, copy it in now...
-  */
-
-  if (helpfile)
-  {
-    if ((fp = cupsFileOpen(filename, "r")) != NULL)
-    {
-      int	inbody;			/* Are we inside the body? */
-
-
-      inbody = 0;
-
-      while (cupsFileGets(fp, line, sizeof(line)))
-      {
-        if (inbody)
-	{
-	  if (!strncasecmp(line, "</BODY>", 7))
-	    break;
-
-	  printf("%s\n", line);
-        }
-	else if (!strncasecmp(line, "<BODY", 5))
-	  inbody = 1;
-      }
-
-      cupsFileClose(fp);
-    }
-    else
-    {
-      perror(filename);
-      cgiSetVariable("ERROR", "Unable to open help file.");
-      cgiCopyTemplateLang("error.tmpl");
-    }
-  }
-
- /*
-  * Send a standard trailer...
-  */
-
-  if (!printable)
-    cgiEndHTML();
-  else
-    puts("</BODY>\n</HTML>");
-
- /*
-  * Delete the index...
-  */
-
-  helpDeleteIndex(hi);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/html.c

@@ -1,178 +0,0 @@
-/*
- * "$Id$"
- *
- *   HTML support functions for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   cgiEndHTML()      - End a HTML page.
- *   cgiFormEncode()   - Encode a string as a form variable...
- *   cgiStartHTML()    - Start a HTML page.
- *   cgi_null_passwd() - Return a NULL password for authentication.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-
-
-/*
- * Local functions...
- */
-
-static const char	*cgi_null_passwd(const char *prompt);
-
-
-/*
- * 'cgiEndHTML()' - End a HTML page.
- */
-
-void
-cgiEndHTML(void)
-{
- /*
-  * Send the standard trailer...
-  */
-
-  cgiCopyTemplateLang("trailer.tmpl");
-}
-
-
-/*
- * 'cgiFormEncode()' - Encode a string as a form variable...
- */
-
-char *					/* O - Destination string */
-cgiFormEncode(char       *dst,		/* I - Destination string */
-              const char *src,		/* I - Source string */
-	      size_t     dstsize)	/* I - Size of destination string */
-{
-  char			*dstptr,	/* Pointer into destination */
-			*dstend;	/* End of destination */
-  static const char	*hex =		/* Hexadecimal characters */
-			"0123456789ABCDEF";
-
-
- /*
-  * Mark the end of the string...
-  */
-
-  dstend = dst + dstsize - 1;
-
- /*
-  * Loop through the source string and copy...
-  */
-
-  for (dstptr = dst; *src && dstptr < dstend;)
-  {
-    switch (*src)
-    { 
-      case ' ' :
-         /*
-	  * Encode spaces with a "+"...
-	  */
-
-          *dstptr++ = '+';
-	  src ++;
-	  break;
-
-      case '&' :
-      case '%' :
-      case '+' :
-         /*
-	  * Encode special characters with %XX escape...
-	  */
-
-          if (dstptr < (dstend - 2))
-	  {
-	    *dstptr++ = '%';
-	    *dstptr++ = hex[(*src & 255) >> 4];
-	    *dstptr++ = hex[*src & 15];
-	    src ++;
-	  }
-          break;
-
-      default :
-         /*
-	  * Copy other characters literally...
-	  */
-
-          *dstptr++ = *src++;
-	  break;
-    }
-  }
-
- /*
-  * Nul-terminate the destination string...
-  */
-
-  *dstptr = '\0';
-
- /*
-  * Return the encoded string...
-  */
-
-  return (dst);
-}
-
-
-/*
- * 'cgiStartHTML()' - Start a HTML page.
- */
-
-void
-cgiStartHTML(const char *title)		/* I - Title of page */
-{
- /*
-  * Disable any further authentication attempts...
-  */
-
-  cupsSetPasswordCB(cgi_null_passwd);
-
- /*
-  * Tell the client to expect UTF-8 encoded HTML...
-  */
-
-  puts("Content-Type: text/html;charset=utf-8\n");
-
- /*
-  * Send a standard header...
-  */
-
-  cgiSetVariable("TITLE", title);
-  cgiSetServerVersion();
-
-  cgiCopyTemplateLang("header.tmpl");
-}
-
-
-/*
- * 'cgi_null_passwd()' - Return a NULL password for authentication.
- */
-
-static const char *			/* O - NULL */
-cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
-{
-  (void)prompt;
-
-  fprintf(stderr, "DEBUG: cgi_null_passwd(prompt=\"%s\") called!\n",
-          prompt ? prompt : "(null)");
-
-  return (NULL);
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/jobs.c

@@ -1,208 +0,0 @@
-/*
- * "$Id$"
- *
- *   Job status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()      - Main entry for CGI.
- *   do_job_op() - Do a job operation.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-
-
-/*
- * Local functions...
- */
-
-static void	do_job_op(http_t *http, int job_id, ipp_op_t op);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  http_t	*http;			/* Connection to the server */
-  const char	*op;			/* Operation name */
-  const char	*job_id_var;		/* Job ID form variable */
-  int		job_id;			/* Job ID */
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-
- /*
-  * Set the web interface section...
-  */
-
-  cgiSetVariable("SECTION", "jobs");
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
-
- /*
-  * Get the job ID, if any...
-  */
-
-  if ((job_id_var = cgiGetVariable("JOB_ID")) != NULL)
-    job_id = atoi(job_id_var);
-  else
-    job_id = 0;
-
- /*
-  * Do the operation...
-  */
-
-  if ((op = cgiGetVariable("OP")) != NULL && job_id > 0)
-  {
-   /*
-    * Do the operation...
-    */
-
-    if (!strcmp(op, "cancel-job"))
-      do_job_op(http, job_id, IPP_CANCEL_JOB);
-    else if (!strcmp(op, "hold-job"))
-      do_job_op(http, job_id, IPP_HOLD_JOB);
-    else if (!strcmp(op, "move-job"))
-      cgiMoveJobs(http, NULL, job_id);
-    else if (!strcmp(op, "release-job"))
-      do_job_op(http, job_id, IPP_RELEASE_JOB);
-    else if (!strcmp(op, "restart-job"))
-      do_job_op(http, job_id, IPP_RESTART_JOB);
-    else
-    {
-     /*
-      * Bad operation code...  Display an error...
-      */
-
-      cgiStartHTML(cgiText(_("Jobs")));
-      cgiCopyTemplateLang("error-op.tmpl");
-      cgiEndHTML();
-    }
-  }
-  else
-  {
-   /*
-    * Show a list of jobs...
-    */
-
-    cgiStartHTML(cgiText(_("Jobs")));
-    cgiShowJobs(http, NULL);
-    cgiEndHTML();
-  }
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'do_job_op()' - Do a job operation.
- */
-
-static void
-do_job_op(http_t      *http,		/* I - HTTP connection */
-          int         job_id,		/* I - Job ID */
-	  ipp_op_t    op)		/* I - Operation to perform */
-{
-  ipp_t		*request;		/* IPP request */
-  char		uri[HTTP_MAX_URI];	/* Job URI */
-  const char	*user;			/* Username */
-
-
- /*
-  * Build a job request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri (purge-jobs)
-  *    requesting-user-name
-  */
-
-  request = ippNewRequest(op);
-
-  snprintf(uri, sizeof(uri), "ipp://localhost/jobs/%d", job_id);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-               NULL, uri);
-
-  if ((user = getenv("REMOTE_USER")) == NULL)
-    user = "guest";
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-               "requesting-user-name", NULL, user);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  ippDelete(cupsDoRequest(http, request, "/jobs"));
-
-  if (cupsLastError() <= IPP_OK_CONFLICT && getenv("HTTP_REFERER"))
-  {
-   /*
-    * Redirect successful updates back to the parent page...
-    */
-
-    char	url[1024];		/* Encoded URL */
-
-
-    strcpy(url, "5;URL=");
-    cgiFormEncode(url + 6, getenv("HTTP_REFERER"), sizeof(url) - 6);
-    cgiSetVariable("refresh_page", url);
-  }
-
-  cgiStartHTML(cgiText(_("Jobs")));
-
-  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Job operation failed:"));
-  else if (op == IPP_CANCEL_JOB)
-    cgiCopyTemplateLang("job-cancel.tmpl");
-  else if (op == IPP_HOLD_JOB)
-    cgiCopyTemplateLang("job-hold.tmpl");
-  else if (op == IPP_RELEASE_JOB)
-    cgiCopyTemplateLang("job-release.tmpl");
-  else if (op == IPP_RESTART_JOB)
-    cgiCopyTemplateLang("job-restart.tmpl");
-
-  cgiEndHTML();
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/printers.c

@@ -1,633 +0,0 @@
-/*
- * "$Id$"
- *
- *   Printer status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()              - Main entry for CGI.
- *   print_command()     - Send a print command to the printer.
- *   show_all_printers() - Show all printers...
- *   show_printer()      - Show a single printer.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-#include <errno.h>
-
-
-/*
- * Local functions...
- */
-
-void	print_command(http_t *http, const char *printer, const char *command);
-void	show_all_printers(http_t *http, const char *username);
-void	show_printer(http_t *http, const char *printer);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  const char	*printer;		/* Printer name */
-  const char	*user;			/* Username */
-  http_t	*http;			/* Connection to the server */
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  ipp_attribute_t *attr;		/* IPP attribute */
-  const char	*op;			/* Operation to perform, if any */
-  static const char *def_attrs[] =	/* Attributes for default printer */
-		{
-		  "printer-name",
-		  "printer-uri-supported"
-		};
-
-
- /*
-  * Get any form variables...
-  */
-
-  cgiInitialize();
-
-  op = cgiGetVariable("OP");
-
- /*
-  * Set the web interface section...
-  */
-
-  cgiSetVariable("SECTION", "printers");
-
- /*
-  * See if we are displaying a printer or all printers...
-  */
-
-  if ((printer = getenv("PATH_INFO")) != NULL)
-  {
-    printer ++;
-
-    if (!*printer)
-      printer = NULL;
-  }
-
- /*
-  * See who is logged in...
-  */
-
-  user = getenv("REMOTE_USER");
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
-
- /*
-  * Get the default printer...
-  */
-
-  if (!op)
-  {
-   /*
-    * Get the default destination...
-    */
-
-    request = ippNewRequest(CUPS_GET_DEFAULT);
-
-    ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes",
-		  sizeof(def_attrs) / sizeof(def_attrs[0]), NULL, def_attrs);
-
-    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	url[HTTP_MAX_URI];	/* New URL */
-
-
-        cgiSetVariable("DEFAULT_URI",
-	               cgiRewriteURL(attr->values[0].string.text,
-		                     url, sizeof(url), NULL));
-      }
-
-      ippDelete(response);
-    }
-
-   /*
-    * See if we need to show a list of printers or the status of a
-    * single printer...
-    */
-
-    if (!printer)
-      show_all_printers(http, user);
-    else
-      show_printer(http, printer);
-  }
-  else if (!strcasecmp(op, "print-self-test-page") && printer)
-    print_command(http, printer, "PrintSelfTestPage");
-  else if (!strcasecmp(op, "clean-print-heads") && printer)
-    print_command(http, printer, "Clean all");
-  else if (!strcasecmp(op, "print-test-page") && printer)
-    cgiPrintTestPage(http, printer);
-  else if (!strcasecmp(op, "move-jobs") && printer)
-    cgiMoveJobs(http, printer, 0);
-  else
-  {
-   /*
-    * Unknown/bad operation...
-    */
-
-    if (printer)
-      cgiStartHTML(printer);
-    else
-      cgiStartHTML(cgiText(_("Printers")));
-
-    cgiCopyTemplateLang("error-op.tmpl");
-    cgiEndHTML();
-  }
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'print_command()' - Send a print command to the printer.
- */
-
-void
-print_command(http_t     *http,		/* I - Connection to server */
-              const char *printer,	/* I - Printer */
-	      const char *command)	/* I - Command to send */
-{
-  cups_file_t	*fp;			/* File pointer */
-  char		filename[1024];		/* Temporary file */
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  char		uri[HTTP_MAX_URI],	/* Printer URI */
-		resource[1024],		/* POST resource path */
-		refresh[1024];		/* Refresh URL */
-  const char	*user;			/* Username */
-
-
- /*
-  * See who is logged in...
-  */
-
-  if ((user = getenv("REMOTE_USER")) == NULL)
-    user = "guest";
-
- /*
-  * Create the CUPS command file to print...
-  */
-
-  if ((fp = cupsTempFile2(filename, sizeof(filename))) == NULL)
-  {
-    cgiStartHTML(cgiText(_("Printer Maintenance")));
-    cgiSetVariable("MESSAGE", _("Unable to create temporary file:"));
-    cgiSetVariable("ERROR", strerror(errno));
-    cgiCopyTemplateLang("error.tmpl");
-    cgiEndHTML();
-    return;
-  }
-
-  cupsFilePuts(fp, "#CUPS-COMMAND\n");
-  cupsFilePrintf(fp, "%s\n", command);
-  cupsFileClose(fp);
-
- /*
-  * Point to the printer...
-  */
-
-  snprintf(resource, sizeof(resource), "/printers/%s", printer);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", ippPort(), "/printers/%s", printer);
-
- /*
-  * Build an IPP_PRINT_JOB request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  *    requesting-user-name
-  *    document-format
-  */
-
-  request = ippNewRequest(IPP_PRINT_JOB);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-               "requesting-user-name", NULL, user);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name",
-               NULL, "Printer Maintenance");
-
-  ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
-               NULL, "application/postscript");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoFileRequest(http, request, resource,
-                                    filename)) != NULL)
-  {
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-
-    ippDelete(response);
-  }
-
-  unlink(filename);
-
-  if (cupsLastError() <= IPP_OK_CONFLICT)
-  {
-   /*
-    * Automatically reload the printer status page...
-    */
-
-    cgiFormEncode(uri, resource, sizeof(uri));
-    snprintf(refresh, sizeof(refresh), "2;URL=%s", uri);
-    cgiSetVariable("refresh_page", refresh);
-  }
-
-  cgiStartHTML(cgiText(_("Printer Maintenance")));
-
-  if (cupsLastError() > IPP_OK_CONFLICT)
-    cgiShowIPPError(_("Unable to send maintenance job:"));
-  else
-  {
-    cgiSetVariable("PRINTER_NAME", printer);
-
-    cgiCopyTemplateLang("maintenance.tmpl");
-  }
-
-  cgiEndHTML();
-}
-
-
-/*
- * 'show_all_printers()' - Show all printers...
- */
-
-void
-show_all_printers(http_t     *http,	/* I - Connection to server */
-                  const char *user)	/* I - Username */
-{
-  int			i;		/* Looping var */
-  ipp_t			*request,	/* IPP request */
-			*response;	/* IPP response */
-  cups_array_t		*printers;	/* Array of printer objects */
-  ipp_attribute_t	*printer,	/* Printer object */
-			*attr;		/* Current attribute */
-  int			ascending,	/* Order of printers (0 = descending) */
-			first,		/* First printer to show */
-			count;		/* Number of printers */
-  const char		*var;		/* Form variable */
-  void			*search;	/* Search data */
-  char			url[1024],	/* URL for prev/next/this */
-			*urlptr,	/* Position in URL */
-			*urlend;	/* End of URL */
-
-
-  fprintf(stderr, "DEBUG: show_all_printers(http=%p, user=\"%s\")\n",
-          http, user ? user : "(null)");
-
- /*
-  * Show the standard header...
-  */
-
-  cgiStartHTML(cgiText(_("Printers")));
-
- /*
-  * Build a CUPS_GET_PRINTERS request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-type
-  *    printer-type-mask
-  *    requesting-user-name
-  */
-
-  request = ippNewRequest(CUPS_GET_PRINTERS);
-
-  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
-                "printer-type", 0);
-  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
-                "printer-type-mask", CUPS_PRINTER_CLASS);
-
-  if (user)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-        	 "requesting-user-name", NULL, user);
-
-  cgiGetAttributes(request, "printers.tmpl");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-   /*
-    * Get a list of matching job objects.
-    */
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-      search = cgiCompileSearch(var);
-    else
-      search = NULL;
-
-    printers  = cgiGetIPPObjects(response, search);
-    count     = cupsArrayCount(printers);
-
-    if (search)
-      cgiFreeSearch(search);
-
-   /*
-    * Figure out which printers to display...
-    */
-
-    if ((var = cgiGetVariable("FIRST")) != NULL)
-      first = atoi(var);
-    else
-      first = 0;
-
-    if (first >= count)
-      first = count - CUPS_PAGE_MAX;
-
-    first = (first / CUPS_PAGE_MAX) * CUPS_PAGE_MAX;
-
-    if (first < 0)
-      first = 0;
-
-    sprintf(url, "%d", count);
-    cgiSetVariable("TOTAL", url);
-
-    if ((var = cgiGetVariable("ORDER")) != NULL)
-      ascending = !strcasecmp(var, "asc");
-    else
-      ascending = 1;
-
-    if (ascending)
-    {
-      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, first);
-	   i < CUPS_PAGE_MAX && printer;
-	   i ++, printer = (ipp_attribute_t *)cupsArrayNext(printers))
-      {
-        cgiSetIPPObjectVars(printer, NULL, i);
-
-        cgiSetArray("cupscommand", i, "0");
-
-	for (attr = printer; attr; attr = attr->next)
-	  if (attr->group_tag != IPP_TAG_PRINTER || !attr->name)
-	    break;
-	  else if (!strcmp(attr->name, "printer-type"))
-	  {
-            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
-	      cgiSetArray("cupscommand", i, "1");
-	    break;
-	  }
-      }
-    }
-    else
-    {
-      for (i = 0, printer = (ipp_attribute_t *)cupsArrayIndex(printers, count - first - 1);
-	   i < CUPS_PAGE_MAX && printer;
-	   i ++, printer = (ipp_attribute_t *)cupsArrayPrev(printers))
-      {
-        cgiSetIPPObjectVars(printer, NULL, i);
-
-        cgiSetArray("cupscommand", i, "0");
-
-	for (attr = printer; attr; attr = attr->next)
-	  if (attr->group_tag == IPP_TAG_ZERO || !attr->name)
-	    break;
-	  else if (!strcmp(attr->name, "printer-type"))
-	  {
-            if (attr->values[0].integer & CUPS_PRINTER_COMMANDS)
-	      cgiSetArray("cupscommand", i, "1");
-	    break;
-	  }
-      }
-    }
-
-   /*
-    * Save navigation URLs...
-    */
-
-    urlend = url + sizeof(url);
-
-    if ((var = cgiGetVariable("QUERY")) != NULL)
-    {
-      strlcpy(url, "/printers/?QUERY=", sizeof(url));
-      urlptr = url + strlen(url);
-
-      cgiFormEncode(urlptr, var, urlend - urlptr);
-      urlptr += strlen(urlptr);
-
-      strlcpy(urlptr, "&", urlend - urlptr);
-      urlptr += strlen(urlptr);
-    }
-    else
-    {
-      strlcpy(url, "/printers/?", sizeof(url));
-      urlptr = url + strlen(url);
-    }
-
-    snprintf(urlptr, urlend - urlptr, "FIRST=%d", first);
-    cgiSetVariable("THISURL", url);
-
-    if (first > 0)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first - CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("PREVURL", url);
-    }
-
-    if ((first + CUPS_PAGE_MAX) < count)
-    {
-      snprintf(urlptr, urlend - urlptr, "FIRST=%d&ORDER=%s",
-	       first + CUPS_PAGE_MAX, ascending ? "asc" : "dec");
-      cgiSetVariable("NEXTURL", url);
-    }
-
-   /*
-    * Then show everything...
-    */
-
-    cgiCopyTemplateLang("search.tmpl");
-
-    cgiCopyTemplateLang("printers-header.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-    cgiCopyTemplateLang("printers.tmpl");
-
-    if (count > 0)
-      cgiCopyTemplateLang("pager.tmpl");
-
-   /*
-    * Delete the response...
-    */
-
-    cupsArrayDelete(printers);
-    ippDelete(response);
-  }
-  else
-  {
-   /*
-    * Show the error...
-    */
-
-    cgiShowIPPError(_("Unable to get printer list:"));
-  }
-
-   cgiEndHTML();
-}
-
-
-/*
- * 'show_printer()' - Show a single printer.
- */
-
-void
-show_printer(http_t     *http,		/* I - Connection to server */
-             const char *printer)	/* I - Name of printer */
-{
-  ipp_t		*request,		/* IPP request */
-		*response;		/* IPP response */
-  ipp_attribute_t *attr;		/* IPP attribute */
-  char		uri[HTTP_MAX_URI];	/* Printer URI */
-  char		refresh[1024];		/* Refresh URL */
-
-
-  fprintf(stderr, "DEBUG: show_printer(http=%p, printer=\"%s\")\n",
-          http, printer ? printer : "(null)");
-
- /*
-  * Build an IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);
-
-  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
-                   "localhost", 0, "/printers/%s", printer);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL,
-               uri);
-
-  cgiGetAttributes(request, "printers.tmpl");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-   /*
-    * Got the result; set the CGI variables and check the status of a
-    * single-queue request...
-    */
-
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-
-    if ((attr = ippFindAttribute(response, "printer-type",
-                                 IPP_TAG_ENUM)) != NULL)
-    {
-      cgiSetVariable("cupscommand",
-                     (attr->values[0].integer & CUPS_PRINTER_COMMANDS) ?
-		         "1" : "0");
-    }
-
-    if (printer && (attr = ippFindAttribute(response, "printer-state",
-                                            IPP_TAG_ENUM)) != NULL &&
-        attr->values[0].integer == IPP_PRINTER_PROCESSING)
-    {
-     /*
-      * Printer is processing - automatically refresh the page until we
-      * are done printing...
-      */
-
-      cgiFormEncode(uri, printer, sizeof(uri));
-      snprintf(refresh, sizeof(refresh), "10;URL=/printers/%s", uri);
-      cgiSetVariable("refresh_page", refresh);
-    }
-
-   /*
-    * Delete the response...
-    */
-
-    ippDelete(response);
-
-   /*
-    * Show the standard header...
-    */
-
-    cgiStartHTML(printer);
-
-   /*
-    * Show the printer status...
-    */
-
-    cgiCopyTemplateLang("printers.tmpl");
-
-   /*
-    * Show jobs for the specified printer...
-    */
-
-    cgiCopyTemplateLang("printer-jobs-header.tmpl");
-    cgiShowJobs(http, printer);
-  }
-  else
-  {
-   /*
-    * Show the IPP error...
-    */
-
-    cgiStartHTML(printer);
-    cgiShowIPPError(_("Unable to get printer status:"));
-  }
-
-   cgiEndHTML();
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/search.c

@@ -1,361 +0,0 @@
-/*
- * "$Id$"
- *
- *   Search routines for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   cgiCompileSearch() - Compile a search string.
- *   cgiDoSearch()      - Do a search of some text.
- *   cgiFreeSearch()    - Free a compiled search context.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi-private.h"
-#include <regex.h>
-
-
-/*
- * 'cgiCompileSearch()' - Compile a search string.
- */
-
-void *					/* O - Search context */
-cgiCompileSearch(const char *query)	/* I - Query string */
-{
-  regex_t	*re;			/* Regular expression */
-  char		*s,			/* Regular expression string */
-		*sptr,			/* Pointer into RE string */
-		*sword;			/* Pointer to start of word */
-  int		slen;			/* Allocated size of RE string */
-  const char	*qptr,			/* Pointer into query string */
-		*qend;			/* End of current word */
-  const char	*prefix;		/* Prefix to add to next word */
-  int		quoted;			/* Word is quoted */
-  int		wlen;			/* Word length */
-  char		*lword;			/* Last word in query */
-
-
-  DEBUG_printf(("help_compile_search(query=\"%s\")\n", query ? query : "(nil)"));
-
- /*
-  * Allocate a regular expression storage structure...
-  */
-
-  re = (regex_t *)calloc(1, sizeof(regex_t));
-
- /*
-  * Allocate a buffer to hold the regular expression string, starting
-  * at 1024 bytes or 3 times the length of the query string, whichever
-  * is greater.  We'll expand the string as needed...
-  */
-
-  slen = strlen(query) * 3;
-  if (slen < 1024)
-    slen = 1024;
-
-  s = (char *)malloc(slen);
-
- /*
-  * Copy the query string to the regular expression, handling basic
-  * AND and OR logic...
-  */
-
-  prefix = ".*";
-  qptr   = query;
-  sptr   = s;
-  lword  = NULL;
-
-  while (*qptr)
-  {
-   /*
-    * Skip leading whitespace...
-    */
-
-    while (isspace(*qptr & 255))
-      qptr ++;
-
-    if (!*qptr)
-      break;
-
-   /*
-    * Find the end of the current word...
-    */
-
-    if (*qptr == '\"' || *qptr == '\'')
-    {
-     /*
-      * Scan quoted string...
-      */
-
-      quoted = *qptr ++;
-      for (qend = qptr; *qend && *qend != quoted; qend ++);
-
-      if (!*qend)
-      {
-       /*
-        * No closing quote, error out!
-	*/
-
-	free(s);
-	free(re);
-
-	if (lword)
-          free(lword);
-
-	return (NULL);
-      }
-    }
-    else
-    {
-     /*
-      * Scan whitespace-delimited string...
-      */
-
-      quoted = 0;
-      for (qend = qptr + 1; *qend && !isspace(*qend); qend ++);
-    }
-
-    wlen = qend - qptr;
-
-   /*
-    * Look for logic words: AND, OR
-    */
-
-    if (wlen == 3 && !strncasecmp(qptr, "AND", 3))
-    {
-     /*
-      * Logical AND with the following text...
-      */
-
-      if (sptr > s)
-        prefix = ".*";
-
-      qptr = qend;
-    }
-    else if (wlen == 2 && !strncasecmp(qptr, "OR", 2))
-    {
-     /*
-      * Logical OR with the following text...
-      */
-
-      if (sptr > s)
-        prefix = ".*|.*";
-
-      qptr = qend;
-    }
-    else
-    {
-     /*
-      * Add a search word, making sure we have enough room for the
-      * string + RE overhead...
-      */
-
-      wlen = (sptr - s) + 4 * wlen + 2 * strlen(prefix) + 4;
-
-      if (wlen > slen)
-      {
-       /*
-        * Expand the RE string buffer...
-	*/
-
-        char *temp;			/* Temporary string pointer */
-
-
-	slen = wlen + 128;
-        temp = (char *)realloc(s, slen);
-	if (!temp)
-	{
-	  free(s);
-	  free(re);
-
-	  if (lword)
-            free(lword);
-
-	  return (NULL);
-	}
-
-        sptr = temp + (sptr - s);
-	s    = temp;
-      }
-
-     /*
-      * Add the prefix string...
-      */
-
-      strcpy(sptr, prefix);
-      sptr += strlen(sptr);
-
-     /*
-      * Then quote the remaining word characters as needed for the
-      * RE...
-      */
-
-      sword = sptr;
-
-      while (qptr < qend)
-      {
-       /*
-        * Quote: ^ . [ $ ( ) | * + ? { \
-	*/
-
-        if (strchr("^.[$()|*+?{\\", *qptr))
-	  *sptr++ = '\\';
-
-	*sptr++ = *qptr++;
-      }
-
-      *sptr = '\0';
-
-     /*
-      * For "word1 AND word2", add reciprocal "word2 AND word1"...
-      */
-
-      if (!strcmp(prefix, ".*") && lword)
-      {
-        char *lword2;			/* New "last word" */
-
-
-        lword2 = strdup(sword);
-
-        strcpy(sptr, ".*|.*");
-	sptr += 5;
-
-	strcpy(sptr, lword2);
-	sptr += strlen(sptr);
-
-        strcpy(sptr, ".*");
-	sptr += 2;
-
-	strcpy(sptr, lword);
-	sptr += strlen(sptr);
-
-        free(lword);
-	lword = lword2;
-      }
-      else
-      {
-	if (lword)
-          free(lword);
-
-	lword = strdup(sword);
-      }
-
-      prefix = ".*|.*";
-    }
-
-   /*
-    * Advance to the next string...
-    */
-
-    if (quoted)
-      qptr ++;
-  }
-
-  if (lword)
-    free(lword);
-
-  if (sptr > s)
-    strcpy(sptr, ".*");
-  else
-  {
-   /*
-    * No query data, return NULL...
-    */
-
-    free(s);
-    free(re);
-
-    return (NULL);
-  }
-
- /*
-  * Compile the regular expression...
-  */
-
-  DEBUG_printf(("    s=\"%s\"\n", s));
-
-  if (regcomp(re, s, REG_EXTENDED | REG_ICASE))
-  {
-    free(re);
-    free(s);
-
-    return (NULL);
-  }
-
- /*
-  * Free the RE string and return the new regular expression we compiled...
-  */
-
-  free(s);
-
-  return ((void *)re);
-}
-
-
-/*
- * 'cgiDoSearch()' - Do a search of some text.
- */
-
-int					/* O - Number of matches */
-cgiDoSearch(void       *search,		/* I - Search context */
-            const char *text)		/* I - Text to search */
-{
-  int		i;			/* Looping var */
-  regmatch_t	matches[100];		/* RE matches */
-
-
- /*
-  * Range check...
-  */
-
-  if (!search || !text)
-    return (0);
-
- /*
-  * Do a lookup...
-  */
-
-  if (!regexec((regex_t *)search, text, sizeof(matches) / sizeof(matches[0]),
-               matches, 0))
-  {
-   /*
-    * Figure out the number of matches in the string...
-    */
-
-    for (i = 0; i < (int)(sizeof(matches) / sizeof(matches[0])); i ++)
-      if (matches[i].rm_so < 0)
-	break;
-
-    return (i);
-  }
-  else
-    return (0);
-}
-
-
-/*
- * 'cgiFreeSearch()' - Free a compiled search context.
- */
-
-void
-cgiFreeSearch(void *search)		/* I - Search context */
-{
-  regfree((regex_t *)search);
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/template.c

@@ -1,667 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI template function.
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   cgiCopyTemplateFile() - Copy a template file and replace all the
- *                           '{variable}' strings with the variable value.
- *   cgiCopyTemplateLang() - Copy a template file using a language...
- *   cgiGetTemplateDir()   - Get the templates directory...
- *   cgiSetServerVersion() - Set the server name and CUPS version...
- *   cgi_copy()            - Copy the template file, substituting as needed...
- *   cgi_puts()            - Put a string to the output file, quoting as
- *                           needed...
- */
-
-#include "cgi-private.h"
-#include <errno.h>
-
-
-/*
- * Local functions...
- */
-
-static void	cgi_copy(FILE *out, FILE *in, int element, char term,
-		         int indent);
-static void	cgi_puts(const char *s, FILE *out);
-static void	cgi_puturi(const char *s, FILE *out);
-
-
-/*
- * 'cgiCopyTemplateFile()' - Copy a template file and replace all the
- *                           '{variable}' strings with the variable value.
- */
-
-void
-cgiCopyTemplateFile(FILE       *out,	/* I - Output file */
-                    const char *tmpl)	/* I - Template file to read */
-{
-  FILE	*in;				/* Input file */
-
-
-  fprintf(stderr, "DEBUG2: cgiCopyTemplateFile(out=%p, tmpl=\"%s\")\n", out,
-          tmpl ? tmpl : "(null)");
-
- /*
-  * Open the template file...
-  */
-
-  if ((in = fopen(tmpl, "r")) == NULL)
-  {
-    fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
-            tmpl ? tmpl : "(null)", strerror(errno));
-    return;
-  }
-
- /*
-  * Parse the file to the end...
-  */
-
-  cgi_copy(out, in, 0, 0, 0);
-
- /*
-  * Close the template file and return...
-  */
-
-  fclose(in);
-}
-
-
-/*
- * 'cgiCopyTemplateLang()' - Copy a template file using a language...
- */
-
-void
-cgiCopyTemplateLang(const char *tmpl)	/* I - Base filename */
-{
-  char		filename[1024],		/* Filename */
-		locale[16],		/* Locale name */
-		*locptr;		/* Pointer into locale name */
-  const char	*directory,		/* Directory for templates */
-		*lang;			/* Language */
-  FILE		*in;			/* Input file */
-
-
-  fprintf(stderr, "DEBUG2: cgiCopyTemplateLang(tmpl=\"%s\")\n",
-          tmpl ? tmpl : "(null)");
-
- /*
-  * Convert the language to a locale name...
-  */
-
-  locale[0] = '\0';
-
-  if ((lang = getenv("LANG")) != NULL)
-  {
-    locale[0] = '/';
-    strlcpy(locale + 1, lang, sizeof(locale) - 1);
-
-    if ((locptr = strchr(locale, '.')) != NULL)
-      *locptr = '\0';			/* Strip charset */
-  }
-
-  fprintf(stderr, "DEBUG: lang=\"%s\", locale=\"%s\"...\n",
-          lang ? lang : "(null)", locale);
-
- /*
-  * See if we have a template file for this language...
-  */
-
-  directory = cgiGetTemplateDir();
-
-  snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
-  if ((in = fopen(filename, "r")) == NULL)
-  {
-    locale[3] = '\0';
-
-    snprintf(filename, sizeof(filename), "%s%s/%s", directory, locale, tmpl);
-    if ((in = fopen(filename, "r")) == NULL)
-    {
-      snprintf(filename, sizeof(filename), "%s/%s", directory, tmpl);
-      in = fopen(filename, "r");
-    }
-  }
-
-  fprintf(stderr, "DEBUG2: Template file is \"%s\"...\n", filename);
-
- /*
-  * Open the template file...
-  */
-
-  if (!in)
-  {
-    fprintf(stderr, "ERROR: Unable to open template file \"%s\" - %s\n",
-            filename, strerror(errno));
-    return;
-  }
-
- /*
-  * Parse the file to the end...
-  */
-
-  cgi_copy(stdout, in, 0, 0, 0);
-
- /*
-  * Close the template file and return...
-  */
-
-  fclose(in);
-}
-
-
-/*
- * 'cgiGetTemplateDir()' - Get the templates directory...
- */
-
-char *					/* O - Template directory */
-cgiGetTemplateDir(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);
-}
-
-
-/*
- * 'cgiSetServerVersion()' - Set the server name and CUPS version...
- */
-
-void
-cgiSetServerVersion(void)
-{
-  cgiSetVariable("SERVER_NAME", getenv("SERVER_NAME"));
-  cgiSetVariable("REMOTE_USER", getenv("REMOTE_USER"));
-  cgiSetVariable("CUPS_VERSION", CUPS_SVERSION);
-
-#ifdef LC_TIME
-  setlocale(LC_TIME, "");
-#endif /* LC_TIME */
-}
-
-
-/*
- * 'cgi_copy()' - Copy the template file, substituting as needed...
- */
-
-static void
-cgi_copy(FILE *out,			/* I - Output file */
-         FILE *in,			/* I - Input file */
-	 int  element,			/* I - Element number (0 to N) */
-	 char term,			/* I - Terminating character */
-	 int  indent)			/* I - Debug info indentation */
-{
-  int		ch;			/* Character from file */
-  char		op;			/* Operation */
-  char		name[255],		/* Name of variable */
-		*nameptr,		/* Pointer into name */
-		innername[255],		/* Inner comparison name */
-		*innerptr,		/* Pointer into inner name */
-		*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 */
-		compare[1024];		/* Comparison string */
-  int		result;			/* Result of comparison */
-  int		uriencode;		/* Encode as URI */
-
-
-  fprintf(stderr, "DEBUG2: %*sStarting at file position %ld...\n", indent, "",
-          ftell(in));
-
- /*
-  * Parse the file to the end...
-  */
-
-  while ((ch = getc(in)) != EOF)
-    if (ch == term)
-      break;
-    else if (ch == '{')
-    {
-     /*
-      * Get a variable name...
-      */
-
-      uriencode = 0;
-
-      for (s = name; (ch = getc(in)) != EOF;)
-        if (strchr("}]<>=! \t\n", ch))
-          break;
-	else if (s == name && ch == '%')
-	  uriencode = 1;
-        else if (s > name && ch == '?')
-	  break;
-	else if (s < (name + sizeof(name) - 1))
-          *s++ = ch;
-
-      *s = '\0';
-
-      if (s == name && isspace(ch & 255))
-      {
-        fprintf(stderr, "DEBUG2: %*sLone { at %ld...\n", indent, "", ftell(in));
-
-        if (out)
-	{
-          putc('{', out);
-	  putc(ch, out);
-        }
-
-	continue;
-      }
-
-      if (ch == '}')
-	fprintf(stderr, "DEBUG2: %*s\"{%s}\" at %ld...\n", indent, "", name,
-        	ftell(in));
-
-     /*
-      * See if it has a value...
-      */
-
-      if (name[0] == '?')
-      {
-       /*
-        * Insert value only if it exists...
-	*/
-
-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1] & 255))
-	{
-	  *nameptr++ = '\0';
-
-	  if ((value = cgiGetArray(name + 1, atoi(nameptr) - 1)) != NULL)
-	    outptr = value;
-	  else
-	  {
-	    outval[0] = '\0';
-	    outptr    = outval;
-	  }
-	}
-        else if ((value = cgiGetArray(name + 1, element)) != NULL)
-	  outptr = value;
-	else
-	{
-	  outval[0] = '\0';
-	  outptr    = outval;
-	}
-      }
-      else if (name[0] == '#')
-      {
-       /*
-        * Insert count...
-	*/
-
-        if (name[1])
-          sprintf(outval, "%d", cgiGetSize(name + 1));
-	else
-	  sprintf(outval, "%d", element + 1);
-
-        outptr = outval;
-      }
-      else if (name[0] == '[')
-      {
-       /*
-        * Loop for # of elements...
-	*/
-
-	int  i;		/* Looping var */
-        long pos;	/* File position */
-	int  count;	/* Number of elements */
-
-
-        if (isdigit(name[1] & 255))
-	  count = atoi(name + 1);
-	else
-          count = cgiGetSize(name + 1);
-
-	pos = ftell(in);
-
-        fprintf(stderr, "DEBUG2: %*sLooping on \"%s\" at %ld, count=%d...\n",
-	        indent, "", name + 1, pos, count);
-
-        if (count > 0)
-	{
-          for (i = 0; i < count; i ++)
-	  {
-	    if (i)
-	      fseek(in, pos, SEEK_SET);
-
-	    cgi_copy(out, in, i, '}', indent + 2);
-	  }
-        }
-	else
-	  cgi_copy(NULL, in, 0, '}', indent + 2);
-
-        fprintf(stderr, "DEBUG2: %*sFinished looping on \"%s\"...\n", indent,
-	        "", name + 1);
-
-        continue;
-      }
-      else
-      {
-       /*
-        * Insert variable or variable name (if element is NULL)...
-	*/
-
-	if ((nameptr = strrchr(name, '-')) != NULL && isdigit(nameptr[1] & 255))
-	{
-	  *nameptr++ = '\0';
-	  if ((value = cgiGetArray(name, atoi(nameptr) - 1)) == NULL)
-          {
-	    snprintf(outval, sizeof(outval), "{%s}", name);
-	    outptr = outval;
-	  }
-	  else
-	    outptr = value;
-	}
-	else if ((value = cgiGetArray(name, element)) == NULL)
-        {
-	  snprintf(outval, sizeof(outval), "{%s}", name);
-	  outptr = outval;
-	}
-	else
-	  outptr = value;
-      }
-
-     /*
-      * See if the terminating character requires another test...
-      */
-
-      if (ch == '}')
-      {
-       /*
-        * End of substitution...
-        */
-
-	if (out)
-	{
-	  if (uriencode)
-	    cgi_puturi(outptr, out);
-	  else if (!strcasecmp(name, "?cupsdconf_default"))
-	    fputs(outptr, stdout);
-	  else
-	    cgi_puts(outptr, out);
-        }
-
-        continue;
-      }
-
-     /*
-      * OK, process one of the following checks:
-      *
-      *   {name?exist:not-exist}     Exists?
-      *   {name=value?true:false}    Equal
-      *   {name<value?true:false}    Less than
-      *   {name>value?true:false}    Greater than
-      *   {name!value?true:false}    Not equal
-      */
-
-      op = ch;
-
-      if (ch == '?')
-      {
-       /*
-        * Test for existance...
-	*/
-
-        result     = cgiGetArray(name, element) != NULL && outptr[0];
-	compare[0] = '\0';
-      }
-      else
-      {
-       /*
-        * Compare to a string...
-	*/
-
-	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);
-	    s += strlen(s);
-	  }
-	  else if (ch == '{')
-	  {
-	   /*
-	    * Grab the value of a variable...
-	    */
-
-	    innerptr = innername;
-	    while ((ch = getc(in)) != EOF && ch != '}')
-	      if (innerptr < (innername + sizeof(innername) - 1))
-	        *innerptr++ = ch;
-	    *innerptr = '\0';
-
-            if (innername[0] == '#')
-	      sprintf(s, "%d", cgiGetSize(innername + 1));
-	    else if ((innerptr = strrchr(innername, '-')) != NULL &&
-	             isdigit(innerptr[1] & 255))
-            {
-	      *innerptr++ = '\0';
-	      if ((innerval = cgiGetArray(innername, atoi(innerptr) - 1)) == NULL)
-	        *s = '\0';
-	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
-	    }
-	    else if (innername[0] == '?')
-	    {
-	      if ((innerval = cgiGetArray(innername + 1, element)) == NULL)
-		*s = '\0';
-	      else
-	        strlcpy(s, innerval, sizeof(compare) - (s - compare));
-            }
-	    else if ((innerval = cgiGetArray(innername, element)) == NULL)
-	      snprintf(s, sizeof(compare) - (s - compare), "{%s}", innername);
-	    else
-	      strlcpy(s, innerval, sizeof(compare) - (s - compare));
-
-            s += strlen(s);
-	  }
-          else if (ch == '\\')
-	    *s++ = getc(in);
-	  else
-            *s++ = ch;
-
-        *s = '\0';
-
-        if (ch != '?')
-	{
-	  fprintf(stderr,
-	          "DEBUG2: %*sBad terminator '%c' at file position %ld...\n",
-	          indent, "", ch, ftell(in));
-	  return;
-	}
-
-       /*
-        * Do the comparison...
-	*/
-
-        switch (op)
-	{
-	  case '<' :
-	      result = strcasecmp(outptr, compare) < 0;
-	      break;
-	  case '>' :
-	      result = strcasecmp(outptr, compare) > 0;
-	      break;
-	  case '=' :
-	      result = strcasecmp(outptr, compare) == 0;
-	      break;
-	  case '!' :
-	      result = strcasecmp(outptr, compare) != 0;
-	      break;
-	  default :
-	      result = 1;
-	      break;
-	}
-      }
-
-      fprintf(stderr,
-              "DEBUG2: %*sStarting \"{%s%c%s\" at %ld, result=%d...\n",
-	      indent, "", name, op, compare, ftell(in), result);
-
-      if (result)
-      {
-       /*
-	* Comparison true; output first part and ignore second...
-	*/
-
-        fprintf(stderr, "DEBUG2: %*sOutput first part...\n", indent, "");
-	cgi_copy(out, in, element, ':', indent + 2);
-
-        fprintf(stderr, "DEBUG2: %*sSkip second part...\n", indent, "");
-	cgi_copy(NULL, in, element, '}', indent + 2);
-      }
-      else
-      {
-       /*
-	* Comparison false; ignore first part and output second...
-	*/
-
-        fprintf(stderr, "DEBUG2: %*sSkip first part...\n", indent, "");
-	cgi_copy(NULL, in, element, ':', indent + 2);
-
-        fprintf(stderr, "DEBUG2: %*sOutput second part...\n", indent, "");
-	cgi_copy(out, in, element, '}', indent + 2);
-      }
-
-      fprintf(stderr, "DEBUG2: %*sFinished \"{%s%c%s\", out=%p...\n", indent, "",
-              name, op, compare, out);
-    }
-    else if (ch == '\\')	/* Quoted char */
-    {
-      if (out)
-        putc(getc(in), out);
-      else
-        getc(in);
-    }
-    else if (out)
-      putc(ch, out);
-
-  if (ch == EOF)
-    fprintf(stderr, "DEBUG2: %*sReturning at file position %ld on EOF...\n",
-	    indent, "", ftell(in));
-  else
-    fprintf(stderr,
-            "DEBUG2: %*sReturning at file position %ld on character '%c'...\n",
-	    indent, "", ftell(in), ch);
-
-  if (ch == EOF && term)
-    fprintf(stderr, "ERROR: %*sSaw EOF, expected '%c'!\n", indent, "", term);
-
- /*
-  * Flush any pending output...
-  */
-
-  if (out)
-    fflush(out);
-}
-
-
-/*
- * 'cgi_puts()' - Put a string to the output file, quoting as needed...
- */
-
-static void
-cgi_puts(const char *s,			/* I - String to output */
-         FILE       *out)		/* I - Output file */
-{
-  while (*s)
-  {
-    if (*s == '<')
-    {
-     /*
-      * Pass <A HREF="url"> and </A>, otherwise quote it...
-      */
-
-      if (!strncasecmp(s, "<A HREF=\"", 9))
-      {
-        fputs("<A HREF=\"", out);
-	s += 9;
-
-	while (*s && *s != '\"')
-	{
-          if (*s == '&')
-            fputs("&amp;", out);
-	  else
-	    putc(*s, out);
-
-	  s ++;
-	}
-
-        if (*s)
-	  s ++;
-
-	fputs("\">", out);
-      }
-      else if (!strncasecmp(s, "</A>", 4))
-      {
-        fputs("</A>", out);
-	s += 3;
-      }
-      else
-        fputs("&lt;", out);
-    }
-    else if (*s == '>')
-      fputs("&gt;", out);
-    else if (*s == '\"')
-      fputs("&quot;", out);
-    else if (*s == '&')
-      fputs("&amp;", out);
-    else
-      putc(*s, out);
-
-    s ++;
-  }
-}
-
-
-/*
- * 'cgi_puturi()' - Put a URI string to the output file, quoting as needed...
- */
-
-static void
-cgi_puturi(const char *s,		/* I - String to output */
-           FILE       *out)		/* I - Output file */
-{
-  while (*s)
-  {
-    if (strchr("%&+ <>#=", *s) || *s & 128)
-      fprintf(out, "%%%02X", *s & 255);
-    else
-      putc(*s, out);
-
-    s ++;
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testcgi.c

@@ -1,75 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()       - Test the help index code.
- *   list_nodes() - List nodes in an array...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi.h"
-
-
-/*
- * 'main()' - Test the CGI code.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
- /*
-  * Test file upload/multi-part submissions...
-  */
-
-  freopen("multipart.dat", "rb", stdin);
-
-  putenv("CONTENT_TYPE=multipart/form-data; "
-         "boundary=---------------------------1977426492562745908748943111");
-  putenv("REQUEST_METHOD=POST");
-
-  printf("cgiInitialize: ");
-  if (cgiInitialize())
-  {
-    const cgi_file_t	*file;		/* Upload file */
-
-    if ((file = cgiGetFile()) != NULL)
-    {
-      puts("PASS");
-      printf("    tempfile=\"%s\"\n", file->tempfile);
-      printf("    name=\"%s\"\n", file->name);
-      printf("    filename=\"%s\"\n", file->filename);
-      printf("    mimetype=\"%s\"\n", file->mimetype);
-    }
-    else
-      puts("FAIL (no file!)");
-  }
-  else
-    puts("FAIL (init)");
-    
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testhi.c

@@ -1,113 +0,0 @@
-/*
- * "$Id$"
- *
- *   Help index test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main()       - Test the help index code.
- *   list_nodes() - List nodes in an array...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi.h"
-
-
-/*
- * Local functions...
- */
-
-static void	list_nodes(const char *title, cups_array_t *nodes);
-
-
-/*
- * 'main()' - Test the help index code.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  help_index_t	*hi,			/* Help index */
-		*search;		/* Search index */
-
-
- /*
-  * Load the help index...
-  */
-
-  hi = helpLoadIndex("testhi.index", ".");
-
-  list_nodes("nodes", hi->nodes);
-  list_nodes("sorted", hi->sorted);
-
- /*
-  * Do any searches...
-  */
-
-  if (argc > 1)
-  {
-    search = helpSearchIndex(hi, argv[1], NULL, argv[2]);
-
-    if (search)
-    {
-      list_nodes(argv[1], search->sorted);
-      helpDeleteIndex(search);
-    }
-    else
-      printf("%s (0 nodes)\n", argv[1]);
-  }
-
-  helpDeleteIndex(hi);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'list_nodes()' - List nodes in an array...
- */
-
-static void
-list_nodes(const char   *title,		/* I - Title string */
-	   cups_array_t *nodes)		/* I - Nodes */
-{
-  int		i;			/* Looping var */
-  help_node_t	*node;			/* Current node */
-
-
-  printf("%s (%d nodes):\n", title, cupsArrayCount(nodes));
-  for (i = 1, node = (help_node_t *)cupsArrayFirst(nodes);
-       node;
-       i ++, node = (help_node_t *)cupsArrayNext(nodes))
-  {
-    if (node->anchor)
-      printf("    %d: %s#%s \"%s\"", i, node->filename, node->anchor,
-             node->text);
-    else
-      printf("    %d: %s \"%s\"", i, node->filename, node->text);
-
-    printf(" (%d words)\n", cupsArrayCount(node->words));
-  }
-}
-
-
-/*
- * End of "$Id$".
- */

cgi-bin/testhi.html

@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-	<TITLE>Test File for Help Index Code</TITLE>
-</HEAD>
-<BODY>
-
-<P>This is a test file for the help index code.  The help index
-code reads plain HTML and indexes the title and any anchored
-text, ignoring all other markup. Anchor tags must be on a single
-line, although the text they wrap may cross multiple lines and be
-up to 1024 bytes in length.</P>
-
-<H1><A NAME="FIRST">This is the First Anchor</A></H1>
-
-<P>This&nbsp;is some text for the <em>first</em> anchor.</P>
-
-
-<H1><A NAME="2ND">This is the Second Anchor</A></H1>
-
-<P>This is some text for the first anchor.</P>
-
-<P>John asked Mary to the dance.</P>
-
-
-<H1><A NAME="THIRD">This is the Third Anchor</A></H1>
-
-<P>This is some text for the third anchor. <A NAME="INLINE">This
-is an in-line anchor that crosses a line.</A></P>
-
-</BODY>
-</HTML>

cgi-bin/testtemplate.c

@@ -1,103 +0,0 @@
-/*
- * "$Id$"
- *
- *   CGI template test program for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 2007 by Apple Inc.
- *   Copyright 2006 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   which should have been included with this file.  If this file is
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- *   main() - Test the template code.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "cgi.h"
-
-
-/*
- * 'main()' - Test the template code.
- */
-
-int					/* O - Exit status */
-main(int  argc,				/* I - Number of command-line arguments */
-     char *argv[])			/* I - Command-line arguments */
-{
-  int	i;				/* Looping var */
-  char	*value;				/* Value in name=value */
-  FILE	*out;				/* Where to send output */
-
-
- /*
-  * Don't buffer stdout or stderr so that the mixed output is sane...
-  */
-
-  setbuf(stdout, NULL);
-  setbuf(stderr, NULL);
-
- /*
-  * Loop through the command-line, assigning variables for any args with
-  * "name=value"...
-  */
-
-  out = stdout;
-
-  for (i = 1; i < argc; i ++)
-  {
-    if (!strcmp(argv[i], "-o"))
-    {
-      i ++;
-      if (i < argc)
-      {
-        out = fopen(argv[i], "w");
-	if (!out)
-	{
-	  perror(argv[i]);
-	  return (1);
-	}
-      }
-    }
-    else if (!strcmp(argv[i], "-e"))
-    {
-      i ++;
-
-      if (i < argc)
-      {
-        if (!freopen(argv[i], "w", stderr))
-	{
-	  perror(argv[i]);
-	  return (1);
-	}
-      }
-    }
-    else if (!strcmp(argv[i], "-q"))
-      freopen("/dev/null", "w", stderr);
-    else if ((value = strchr(argv[i], '=')) != NULL)
-    {
-      *value++ = '\0';
-      cgiSetVariable(argv[i], value);
-    }
-    else
-      cgiCopyTemplateFile(out, argv[i]);
-  }
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */

conf/Makefile

@@ -1,97 +0,0 @@
-#
-# "$Id$"
-#
-#   Configuration file makefile for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1993-2006 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-include ../Makedefs
-
-#
-# Config files...
-#
-
-KEEP	=	cupsd.conf snmp.conf
-REPLACE	=	mime.convs mime.types
-
-
-#
-# Make everything...
-#
-
-all:
-
-
-#
-# Clean all config and object files...
-#
-
-clean:
-
-
-#
-# Dummy depend...
-#
-
-depend:
-
-
-#
-# Install files...
-#
-
-install:	all
-	$(INSTALL_DIR) -m 755 $(SERVERROOT)
-	for file in $(KEEP); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \
-			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file.N || true; \
-		else \
-			$(INSTALL_CONFIG) $$file $(SERVERROOT) ; \
-			chgrp $(CUPS_GROUP) $(SERVERROOT)/$$file || true; \
-		fi ; \
-	done
-	$(INSTALL_CONFIG) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-	-chgrp $(CUPS_GROUP) $(SERVERROOT)/cupsd.conf.default
-	for file in $(REPLACE); do \
-		if test -r $(SERVERROOT)/$$file ; then \
-			$(MV) $(SERVERROOT)/$$file $(SERVERROOT)/$$file.O ; \
-		fi ; \
-		$(INSTALL_DATA) $$file $(SERVERROOT) ; \
-	done
-	-if test x$(PAMDIR) != x; then \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-		else \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-		fi ; \
-	fi
-
-
-#
-# Uninstall files...
-#
-
-uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
-		$(RM) $(SERVERROOT)/$$file; \
-	done
-	-$(RMDIR) $(SERVERROOT)
-	-if test x$(PAMDIR) != x; then \
-		$(RM) $(BUILDROOT)$(PAMDIR)/cups; \
-		$(RMDIR) $(BUILDROOT)$(PAMDIR); \
-	fi
-
-
-#
-# End of "$Id$".
-#

conf/cupsd.conf.in

@@ -1,85 +0,0 @@
-#
-# "$Id$"
-#
-#   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.  See "man cupsd.conf" for a complete description of this
-#   file.
-#
-
-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
-LogLevel info
-
-# Administrator user group...
-SystemGroup @CUPS_SYSTEM_GROUPS@
-@CUPS_SYSTEM_AUTHKEY@
-
-# Only listen for connections from the local machine.
-Listen localhost:@DEFAULT_IPP_PORT@
-@CUPS_LISTEN_DOMAINSOCKET@
-
-# Show shared printers on the local network.
-Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
-
-# Default authentication type, when authentication is required...
-DefaultAuthType Basic
-
-# Restrict access to the server...
-<Location />
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Restrict access to the admin pages...
-<Location /admin>
-@ENCRYPTION_REQUIRED@
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Restrict access to configuration files...
-<Location /admin/conf>
-  AuthType Default
-  Require user @SYSTEM
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Set the default printer/job policies...
-<Policy default>
-  # Job-related operations must be done by the owner or an administrator...
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an administrator to authenticate...
-  <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
-    AuthType Default
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All printer operations require a printer operator to authenticate...
-  <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs>
-    AuthType Default
-    Require user @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
-#
-# End of "$Id$".
-#

conf/mime.convs.in

@@ -1,113 +0,0 @@
-#
-# "$Id$"
-#
-#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-#   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
-#   reflects your local configuration changes.
-#
-#   MIME converts file for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-########################################################################
-#
-# Format of Lines:
-#
-#   source/type destination/type cost filter
-#
-# General Notes:
-#
-#   The "cost" field is used to find the least costly filters to run
-#   when converting a job file to a printable format.
-#
-#   All filters *must* accept the standard command-line arguments
-#   (job-id, user, title, copies, options, [filename or stdin]) to
-#   work with CUPS.
-#
-
-########################################################################
-#
-# PostScript filters
-#
-
-application/pdf		application/postscript	33	pdftops
-application/postscript	application/vnd.cups-postscript	66	pstops
-application/vnd.hp-HPGL	application/postscript	66	hpgltops
-application/x-cshell	application/postscript	33	texttops
-application/x-csource	application/postscript	33	texttops
-application/x-perl	application/postscript	33	texttops
-application/x-shell	application/postscript	33	texttops
-text/plain		application/postscript	33	texttops
-text/html		application/postscript	33	texttops
-image/gif		application/vnd.cups-postscript	66	imagetops
-image/png		application/vnd.cups-postscript	66	imagetops
-image/jpeg		application/vnd.cups-postscript	66	imagetops
-image/tiff		application/vnd.cups-postscript	66	imagetops
-image/x-bitmap		application/vnd.cups-postscript	66	imagetops
-image/x-photocd		application/vnd.cups-postscript	66	imagetops
-image/x-portable-anymap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-bitmap	application/vnd.cups-postscript	66	imagetops
-image/x-portable-graymap application/vnd.cups-postscript	66	imagetops
-image/x-portable-pixmap	application/vnd.cups-postscript	66	imagetops
-image/x-sgi-rgb		application/vnd.cups-postscript	66	imagetops
-image/x-xbitmap		application/vnd.cups-postscript	66	imagetops
-image/x-xpixmap		application/vnd.cups-postscript	66	imagetops
-#image/x-xwindowdump	application/vnd.cups-postscript	66	imagetops
-image/x-sun-raster	application/vnd.cups-postscript	66	imagetops
-
-
-########################################################################
-#
-# Form filter...
-#
-# This filter does not currently exist, but the file format is defined
-# in the IDD and registered with the IANA for future use...
-#
-
-#application/vnd.cups-form application/vnd.cups-postscript 33 formtops
-
-########################################################################
-#
-# Raster filters...
-#
-
-image/gif		application/vnd.cups-raster	100	imagetoraster
-image/png		application/vnd.cups-raster	100	imagetoraster
-image/jpeg		application/vnd.cups-raster	100	imagetoraster
-image/tiff		application/vnd.cups-raster	100	imagetoraster
-image/x-bitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-photocd		application/vnd.cups-raster	100	imagetoraster
-image/x-portable-anymap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-bitmap	application/vnd.cups-raster	100	imagetoraster
-image/x-portable-graymap application/vnd.cups-raster	100	imagetoraster
-image/x-portable-pixmap	application/vnd.cups-raster	100	imagetoraster
-image/x-sgi-rgb		application/vnd.cups-raster	100	imagetoraster
-image/x-xbitmap		application/vnd.cups-raster	100	imagetoraster
-image/x-xpixmap		application/vnd.cups-raster	100	imagetoraster
-#image/x-xwindowdump	application/vnd.cups-raster	100	imagetoraster
-image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
-
-# pstoraster is part of GPL Ghostscript...
-application/vnd.cups-postscript	application/vnd.cups-raster	100	pstoraster
-
-########################################################################
-#
-# Raw filter...
-#
-# Uncomment the following filter to allow printing of arbitrary files
-# without the -oraw option.
-#
-
-@DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
-
-#
-# End of "$Id$".
-#

conf/mime.types

@@ -1,175 +0,0 @@
-#
-# "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $"
-#
-#   MIME types file for the Common UNIX Printing System (CUPS).
-#
-#   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
-#   VERSIONS OF CUPS.  Instead, create a "local.types" file that
-#   reflects your local configuration changes.
-#
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2007 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
-#
-
-########################################################################
-#
-# Format of Lines:
-#
-#   super/type rules
-#
-# "rules" can be any combination of:
-#
-#   ( expr )				Parenthesis for expression grouping
-#   +					Logical AND
-#   , or whitespace			Logical OR
-#   !					Logical NOT
-#   match("pattern")			Pattern match on filename
-#   extension				Pattern match on "*.extension"
-#   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)
-#   string(offset,"string")		True if bytes are identical to string
-#   istring(offset,"string")		True if bytes are identical to
-#                                       case-insensitive string
-#   char(offset,value)			True if byte is identical
-#   short(offset,value)			True if 16-bit integer is identical
-#   int(offset,value)			True if 32-bit integer is identical
-#   locale("string")                    True if current locale matches string
-#   contains(offset,range,"string")	True if the range contains the string
-#
-# General Notes:
-#
-#   MIME type names are case-insensitive.  Internally they are converted
-#   to lowercase.  Multiple occurrences of a type will cause the provided
-#   rules to be appended to the existing definition.  Type names are sorted
-#   in ascending order, so if two types use the same rules to resolve a type
-#   (e.g. doc extension for two types), the returned type will be the first
-#   type in the sorted list.
-#
-#   The "printable" rule differs from the "ascii" rule in that it also
-#   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.
-#
-
-########################################################################
-#
-# Application-generated files...
-#
-
-#application/msword		doc string(0,<D0CF11E0A1B11AE1>)
-application/pdf			pdf string(0,%PDF)
-application/postscript		ai eps ps string(0,%!) string(0,<04>%!) \
-				contains(0,128,<1B>%-12345X) + \
-				(contains(0,4096,"LANGUAGE=POSTSCRIPT") \
-				 contains(0,4096,"LANGUAGE = Postscript") \
-				 contains(0,4096,"LANGUAGE = PostScript") \
-				 contains(0,4096,"LANGUAGE = POSTSCRIPT") \
-				 (contains(0,4096,<0a>%!) + \
-				  !contains(0,4096,"ENTER LANGUAGE")))
-application/vnd.hp-HPGL		hpgl \
-				string(0,<1B>E<1B>%0B) \
-				string(0,<1B>%-1B) string(0,<201B>)\
-				string(0,BP;) string(0,IN;) string(0,DF;) \
-				string(0,BPINPS;) \
-				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,4096,"LANGUAGE=HPGL") \
-				  contains(0,4096,"LANGUAGE = HPGL")))
-
-########################################################################
-#
-# Image files...
-#
-
-image/gif			gif string(0,GIF87a) string(0,GIF89a)
-image/png			png string(0,<89>PNG)
-image/jpeg			jpeg jpg jpe string(0,<FFD8FF>) &&\
-				(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
-				 char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
-				 char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
-				 char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef))
-image/tiff			tiff tif string(0,MM<002A>) string(0,II<2A00>)
-image/x-photocd			pcd string(2048,PCD_IPI)
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm string(0,P1) string(0,P4)
-image/x-portable-graymap	pgm string(0,P2) string(0,P5)
-image/x-portable-pixmap		ppm string(0,P3) string(0,P6)
-image/x-sgi-rgb			rgb sgi bw icon short(0,474)
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
-#image/x-xwindowdump		xwd string(4,<00000007>)
-image/x-sun-raster		ras string(0,<59a66a95>)
-
-#image/fpx			fpx
-image/x-alias			pix short(8,8) short(8,24)
-image/x-bitmap			bmp string(0,BM) && !printable(2,14)
-image/x-icon			ico
-
-########################################################################
-#
-# Text files...
-#
-
-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))
-application/x-csource		c cxx cpp cc C h hpp \
-				printable(0,1024) + \
-				(string(0,/*) string(0,//)
-				 string(0,#include) contains(0,1024,<0a>#include) \
-				 string(0,#define) contains(0,1024,<0a>#define))
-text/html			html htm printable(0,1024) +\
-				(istring(0,"<HTML>") istring(0,"<!DOCTYPE"))
-text/plain			txt printable(0,1024)
-text/css			css
-
-
-########################################################################
-#
-# RSS feed type...
-#
-
-application/rss+xml		rss
-
-
-########################################################################
-#
-# CUPS-specific types...
-#
-
-application/vnd.cups-command	string(0,'#CUPS-COMMAND')
-application/vnd.cups-form	string(0,"<CUPSFORM>")
-application/vnd.cups-pdf
-application/vnd.cups-postscript
-application/vnd.cups-ppd	ppd string(0,"*PPD-Adobe:")
-application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
-application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
-				string(0,<1B>@) \
-				(contains(0,128,<1B>%-12345X) + \
-				 (contains(0,4096,"LANGUAGE=PCL") \
-				  contains(0,4096,"LANGUAGE = PCL")))
-
-########################################################################
-#
-# Raw print file support...
-#
-# Comment the following type to prevent raw file printing.
-#
-
-application/octet-stream
-
-#
-# End of "$Id: mime.types 6649 2007-07-11 21:46:42Z mike $".
-#

conf/pam.darwin

@@ -1,7 +0,0 @@
-# cups: auth account password session
-auth       sufficient     pam_securityserver.so
-auth       sufficient     pam_unix.so
-auth       required       pam_deny.so
-account    required       pam_permit.so
-password   required       pam_deny.so
-session    required       pam_permit.so

conf/pam.irix

@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth	required	pam_unix.so shadow nodelay nullok
-account	required	pam_unix.so

conf/pam.std.in

@@ -1,2 +0,0 @@
-auth	required	@PAMMOD@ nullok shadow
-account	required	@PAMMOD@

conf/snmp.conf.in

@@ -1,13 +0,0 @@
-#
-# "$Id$"
-#
-#   Sample SNMP configuration file for CUPS.  See "man cups-smnp.conf" for a
-#   complete description of this file.
-#
-
-@CUPS_SNMP_ADDRESS@
-@CUPS_SNMP_COMMUNITY@
-
-#
-# End of "$Id$".
-#

config-scripts/compiler.m4

@@ -0,0 +1,35 @@
+#
+# "$Id: compiler.m4 142 2006-08-17 14:50:46Z mike $"
+#
+# Common compiler stuff for autoconf...
+#
+
+CFLAGS="${CFLAGS:=}"
+LDFLAGS="${LDFLAGS:=}"
+LIBS="${LIBS:=}"
+
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
+    [if test x$enable_debug = xyes; then
+	CFLAGS="-g $CFLAGS"
+	LDFLAGS="-g $LDFLAGS"
+    fi])
+
+
+AC_PROG_CC
+AC_PATH_PROG(RM,rm)
+
+dnl Support large files.
+AC_SYS_LARGEFILE
+
+dnl Add -Wall for GCC...
+if test -n "$GCC"; then
+	dnl Extended warnings...
+	CFLAGS="-Wshadow -Winline $CFLAGS"
+	dnl Standard warnings...
+	CFLAGS="-Wall -Wunused -Wno-char-subscripts -Wno-format-y2k $CFLAGS"
+fi
+
+
+#
+# End of "$Id: compiler.m4 142 2006-08-17 14:50:46Z mike $".
+#

config-scripts/cups-3264.m4

@@ -1,140 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   32/64-bit library support stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Setup support for separate 32/64-bit library generation...
-AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
-
-INSTALL32=""
-LIB32CUPS=""
-LIB32CUPSIMAGE=""
-LIB32DIR=""
-UNINSTALL32=""
-
-AC_SUBST(INSTALL32)
-AC_SUBST(LIB32CUPS)
-AC_SUBST(LIB32CUPSIMAGE)
-AC_SUBST(LIB32DIR)
-AC_SUBST(UNINSTALL32)
-
-AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
-
-INSTALL64=""
-LIB64CUPS=""
-LIB64CUPSIMAGE=""
-LIB64DIR=""
-UNINSTALL64=""
-
-AC_SUBST(INSTALL64)
-AC_SUBST(LIB64CUPS)
-AC_SUBST(LIB64CUPSIMAGE)
-AC_SUBST(LIB64DIR)
-AC_SUBST(UNINSTALL64)
-
-case "$uname" in
-	HP-UX*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib"
-			if test -d /usr/lib/hpux32; then
-				LIB32DIR="${LIB32DIR}/hpux32"
-			fi
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib"
-			if test -d /usr/lib/hpux64; then
-				LIB64DIR="${LIB64DIR}/hpux64"
-			fi
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	IRIX)
-		if test "x$enable_32bit" = xyes; then
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$prefix/lib32"
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$prefix/lib64"
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	Linux*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib"
-			if test -d /usr/lib32; then
-				LIB32DIR="${LIB32DIR}32"
-			fi
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib"
-			if test -d /usr/lib64; then
-				LIB64DIR="${LIB64DIR}64"
-			fi
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-
-	SunOS*)
-		if test "x$enable_32bit" = xyes; then
-			# Build 32-bit libraries, 64-bit base...
-			INSTALL32="install32bit"
-			LIB32CUPS="32bit/libcups.so.2"
-			LIB32CUPSIMAGE="32bit/libcupsimage.so.2"
-			LIB32DIR="$exec_prefix/lib/32"
-			UNINSTALL32="uninstall32bit"
-		fi
-
-		if test "x$enable_64bit" = xyes; then
-			# Build 64-bit libraries, 32-bit base...
-			INSTALL64="install64bit"
-			LIB64CUPS="64bit/libcups.so.2"
-			LIB64CUPSIMAGE="64bit/libcupsimage.so.2"
-			LIB64DIR="$exec_prefix/lib/64"
-			UNINSTALL64="uninstall64bit"
-		fi
-		;;
-esac
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-common.m4

@@ -1,291 +0,0 @@
-dnl
-dnl "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $"
-dnl
-dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl We need at least autoconf 2.60...
-AC_PREREQ(2.60)
-
-dnl Set the name of the config header file...
-AC_CONFIG_HEADER(config.h)
-
-dnl Versio number information...
-CUPS_VERSION="1.3.3"
-CUPS_REVISION=""
-#if test -z "$CUPS_REVISION" -a -d .svn; then
-#	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
-#fi
-
-AC_SUBST(CUPS_VERSION)
-AC_SUBST(CUPS_REVISION)
-AC_DEFINE_UNQUOTED(CUPS_SVERSION, "CUPS v$CUPS_VERSION$CUPS_REVISION")
-AC_DEFINE_UNQUOTED(CUPS_MINIMAL, "CUPS/$CUPS_VERSION$CUPS_REVISION")
-
-dnl Default compiler flags...
-CFLAGS="${CFLAGS:=}"
-CPPFLAGS="${CPPFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-LDFLAGS="${LDFLAGS:=}"
-
-dnl Checks for programs...
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
-AC_PROG_RANLIB
-AC_PATH_PROG(AR,ar)
-AC_PATH_PROG(HTMLDOC,htmldoc)
-AC_PATH_PROG(LD,ld)
-AC_PATH_PROG(LN,ln)
-AC_PATH_PROG(MV,mv)
-AC_PATH_PROG(RM,rm)
-AC_PATH_PROG(RMDIR,rmdir)
-AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(STRIP,strip)
-
-if test "x$AR" = x; then
-	AC_MSG_ERROR([Unable to find required library archive command.])
-fi
-if test "x$CC" = x; then
-	AC_MSG_ERROR([Unable to find required C compiler command.])
-fi
-if test "x$CXX" = x; then
-	AC_MSG_ERROR([Unable to find required C++ compiler command.])
-fi
-
-dnl Static library option...
-INSTALLSTATIC=""
-AC_ARG_ENABLE(static, [  --enable-static         install static libraries, default=no])
-
-if test x$enable_static = xyes; then
-	echo Installing static libraries...
-	INSTALLSTATIC="installstatic"
-fi
-
-AC_SUBST(INSTALLSTATIC)
-
-dnl Check for libraries...
-AC_SEARCH_LIBS(crypt, crypt)
-AC_SEARCH_LIBS(getspent, sec gen)
-
-LIBMALLOC=""
-AC_ARG_ENABLE(mallinfo, [  --enable-mallinfo       turn on malloc debug information, default=no])
-
-if test x$enable_mallinfo = xyes; then
-	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
-fi
-
-AC_SUBST(LIBMALLOC)
-
-dnl Check for libpaper support...
-AC_ARG_ENABLE(libpaper, [  --enable-libpaper       turn on libpaper support, default=no])
-
-if test x$enable_libpaper = xyes; then
-	AC_CHECK_LIB(paper,systempapername,
-		AC_DEFINE(HAVE_LIBPAPER)
-		LIBPAPER="-lpaper",
-		LIBPAPER="")
-else
-	LIBPAPER=""
-fi
-AC_SUBST(LIBPAPER)
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
-AC_CHECK_HEADER(langinfo.h,AC_DEFINE(HAVE_LANGINFO_H))
-AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
-AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
-AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
-AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
-AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
-AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
-AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
-AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
-AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
-AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
-
-dnl Checks for string functions.
-AC_CHECK_FUNCS(strdup strcasecmp strncasecmp strlcat strlcpy)
-if test "$uname" = "HP-UX" -a "$uversion" = "1020"; then
-	echo Forcing snprintf emulation for HP-UX.
-else
-	AC_CHECK_FUNCS(snprintf vsnprintf)
-fi
-
-dnl Checks for mkstemp and mkstemps functions.
-AC_CHECK_FUNCS(mkstemp mkstemps)
-
-dnl Check for geteuid function.
-AC_CHECK_FUNCS(geteuid)
-
-dnl Check for vsyslog function.
-AC_CHECK_FUNCS(vsyslog)
-
-dnl Checks for signal functions.
-case "$uname" in
-	Linux | GNU)
-		# Do not use sigset on Linux or GNU HURD
-		;;
-	*)
-		# Use sigset on other platforms, if available
-		AC_CHECK_FUNCS(sigset)
-		;;
-esac
-
-AC_CHECK_FUNCS(sigaction)
-
-dnl Checks for wait functions.
-AC_CHECK_FUNCS(waitpid wait3)
-
-dnl See if the tm structure has the tm_gmtoff member...
-AC_MSG_CHECKING(for tm_gmtoff member in tm structure)
-AC_TRY_COMPILE([#include <time.h>],[struct tm t;
-	int o = t.tm_gmtoff;],
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_TM_GMTOFF),
-	AC_MSG_RESULT(no))
-
-dnl See if we have the removefile(3) function for securely removing files
-AC_CHECK_FUNCS(removefile)
-
-dnl Flags for "ar" command...
-case $uname in
-        Darwin* | *BSD*)
-                ARFLAGS="-rcv"
-                ;;
-        *)
-                ARFLAGS="crvs"
-                ;;
-esac
-
-AC_SUBST(ARFLAGS)
-
-dnl Extra platform-specific libraries...
-BACKLIBS=""
-CUPSDLIBS=""
-DBUSDIR=""
-CUPS_DEFAULT_PRINTADMIN_AUTH="@SYSTEM"
-CUPS_SYSTEM_AUTHKEY=""
-
-AC_ARG_ENABLE(dbus, [  --enable-dbus           enable DBUS support, default=auto])
-
-FONTS="fonts"
-AC_SUBST(FONTS)
-LEGACY_BACKENDS="parallel scsi"
-AC_SUBST(LEGACY_BACKENDS)
-
-case $uname in
-        Darwin*)
-		FONTS=""
-		LEGACY_BACKENDS=""
-                BACKLIBS="-framework IOKit"
-                CUPSDLIBS="-sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration"
-                LIBS="-framework CoreFoundation $LIBS"
-
-		dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString...
-		AC_MSG_CHECKING(for CFLocaleCreateCanonicalLocaleIdentifierFromString)
-		if test "$uname" = "Darwin" -a $uversion -ge 70; then
-			AC_DEFINE(HAVE_CF_LOCALE_ID)
-			AC_MSG_RESULT(yes)
-		else
-			AC_MSG_RESULT(no)
-		fi
-
-		dnl Check for framework headers...
-		AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h,AC_DEFINE(HAVE_COREFOUNDATION_H))
-		AC_CHECK_HEADER(CoreFoundation/CFPriv.h,AC_DEFINE(HAVE_CFPRIV_H))
-		AC_CHECK_HEADER(CoreFoundation/CFBundlePriv.h,AC_DEFINE(HAVE_CFBUNDLEPRIV_H))
-
-		dnl Check for the new membership functions in MacOSX 10.4...
-		AC_CHECK_HEADER(membership.h,AC_DEFINE(HAVE_MEMBERSHIP_H))
-		AC_CHECK_HEADER(membershipPriv.h,AC_DEFINE(HAVE_MEMBERSHIPPRIV_H))
-		AC_CHECK_FUNCS(mbr_uid_to_uuid)
-
-		dnl Need <dlfcn.h> header...
-		AC_CHECK_HEADER(dlfcn.h,AC_DEFINE(HAVE_DLFCN_H))
-
-		dnl Check for notify_post support
-		AC_CHECK_HEADER(notify.h,AC_DEFINE(HAVE_NOTIFY_H))
-		AC_CHECK_FUNCS(notify_post)
-
-		dnl Check for Authorization Services support
-		AC_CHECK_HEADER(Security/Authorization.h, [
-			AC_DEFINE(HAVE_AUTHORIZATION_H)
-			CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
-			CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"])
-		AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
-                ;;
-
-	Linux*)
-		dnl Check for DBUS support
-		if test "x$enable_dbus" != xno; then
-			AC_PATH_PROG(PKGCONFIG, pkg-config)
-			if test "x$PKGCONFIG" != x; then
-				AC_MSG_CHECKING(for DBUS)
-				if $PKGCONFIG --exists dbus-1; then
-					AC_MSG_RESULT(yes)
-					AC_DEFINE(HAVE_DBUS)
-					CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
-					CUPSDLIBS="`$PKGCONFIG --libs dbus-1`"
-					AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ], dbusdir="$withval", dbusdir="/etc/dbus-1")
-					DBUSDIR="$dbusdir"
-					AC_CHECK_LIB(dbus-1,
-					    dbus_message_iter_init_append,
-					    AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
-				else
-					AC_MSG_RESULT(no)
-				fi
-			fi
-		fi
-		;;
-esac
-
-AC_SUBST(CUPS_DEFAULT_PRINTADMIN_AUTH)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTADMIN_AUTH, "$CUPS_DEFAULT_PRINTADMIN_AUTH")
-AC_SUBST(CUPS_SYSTEM_AUTHKEY)
-
-dnl See if we have POSIX ACL support...
-SAVELIBS="$LIBS"
-LIBS=""
-AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
-CUPSDLIBS="$CUPSDLIBS $LIBS"
-LIBS="$SAVELIBS"
-
-AC_SUBST(BACKLIBS)
-AC_SUBST(CUPSDLIBS)
-AC_SUBST(DBUSDIR)
-
-dnl New default port definition for IPP...
-AC_ARG_WITH(ipp-port, [  --with-ipp-port         set default port number for IPP ],
-	DEFAULT_IPP_PORT="$withval",
-	DEFAULT_IPP_PORT="631")
-
-AC_SUBST(DEFAULT_IPP_PORT)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
-
-dnl
-dnl End of "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $".
-dnl

config-scripts/cups-compiler.m4

@@ -1,502 +0,0 @@
-dnl
-dnl "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $"
-dnl
-dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Clear the debugging and non-shared library options unless the user asks
-dnl for them...
-OPTIM=""
-AC_SUBST(OPTIM)
-
-AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
-	[if test x$enable_debug = xyes; then
-		OPTIM="-g"
-	fi])
-
-dnl Setup general architecture flags...
-AC_ARG_WITH(archflags, [  --with-archflags="flags"
-                          set default architecture flags ])
-
-if test -z "$with_archflags"; then
-	ARCHFLAGS=""
-	LDARCHFLAGS=""
-else
-	ARCHFLAGS="$with_archflags"
-	if test "$uname" = Darwin; then
-		# Only link 32-bit programs - 64-bit is for the shared
-		# libraries...
-		LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`"
-	else
-		LDARCHFLAGS="$ARCHFLAGS"
-	fi
-fi
-
-AC_SUBST(ARCHFLAGS)
-AC_SUBST(LDARCHFLAGS)
-
-dnl Setup support for separate 32/64-bit library generation...
-AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"
-                          specifies 32-bit architecture flags])
-ARCH32FLAGS=""
-AC_SUBST(ARCH32FLAGS)
-
-AC_ARG_WITH(arch64flags, [  --with-arch64flags="flags"
-                          specifies 64-bit architecture flags])
-ARCH64FLAGS=""
-AC_SUBST(ARCH64FLAGS)
-
-dnl Position-Independent Executable support on Linux...
-AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fPIE option, default=no])
-
-dnl Read-only data/program support on Linux...
-AC_ARG_ENABLE(relro, [  --enable-relro          use GCC relro option, default=no])
-
-dnl Update compiler options...
-CXXLIBS=""
-AC_SUBST(CXXLIBS)
-
-PIEFLAGS=""
-AC_SUBST(PIEFLAGS)
-
-RELROFLAGS=""
-AC_SUBST(RELROFLAGS)
-
-LIBCUPSORDER="libcups.order"
-AC_ARG_WITH(libcupsorder, [  --with-libcupsorder     libcups secorder file, default=libcups.order],
-	if test -f "$withval"; then
-		LIBCUPSORDER="$withval"
-	fi)
-AC_SUBST(LIBCUPSORDER)
-
-LIBCUPSIMAGEORDER="libcupsimage.order"
-AC_ARG_WITH(libcupsimageorder, [  --with-libcupsimagesorder
-                          libcupsimage secorder file, default=libcupsimage.order],
-	if test -f "$withval"; then
-		LIBCUPSIMAGEORDER="$withval"
-	fi)
-AC_SUBST(LIBCUPSIMAGEORDER)
-
-if test -n "$GCC"; then
-	# Add GCC-specific compiler options...
-	if test -z "$OPTIM"; then
-		if test "x$with_optim" = x; then
-			# Default to optimize-for-size and debug
-       			OPTIM="-Os -g"
-		else
-			OPTIM="$with_optim $OPTIM"
-		fi
-	fi
-
-	if test $PICFLAG = 1 -a $uname != AIX; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-
-	case $uname in
-		Linux*)
-			if test x$enable_pie = xyes; then
-				PIEFLAGS="-pie -fPIE"
-			fi
-
-			if test x$enable_relro = xyes; then
-				RELROFLAGS="-Wl,-z,relro"
-			fi
-			;;
-
-		*)
-			if test x$enable_pie = xyes; then
-				echo "Sorry, --enable-pie is not supported on this OS!"
-			fi
-			;;
-	esac
-
-	if test "x$with_optim" = x; then
-		# Add useful warning options for tracking down problems...
-		OPTIM="-Wall -Wno-format-y2k $OPTIM"
-		# Additional warning options for alpha testing...
-		OPTIM="-Wshadow -Wunused $OPTIM"
-	fi
-
-	case "$uname" in
-		HP-UX*)
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-milp32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-mlp64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-mlp64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-milp32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-
-		IRIX)
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-n32 -mips3"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-64 -mips4"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-
-		Linux*)
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-m32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-m64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-
-		SunOS*)
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-m32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-m64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-	esac
-else
-	# Add vendor-specific compiler options...
-	case $uname in
-		AIX*)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2 -qmaxmem=6000"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-			;;
-		HP-UX*)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="+O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			CFLAGS="-Ae $CFLAGS"
-			# Warning 336 is "empty translation unit"
-			# Warning 829 is passing constant string as char *
-			CXXFLAGS="+W336,829 $CXXFLAGS"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="+DD32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="+DD64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="+DD64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="+DD32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-        	IRIX)
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			if test "x$with_optim" = x; then
-				OPTIM="-fullwarn -woff 1183,1209,1349,1506,3201 $OPTIM"
-			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-n32 -mips3"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-64 -mips4"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-		OSF*)
-			# Tru64 UNIX aka Digital UNIX aka OSF/1
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O"
-				else
-					OPTIM="$with_optim"
-				fi
-			fi
-			;;
-		SunOS*)
-			# Solaris
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-xO2"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-
-			if test "x$enable_32bit" = xyes; then
-				# Compiling on a Solaris system, build 64-bit
-				# binaries with separate 32-bit libraries...
-				ARCH32FLAGS="-xarch=generic"
-
-				if test "x$with_optim" = x; then
-					# Suppress all of Sun's questionable
-					# warning messages, and default to
-					# 64-bit compiles of everything else...
-					OPTIM="-w $OPTIM"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-xarch=generic64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				fi
-			else
-				if test "x$enable_64bit" = xyes; then
-					# Build 64-bit libraries...
-					ARCH64FLAGS="-xarch=generic64"
-				fi
-
-				if test "x$with_optim" = x; then
-					# Suppress all of Sun's questionable
-					# warning messages, and default to
-					# 32-bit compiles of everything else...
-					OPTIM="-w $OPTIM"
-				fi
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-xarch=generic"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				fi
-			fi
-			;;
-		UNIX_SVR*)
-			# UnixWare
-			if test -z "$OPTIM"; then
-				if test "x$with_optim" = x; then
-					OPTIM="-O"
-				else
-					OPTIM="$with_optim $OPTIM"
-				fi
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-		*)
-			# Running some other operating system; inform the user they
-			# should contribute the necessary options to
-			# cups-support@cups.org...
-			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-bugs@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS and CXXFLAGS"
-			echo "environment variable before running configure."
-			;;
-	esac
-fi
-
-# Add general compiler options per platform...
-case $uname in
-	HP-UX*)
-		# HP-UX 10.20 (at least) needs this definition to get the
-		# h_errno global...
-		OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
-
-		# HP-UX 11.00 (at least) needs this definition to get the
-		# u_short type used by the IP headers...
-		OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-
-		# HP-UX 11.23 (at least) needs this definition to get the
-		# IPv6 header to work...
-		OPTIM="$OPTIM -D_HPUX_SOURCE"
-		;;
-
-	OSF*)
-		# Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
-		# to be POSIX-compliant...
-		OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE"
-		;;
-esac
-
-dnl
-dnl End of "$Id: cups-compiler.m4 6976 2007-09-18 20:39:31Z mike $".
-dnl

config-scripts/cups-defaults.m4

@@ -1,342 +0,0 @@
-dnl
-dnl "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $"
-dnl
-dnl   Default cupsd configuration settings for the Common UNIX Printing System
-dnl   (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Default languages...
-LANGUAGES="`ls -1 locale/*.po | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`"
-
-AC_ARG_WITH(languages, [  --with-languages        set installed languages, default=all ],[
-	case "$withval" in
-		none | no) LANGUAGES="" ;;
-		all) ;;
-		*) LANGUAGES="$withval" ;;
-	esac])
-AC_SUBST(LANGUAGES)
-
-dnl Default ConfigFilePerm
-AC_ARG_WITH(config_file_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
-	CUPS_CONFIG_FILE_PERM="$withval",
-	if test "x$uname" = xDarwin; then
-		CUPS_CONFIG_FILE_PERM="644"
-	else
-		CUPS_CONFIG_FILE_PERM="640"
-	fi)
-AC_SUBST(CUPS_CONFIG_FILE_PERM)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_CONFIG_FILE_PERM, 0$CUPS_CONFIG_FILE_PERM)
-
-dnl Default LogFilePerm
-AC_ARG_WITH(log_file_perm, [  --with-log-file-perm    set default LogFilePerm value, default=0644],
-	CUPS_LOG_FILE_PERM="$withval",
-	CUPS_LOG_FILE_PERM="644")
-AC_SUBST(CUPS_LOG_FILE_PERM)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LOG_FILE_PERM, 0$CUPS_LOG_FILE_PERM)
-
-dnl Default Browsing
-AC_ARG_ENABLE(browsing, [  --enable-browsing       enable Browsing by default, default=yes])
-if test "x$enable_browsing" = xno; then
-	CUPS_BROWSING="No"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSING, 0)
-else
-	CUPS_BROWSING="Yes"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSING, 1)
-fi
-AC_SUBST(CUPS_BROWSING)
-
-dnl Default BrowseLocalProtocols
-AC_ARG_WITH(local_protocols, [  --with-local-protocols  set default BrowseLocalProtocols, default="CUPS"],
-	default_local_protocols="$withval",
-	default_local_protocols="default")
-
-if test x$with_local_protocols != xno; then
-	if test "x$default_local_protocols" = "xdefault"; then
-		if test "x$DNSSDLIBS" != "x"; then
-		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS dnssd"
-	else
-		CUPS_BROWSE_LOCAL_PROTOCOLS="CUPS"
-		fi
-	else
-		CUPS_BROWSE_LOCAL_PROTOCOLS="$default_local_protocols"
-	fi
-else
-	CUPS_BROWSE_LOCAL_PROTOCOLS=""
-fi
-
-AC_SUBST(CUPS_BROWSE_LOCAL_PROTOCOLS)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS,
-	"$CUPS_BROWSE_LOCAL_PROTOCOLS")
-
-dnl Default BrowseRemoteProtocols
-AC_ARG_WITH(remote_protocols, [  --with-remote-protocols set default BrowseRemoteProtocols, default="CUPS"],
-	default_remote_protocols="$withval",
-	default_remote_protocols="default")
-
-if test x$with_remote_protocols != xno; then
-	if test "x$default_remote_protocols" = "xdefault"; then
-		if test "$uname" = "Darwin" -a $uversion -ge 90; then
-			CUPS_BROWSE_REMOTE_PROTOCOLS=""
-		else
-			CUPS_BROWSE_REMOTE_PROTOCOLS="CUPS"
-		fi
-	else
-		CUPS_BROWSE_REMOTE_PROTOCOLS="$default_remote_protocols"
-	fi
-else
-	CUPS_BROWSE_REMOTE_PROTOCOLS=""
-fi
-
-AC_SUBST(CUPS_BROWSE_REMOTE_PROTOCOLS)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS,
-	"$CUPS_BROWSE_REMOTE_PROTOCOLS")
-
-dnl Default BrowseShortNames
-AC_ARG_ENABLE(browse_short, [  --enable-browse-short-names
-                          enable BrowseShortNames by default, default=yes])
-if test "x$enable_browse_short" = xno; then
-	CUPS_BROWSE_SHORT_NAMES="No"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_SHORT_NAMES, 0)
-else
-	CUPS_BROWSE_SHORT_NAMES="Yes"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_BROWSE_SHORT_NAMES, 1)
-fi
-AC_SUBST(CUPS_BROWSE_SHORT_NAMES)
-
-dnl Default DefaultShared
-AC_ARG_ENABLE(default_shared, [  --enable-default-shared enable DefaultShared by default, default=yes])
-if test "x$enable_default_shared" = xno; then
-	CUPS_DEFAULT_SHARED="No"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DEFAULT_SHARED, 0)
-else
-	CUPS_DEFAULT_SHARED="Yes"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DEFAULT_SHARED, 1)
-fi
-AC_SUBST(CUPS_DEFAULT_SHARED)
-
-dnl Default ImplicitClasses
-AC_ARG_ENABLE(implicit, [  --enable-implicit-classes
-                          enable ImplicitClasses by default, default=yes])
-if test "x$enable_implicit" = xno; then
-	CUPS_IMPLICIT_CLASSES="No"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IMPLICIT_CLASSES, 0)
-else
-	CUPS_IMPLICIT_CLASSES="Yes"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IMPLICIT_CLASSES, 1)
-fi
-AC_SUBST(CUPS_IMPLICIT_CLASSES)
-
-dnl Default UseNetworkDefault
-AC_ARG_ENABLE(use_network_default, [  --enable-use-network-default
-                          enable UseNetworkDefault by default, default=auto])
-if test "x$enable_use_network_default" != xno; then
-	AC_MSG_CHECKING(whether to use network default printers)
-	if test "x$enable_use_network_default" = xyes -o $uname != Darwin; then
-		CUPS_USE_NETWORK_DEFAULT="Yes"
-		AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 1)
-		AC_MSG_RESULT(yes)
-	else
-		CUPS_USE_NETWORK_DEFAULT="No"
-		AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 0)
-		AC_MSG_RESULT(no)
-	fi
-else
-	CUPS_USE_NETWORK_DEFAULT="No"
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USE_NETWORK_DEFAULT, 0)
-fi
-AC_SUBST(CUPS_USE_NETWORK_DEFAULT)
-
-dnl Determine the correct username and group for this OS...
-AC_ARG_WITH(cups_user, [  --with-cups-user        set default user for CUPS],
-	CUPS_USER="$withval",
-	AC_MSG_CHECKING(for default print user)
-	if test x$uname = xDarwin; then
-		if test x`id -u _lp 2>/dev/null` = x; then
-			CUPS_USER="lp";
-		else
-			CUPS_USER="_lp";
-		fi
-		AC_MSG_RESULT($CUPS_USER)
-	elif test -f /etc/passwd; then
-		CUPS_USER=""
-		for user in lp lpd guest daemon nobody; do
-			if test "`grep \^${user}: /etc/passwd`" != ""; then
-				CUPS_USER="$user"
-				AC_MSG_RESULT($user)
-				break;
-			fi
-		done
-
-		if test x$CUPS_USER = x; then
-			CUPS_USER="nobody"
-			AC_MSG_RESULT(not found, using "$CUPS_USER")
-		fi
-	else
-		CUPS_USER="nobody"
-		AC_MSG_RESULT(no password file, using "$CUPS_USER")
-	fi)
-
-AC_ARG_WITH(cups_group, [  --with-cups-group       set default group for CUPS],
-	CUPS_GROUP="$withval",
-	AC_MSG_CHECKING(for default print group)
-	if test x$uname = xDarwin; then
-		if test x`id -g _lp 2>/dev/null` = x; then
-			CUPS_GROUP="lp";
-		else
-			CUPS_GROUP="_lp";
-		fi
-		AC_MSG_RESULT($CUPS_GROUP)
-	elif test -f /etc/group; then
-		GROUP_LIST="_lp lp nobody"
-		CUPS_GROUP=""
-		for group in $GROUP_LIST; do
-			if test "`grep \^${group}: /etc/group`" != ""; then
-				CUPS_GROUP="$group"
-				AC_MSG_RESULT($group)
-				break;
-			fi
-		done
-
-		if test x$CUPS_GROUP = x; then
-			CUPS_GROUP="nobody"
-			AC_MSG_RESULT(not found, using "$CUPS_GROUP")
-		fi
-	else
-		CUPS_GROUP="nobody"
-		AC_MSG_RESULT(no group file, using "$CUPS_GROUP")
-	fi)
-
-AC_ARG_WITH(system_groups, [  --with-system-groups    set default system groups for CUPS],
-	CUPS_SYSTEM_GROUPS="$withval",
-	if test x$uname = xDarwin; then
-		CUPS_SYSTEM_GROUPS="admin"
-	else
-		AC_MSG_CHECKING(for default system groups)
-		if test -f /etc/group; then
-			CUPS_SYSTEM_GROUPS=""
-			GROUP_LIST="lpadmin sys system root"
-			for group in $GROUP_LIST; do
-				if test "`grep \^${group}: /etc/group`" != ""; then
-					if test "x$CUPS_SYSTEM_GROUPS" = x; then
-						CUPS_SYSTEM_GROUPS="$group"
-					else
-						CUPS_SYSTEM_GROUPS="$CUPS_SYSTEM_GROUPS $group"
-					fi
-				fi
-			done
-
-			if test "x$CUPS_SYSTEM_GROUPS" = x; then
-				CUPS_SYSTEM_GROUPS="$GROUP_LIST"
-				AC_MSG_RESULT(no groups found, using "$CUPS_SYSTEM_GROUPS")
-			else
-				AC_MSG_RESULT("$CUPS_SYSTEM_GROUPS")
-			fi
-		else
-			CUPS_SYSTEM_GROUPS="$GROUP_LIST"
-			AC_MSG_RESULT(no group file, using "$CUPS_SYSTEM_GROUPS")
-		fi
-	fi)
-
-
-CUPS_PRIMARY_SYSTEM_GROUP="`echo $CUPS_SYSTEM_GROUPS | awk '{print $1}'`"
-
-AC_SUBST(CUPS_USER)
-AC_SUBST(CUPS_GROUP)
-AC_SUBST(CUPS_SYSTEM_GROUPS)
-AC_SUBST(CUPS_PRIMARY_SYSTEM_GROUP)
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_USER, "$CUPS_USER")
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GROUP, "$CUPS_GROUP")
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_SYSTEM_GROUPS, "$CUPS_SYSTEM_GROUPS")
-
-dnl Default printcap file...
-AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
-	default_printcap="$withval",
-	default_printcap="default")
-
-if test x$default_printcap != xno; then
-	if test "x$default_printcap" = "xdefault"; then
-		case $uname in
-			Darwin*)
-				if test $uversion -ge 90; then
-					CUPS_DEFAULT_PRINTCAP=""
-				else
-					CUPS_DEFAULT_PRINTCAP="/etc/printcap"
-				fi
-				;;
-			SunOS*)
-				CUPS_DEFAULT_PRINTCAP="/etc/printers.conf"
-				;;
-			*)
-				CUPS_DEFAULT_PRINTCAP="/etc/printcap"
-				;;
-		esac
-	else
-		CUPS_DEFAULT_PRINTCAP="$default_printcap"
-	fi
-else
-	CUPS_DEFAULT_PRINTCAP=""
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")
-
-dnl Default MaxCopies value...
-AC_ARG_WITH(max-copies, [  --with-max-copies       set max copies value, default=100 ],
-	CUPS_MAX_COPIES="$withval",
-	if test "x$uname" = xDarwin; then
-		CUPS_MAX_COPIES="999"
-	else
-		CUPS_MAX_COPIES="100"
-	fi)
-
-AC_SUBST(CUPS_MAX_COPIES)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES)
-
-dnl Default raw printing state
-AC_ARG_ENABLE(raw_printing, [  --enable-raw-printing   enable raw printing by default, default=auto])
-if test "x$enable_raw_printing" != xno; then
-	AC_MSG_CHECKING(whether to enable raw printing)
-	if test "x$enable_raw_printing" = xyes -o $uname = Darwin; then
-		DEFAULT_RAW_PRINTING=""
-		AC_MSG_RESULT(yes)
-	else
-		DEFAULT_RAW_PRINTING="#"
-		AC_MSG_RESULT(no)
-	fi
-else
-	DEFAULT_RAW_PRINTING="#"
-fi
-AC_SUBST(DEFAULT_RAW_PRINTING)
-
-dnl Default SNMP options...
-AC_ARG_WITH(snmp-address, [  --with-snmp-address     set SNMP query address, default=auto ],
-	if test "x$withval" = x; then
-		CUPS_SNMP_ADDRESS=""
-	else
-		CUPS_SNMP_ADDRESS="Address $withval"
-	fi,
-	if test "x$uname" = xDarwin; then
-		CUPS_SNMP_ADDRESS=""
-	else
-		CUPS_SNMP_ADDRESS="Address @LOCAL"
-	fi)
-
-AC_ARG_WITH(snmp-community, [  --with-snmp-community   set SNMP community, default=public ],
-	CUPS_SNMP_COMMUNITY="Community $withval",
-	CUPS_SNMP_COMMUNITY="Community public")
-
-AC_SUBST(CUPS_SNMP_ADDRESS)
-AC_SUBST(CUPS_SNMP_COMMUNITY)
-
-dnl
-dnl End of "$Id: cups-defaults.m4 6754 2007-08-01 19:00:07Z mike $".
-dnl

config-scripts/cups-directories.m4

@@ -1,371 +0,0 @@
-dnl
-dnl "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $"
-dnl
-dnl   Directory stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_PREFIX_DEFAULT(/)
-
-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 "bindir" variable...
-if test "$bindir" = "\${exec_prefix}/bin"; then
-	bindir="$exec_prefix/bin"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_BINDIR, "$bindir")
-
-dnl Fix "sbindir" variable...
-if test "$sbindir" = "\${exec_prefix}/sbin"; then
-	sbindir="$exec_prefix/sbin"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_SBINDIR, "$sbindir")
-
-dnl Fix "sharedstatedir" variable if it hasn't been specified...
-if test "$sharedstatedir" = "\${prefix}/com" -a "$prefix" = "/"; then
-	sharedstatedir="/usr/com"
-fi
-
-dnl Fix "datarootdir" variable if it hasn't been specified...
-if test "$datarootdir" = "\${prefix}/share"; then
-	if test "$prefix" = "/"; then
-		datarootdir="/usr/share"
-	else
-		datarootdir="$prefix/share"
-	fi
-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
-elif test "$datadir" = "\${datarootdir}"; then
-	datadir="$datarootdir"
-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
-		if test "$uname" = Darwin; then
-			localstatedir="/private/var"
-		else
-			localstatedir="/var"
-		fi
-	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
-		if test "$uname" = Darwin; then
-			sysconfdir="/private/etc"
-		else
-			sysconfdir="/etc"
-		fi
-	else
-		sysconfdir="$prefix/etc"
-	fi
-fi
-
-dnl Fix "libdir" variable...
-if test "$libdir" = "\${exec_prefix}/lib"; then
-	case "$uname" in
-		IRIX*)
-			libdir="$exec_prefix/lib32"
-			;;
-		Linux*)
-			if test -d /usr/lib64; then
-				libdir="$exec_prefix/lib64"
-			fi
-			;;
-		HP-UX*)
-			if test -d /usr/lib/hpux32; then
-				libdir="$exec_prefix/lib/hpux32"
-			fi
-			;;
-	esac
-fi
-
-dnl Setup init.d locations...
-AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
-AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="99")
-AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="00")
-
-INITDIR=""
-INITDDIR=""
-RCLEVELS="$rclevels"
-RCSTART="$rcstart"
-RCSTOP="$rcstop"
-
-if test x$rcdir = x; then
-	case "$uname" in
-		AIX*)
-			INITDIR="/etc/rc.d"
-			;;
-
-		Darwin*)
-			# Darwin and MacOS X...
-			if test -x /sbin/launchd; then
-				INITDDIR="/System/Library/LaunchDaemons"
-			else 
-				INITDDIR="/System/Library/StartupItems/PrintingServices"
-			fi
-			;;
-
-		FreeBSD* | OpenBSD* | MirBSD* | ekkoBSD*)
-			# FreeBSD and OpenBSD
-			;;
-
-		HP-UX*)
-			INITDIR="/sbin"
-			RCLEVELS="2"
-			RCSTART="380"
-			RCSTOP="620"
-			;;
-
-		IRIX*)
-			# IRIX
-			INITDIR="/etc"
-			RCSTART="60"
-			RCSTOP="25"
-			;;
-
-		Linux | GNU)
-			# Linux/HURD seems to choose an init.d directory at random...
-			if test -d /sbin/init.d; then
-				# SuSE
-				INITDIR="/sbin/init.d"
-			else
-				if test -d /etc/init.d; then
-					# Others
-					INITDIR="/etc"
-				else
-					# RedHat
-					INITDIR="/etc/rc.d"
-				fi
-			fi
-			RCSTART="81"
-			RCSTOP="36"
-			;;
-
-		NetBSD*)
-			# NetBSD
-			INITDDIR="/etc/rc.d"
-			;;
-
-		OSF1*)
-			INITDIR="/sbin"
-			;;
-
-		SunOS*)
-			# Solaris
-			INITDIR="/etc"
-			RCSTART="81"
-			;;
-
-		*)
-			INITDIR="/etc"
-			;;
-
-	esac
-else
-	if test "x$rclevels" = x; then
-		INITDDIR="$rcdir"
-	else
-		INITDIR="$rcdir"
-	fi
-fi
-
-AC_SUBST(INITDIR)
-AC_SUBST(INITDDIR)
-AC_SUBST(RCLEVELS)
-AC_SUBST(RCSTART)
-AC_SUBST(RCSTOP)
-
-dnl Xinetd support...
-AC_ARG_WITH(xinetd, [  --with-xinetd           set path for xinetd config files],XINETD="$withval",XINETD="")
-
-if test "x$XINETD" = x -a ! -x /sbin/launchd; then
-	for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
-		if test -d $dir; then
-			XINETD="$dir"
-			break
-		fi
-	done
-fi
-
-AC_SUBST(XINETD)
-
-dnl Setup default locations...
-# Cache data...
-AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")
-
-if test x$cachedir = x; then
-	if test "x$uname" = xDarwin; then
-		CUPS_CACHEDIR="$localstatedir/spool/cups/cache"
-	else
-		CUPS_CACHEDIR="$localstatedir/cache/cups"
-	fi
-else
-	CUPS_CACHEDIR="$cachedir"
-fi
-AC_DEFINE_UNQUOTED(CUPS_CACHEDIR, "$CUPS_CACHEDIR")
-AC_SUBST(CUPS_CACHEDIR)
-
-# Data files
-CUPS_DATADIR="$datadir/cups"
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
-AC_SUBST(CUPS_DATADIR)
-
-# Icon directory
-AC_ARG_WITH(icondir, [  --with-icondir          set path for application icons],icondir="$withval",icondir="")
-
-if test "x$icondir" = x -a -d /usr/share/icons; then
-	ICONDIR="/usr/share/icons"
-else
-	ICONDIR="$icondir"
-fi
-
-AC_SUBST(ICONDIR)
-
-# Menu directory
-AC_ARG_WITH(menudir, [  --with-menudir          set path for application menus],menudir="$withval",menudir="")
-
-if test "x$menudir" = x -a -d /usr/share/applications; then
-	MENUDIR="/usr/share/applications"
-else
-	MENUDIR="$menudir"
-fi
-
-AC_SUBST(MENUDIR)
-
-# Documentation files
-AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
-
-if test x$docdir = x; then
-	CUPS_DOCROOT="$datadir/doc/cups"
-	docdir="$datadir/doc/cups"
-else
-	CUPS_DOCROOT="$docdir"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
-AC_SUBST(CUPS_DOCROOT)
-
-# Fonts
-AC_ARG_WITH(fontpath, [  --with-fontpath         set font path for pstoraster],fontpath="$withval",fontpath="")
-
-if test "x$fontpath" = "x"; then
-	CUPS_FONTPATH="$datadir/cups/fonts"
-else
-	CUPS_FONTPATH="$fontpath"
-fi
-
-AC_SUBST(CUPS_FONTPATH)
-AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
-
-# Locale data (initial assignment allows us not to require autoconf 2.60)
-localedir="${localedir:=}"
-if test "$localedir" = "\${datarootdir}/locale" -o "$localedir" = ""; then
-	case "$uname" in
-		Linux | GNU | *BSD* | Darwin*)
-			CUPS_LOCALEDIR="$datadir/locale"
-			;;
-
-		OSF1* | AIX*)
-			CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
-			;;
-
-		*)
-			# This is the standard System V location...
-			CUPS_LOCALEDIR="$exec_prefix/lib/locale"
-			;;
-	esac
-else
-	CUPS_LOCALEDIR="$localedir"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
-AC_SUBST(CUPS_LOCALEDIR)
-
-# Log files...
-AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
-
-if test x$logdir = x; then
-	CUPS_LOGDIR="$localstatedir/log/cups"
-	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
-else
-	CUPS_LOGDIR="$logdir"
-fi
-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$CUPS_LOGDIR")
-AC_SUBST(CUPS_LOGDIR)
-
-# Longer-term spool data
-CUPS_REQUESTS="$localstatedir/spool/cups"
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
-AC_SUBST(CUPS_REQUESTS)
-
-# Server executables...
-case "$uname" in
-	*BSD* | Darwin*)
-		# *BSD and Darwin (MacOS X)
-		INSTALL_SYSV=""
-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
-		;;
-	*)
-		# All others
-		INSTALL_SYSV="install-sysv"
-		CUPS_SERVERBIN="$exec_prefix/lib/cups"
-		;;
-esac
-
-AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
-AC_SUBST(CUPS_SERVERBIN)
-AC_SUBST(INSTALL_SYSV)
-
-# Configuration files
-CUPS_SERVERROOT="$sysconfdir/cups"
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
-AC_SUBST(CUPS_SERVERROOT)
-
-# Transient run-time state
-CUPS_STATEDIR="$localstatedir/run/cups"
-AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
-AC_SUBST(CUPS_STATEDIR)
-
-dnl
-dnl End of "$Id: cups-directories.m4 6976 2007-09-18 20:39:31Z mike $".
-dnl

config-scripts/cups-dnssd.m4

@@ -1,54 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   DNS Service Discovery (aka Bonjour) stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   http://www.dns-sd.org
-dnl   http://www.multicastdns.org/
-dnl   http://developer.apple.com/networking/bonjour/
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(dnssd, [  --enable-dnssd          turn on DNS Service Discovery support, default=yes])
-AC_ARG_WITH(dnssd-libs, [  --with-dnssd-libs       set directory for DNS Service Discovery library],
-	LDFLAGS="-L$withval $LDFLAGS"
-	DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(dnssd-includes, [  --with-dnssd-includes   set directory for DNS Service Discovery includes],
-	CFLAGS="-I$withval $CFLAGS"
-	CXXFLAGS="-I$withval $CXXFLAGS"
-	CPPFLAGS="-I$withval $CPPFLAGS",)
-
-DNSSDLIBS=""
-
-if test x$enable_dnssd != xno; then
-	AC_CHECK_HEADER(dns_sd.h, [
-		case "$uname" in
-			Darwin*)
-				# Darwin and MacOS X...
-				DNSSDLIBS="-framework CoreFoundation -framework SystemConfiguration"
-				AC_DEFINE(HAVE_DNSSD)
-				AC_DEFINE(HAVE_COREFOUNDATION)
-				AC_DEFINE(HAVE_SYSTEMCONFIGURATION)
-				;;
-			*)
-				# All others...
-				AC_CHECK_LIB(dns_sd,DNSServiceProcessResult,
-					AC_DEFINE(HAVE_DNSSD)
-					DNSSDLIBS="-ldns_sd")
-				;;
-		esac
-	])
-fi
-
-AC_SUBST(DNSSDLIBS)
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-gssapi.m4

@@ -1,111 +0,0 @@
-dnl
-dnl   "$Id$"
-dnl
-dnl   GSSAPI/Kerberos library detection.
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006-2007 by Easy Software Products.
-dnl
-dnl   This file contains Kerberos support code, copyright 2006 by
-dnl   Jelmer Vernooij.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(gssapi, [  --enable-gssapi         turn on GSSAPI support, default=yes])
-
-LIBGSSAPI=""
-
-if test x$enable_gssapi != xno; then
-	AC_PATH_PROG(KRB5CONFIG, krb5-config)
-	if test "x$KRB5CONFIG" != x; then
-		if test "x$uname" = "xDarwin"; then
-			# Mac OS X weak-links to the Kerberos framework...
-			LIBGSSAPI="-weak_framework Kerberos"
-		else
-			CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"		
-			CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"		
-			LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-		fi
-		AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-	else
-		# Check for vendor-specific implementations...
-		case "$uname" in
-			HP-UX*)
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					LIBGSSAPI="-lgss -lgssapi_krb5")
-				;;
-			SunOS*)
-				AC_CHECK_LIB(gss, gss_display_status,
-					AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
-					LIBGSSAPI="-lgss")
-				;;
-		esac
-	fi
-
-	if test "x$LIBGSSAPI" != x; then
-		AC_CHECK_HEADER(krb5.h, AC_DEFINE(HAVE_KRB5_H))
-		AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H))
-		AC_CHECK_HEADER(gssapi/gssapi.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_H))
-		AC_CHECK_HEADER(gssapi/gssapi_generic.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_GENERIC_H))
-		AC_CHECK_HEADER(gssapi/gssapi_krb5.h, AC_DEFINE(HAVE_GSSAPI_GSSAPI_KRB5_H))
-
-		SAVELIBS="$LIBS"
-		LIBS="$LIBS $LIBGSSAPI"
-
-		AC_CHECK_FUNC(gsskrb5_register_acceptor_identity, 
-			      AC_DEFINE(HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY))
-		AC_CHECK_FUNC(krb5_cc_new_unique, AC_DEFINE(HAVE_KRB5_CC_NEW_UNIQUE))
-
-		AC_MSG_CHECKING(for GSS_C_NT_HOSTBASED_SERVICE)
-		if test $ac_cv_header_gssapi_gssapi_h = yes; then
-			AC_TRY_COMPILE([ #include <gssapi/gssapi.h> ],
-				       [ gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; ],
-				       AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-				       AC_MSG_RESULT(yes),
-				       AC_MSG_RESULT(no))
-		else
-			AC_TRY_COMPILE([ #include <gssapi.h> ],
-				       [ gss_OID foo = GSS_C_NT_HOSTBASED_SERVICE; ],
-				       AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)
-				       AC_MSG_RESULT(yes),
-				       AC_MSG_RESULT(no))
-		fi
-
-		LIBS="$SAVELIBS"
-
-		AC_MSG_CHECKING(for Heimdal Kerberos)
-		AC_TRY_COMPILE([ #include <krb5.h> ],
-			       [ char *tmp = heimdal_version; ],
-			       AC_DEFINE(HAVE_HEIMDAL)
-			       AC_MSG_RESULT(yes),
-			       AC_MSG_RESULT(no))
-	fi
-fi
-
-dnl Default GSS service name...
-AC_ARG_WITH(gssservicename, [  --with-gssservicename   set default gss service name],
-	default_gssservicename="$withval",
-	default_gssservicename="default")
-
-if test x$default_gssservicename != xno; then
-	if test "x$default_gssservicename" = "xdefault"; then
-		CUPS_DEFAULT_GSSSERVICENAME="ipp"
-	else
-		CUPS_DEFAULT_GSSSERVICENAME="$default_gssservicename"
-	fi
-else
-	CUPS_DEFAULT_GSSSERVICENAME=""
-fi
-
-AC_SUBST(LIBGSSAPI)
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-image.m4

@@ -1,109 +0,0 @@
-dnl
-dnl "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl See if we want the image filters included at all...
-AC_ARG_ENABLE(image, [  --enable-image          turn on image filters, default=auto])
-
-IMGFILTERS=""
-if test "x$enable_image" != xno; then
-        AC_MSG_CHECKING(whether to build image filters)
-        if test "x$enable_image" = xyes -o $uname != Darwin; then
-		IMGFILTERS="imagetops imagetoraster"
-                AC_MSG_RESULT(yes)
-        else
-                AC_MSG_RESULT(no)
-        fi
-fi
-
-AC_SUBST(IMGFILTERS)
-
-dnl Check for image libraries...
-AC_ARG_ENABLE(jpeg, [  --enable-jpeg           turn on JPEG support, default=yes])
-AC_ARG_ENABLE(png, [  --enable-png            turn on PNG support, default=yes])
-AC_ARG_ENABLE(tiff, [  --enable-tiff           turn on TIFF support, default=yes])
-
-LIBJPEG=""
-LIBPNG=""
-LIBTIFF=""
-LIBZ=""
-
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBTIFF)
-AC_SUBST(LIBZ)
-
-dnl Image libraries use math library functions...
-AC_SEARCH_LIBS(pow, m)
-
-dnl Save the current libraries since we don't want the image libraries
-dnl included with every program...
-SAVELIBS="$LIBS"
-
-dnl JPEG library...
-if test x$enable_jpeg != xno; then
-    AC_CHECK_HEADER(jpeglib.h,
-	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-	    AC_DEFINE(HAVE_LIBJPEG)
-	    LIBJPEG="-ljpeg"
-	    LIBS="$LIBS -ljpeg"))
-else
-    AC_MSG_NOTICE([JPEG support disabled with --disable-jpeg.])
-fi
-
-dnl ZLIB library...
-AC_CHECK_HEADER(zlib.h,
-    AC_CHECK_LIB(z, gzgets,
-	AC_DEFINE(HAVE_LIBZ)
-	LIBZ="-lz"
-	LIBS="$LIBS -lz"))
-
-dnl PNG library...
-if test x$enable_png != xno; then
-    AC_CHECK_HEADER(png.h,
-	AC_CHECK_LIB(png, png_create_read_struct,
-	    AC_DEFINE(HAVE_LIBPNG)
-	    LIBPNG="-lpng"))
-else
-    AC_MSG_NOTICE([PNG support disabled with --disable-png.])
-fi
-
-dnl TIFF library...
-if test x$enable_tiff != xno; then
-    AC_CHECK_HEADER(tiff.h,
-	AC_CHECK_LIB(tiff, TIFFReadScanline,
-	AC_DEFINE(HAVE_LIBTIFF)
-	LIBTIFF="-ltiff"))
-else
-    AC_MSG_NOTICE([TIFF support disabled with --disable-tiff.])
-fi
-
-dnl Restore original LIBS settings...
-LIBS="$SAVELIBS"
-
-EXPORT_LIBJPEG="$LIBJPEG"
-EXPORT_LIBPNG="$LIBPNG"
-EXPORT_LIBTIFF="$LIBTIFF"
-EXPORT_LIBZ="$LIBZ"
-
-AC_SUBST(EXPORT_LIBJPEG)
-AC_SUBST(EXPORT_LIBPNG)
-AC_SUBST(EXPORT_LIBTIFF)
-AC_SUBST(EXPORT_LIBZ)
-
-AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
-
-dnl
-dnl End of "$Id: cups-image.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-largefile.m4

@@ -1,52 +0,0 @@
-dnl
-dnl "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Check for largefile support...
-AC_SYS_LARGEFILE
-
-dnl Define largefile options as needed...
-LARGEFILE=""
-if test x$enable_largefile != xno; then
-	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-	if test x$ac_cv_sys_large_files = x1; then
-		LARGEFILE="$LARGEFILE -D_LARGE_FILES"
-	fi
-
-	if test x$ac_cv_sys_file_offset_bits = x64; then
-		LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64"
-	fi
-fi
-AC_SUBST(LARGEFILE)
-
-dnl Check for "long long" support...
-AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
-	[if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		AC_TRY_COMPILE(,[long long int i;],
-			ac_cv_c_long_long=yes,
-			ac_cv_c_long_long=no)
-	fi])
-
-if test $ac_cv_c_long_long = yes; then
-	AC_DEFINE(HAVE_LONG_LONG)
-fi
-
-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
-
-dnl
-dnl End of "$Id: cups-largefile.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-launchd.m4

@@ -1,44 +0,0 @@
-dnl
-dnl "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   launchd stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-
-AC_ARG_ENABLE(launchd, [  --enable-launchd        turn on launchd support, default=yes])
-
-DEFAULT_LAUNCHD_CONF=""
-LAUNCHDLIBS=""
-
-if test x$enable_launchd != xno; then
-	AC_CHECK_FUNC(launch_msg, AC_DEFINE(HAVE_LAUNCHD))
-	AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
-
-	case "$uname" in
-		Darwin*)
-			# Darwin, MacOS X
-			DEFAULT_LAUNCHD_CONF="/System/Library/LaunchDaemons/org.cups.cupsd.plist"
-			# liblaunch is already part of libSystem
-			;;
-		*)
-			# All others; this test will need to be updated
-			;;
-	esac
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_DEFAULT_LAUNCHD_CONF, "$DEFAULT_LAUNCHD_CONF")
-AC_SUBST(DEFAULT_LAUNCHD_CONF)
-AC_SUBST(LAUNCHDLIBS)
-
-dnl
-dnl End of "$Id: cups-launchd.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-ldap.m4

@@ -1,41 +0,0 @@
-dnl
-dnl "$Id: cups-ldap.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2003-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(ldap, [  --enable-ldap           turn on LDAP support, default=yes])
-AC_ARG_WITH(openldap-libs, [  --with-openldap-libs    set directory for OpenLDAP library],
-    LDFLAGS="-L$withval $LDFLAGS"
-    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(openldap-includes, [  --with-openldap-includes
-                          set directory for OpenLDAP includes],
-    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
-
-LIBLDAP=""
-
-if test x$enable_ldap != xno; then
-    AC_CHECK_HEADER(ldap.h,
-	AC_CHECK_LIB(ldap, ldap_initialize,
-            AC_DEFINE(HAVE_LDAP)
-            AC_DEFINE(HAVE_OPENLDAP)
-	    LIBLDAP="-lldap"))
-fi
-
-AC_SUBST(LIBLDAP)
-
-
-dnl
-dnl End of "$Id: cups-ldap.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-libtool.m4

@@ -1,40 +0,0 @@
-dnl
-dnl "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                          turn on building with libtool (UNSUPPORTED!), default=no],
-	[if test x$enable_libtool_unsupported != xno; then
-		LIBTOOL="$enable_libtool_unsupported"
-		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."
-		echo "         (even if you have a support contract)"
-	else
-		LIBTOOL=""
-	fi])
-
-AC_SUBST(LIBTOOL)
-
-if test x$LIBTOOL != x; then
-	LIBCUPS="libcups.la"
-	LIBCUPSIMAGE="libcupsimage.la"
-	LINKCUPS="../cups/\$(LIBCUPS)"
-	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
-	DSO="\$(CC)"
-fi
-
-dnl
-dnl End of "$Id: cups-libtool.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-manpages.m4

@@ -1,104 +0,0 @@
-dnl
-dnl "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Fix "mandir" variable...
-if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
-	# New GNU "standards" break previous ones, so make sure we use
-	# the right default location for the operating system...
-	mandir="\${prefix}/man"
-fi
-
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
-	case "$uname" in
-        	Darwin* | Linux | GNU | *BSD* | AIX*)
-        		# Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX
-        		mandir="/usr/share/man"
-        		AMANDIR="/usr/share/man"
-        		PMANDIR="/usr/share/man"
-        		;;
-        	IRIX)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		AMANDIR="/usr/share/catman/a_man"
-        		PMANDIR="/usr/share/catman/p_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		AMANDIR="/usr/man"
-        		PMANDIR="/usr/man"
-        		;;
-	esac
-else
-	AMANDIR="$mandir"
-	PMANDIR="$mandir"
-fi
-
-AC_SUBST(AMANDIR)
-AC_SUBST(PMANDIR)
-
-dnl Setup manpage extensions...
-case "$uname" in
-	*BSD* | Darwin*)
-		# *BSD
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
-		MAN8EXT=8
-		MAN8DIR=8
-		;;
-	IRIX*)
-		# SGI IRIX
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
-		MAN8EXT=1m
-		MAN8DIR=1
-		;;
-	SunOS* | HP-UX*)
-		# Solaris and HP-UX
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
-		MAN8EXT=1m
-		MAN8DIR=1m
-		;;
-	Linux* | GNU*)
-		# Linux and GNU Hurd
-		MAN1EXT=1.gz
-		MAN5EXT=5.gz
-		MAN7EXT=7.gz
-		MAN8EXT=8.gz
-		MAN8DIR=8
-		;;
-	*)
-		# All others
-		MAN1EXT=1
-		MAN5EXT=5
-		MAN7EXT=7
-		MAN8EXT=8
-		MAN8DIR=8
-		;;
-esac
-
-AC_SUBST(MAN1EXT)
-AC_SUBST(MAN5EXT)
-AC_SUBST(MAN7EXT)
-AC_SUBST(MAN8EXT)
-AC_SUBST(MAN8DIR)
-
-dnl
-dnl End of "$Id: cups-manpages.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-network.m4

@@ -1,88 +0,0 @@
-dnl
-dnl "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Networking stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(gethostbyaddr, nsl)
-AC_SEARCH_LIBS(getifaddrs, nsl, AC_DEFINE(HAVE_GETIFADDRS))
-AC_SEARCH_LIBS(hstrerror, nsl socket resolv, AC_DEFINE(HAVE_HSTRERROR))
-AC_SEARCH_LIBS(rresvport_af, nsl, AC_DEFINE(HAVE_RRESVPORT_AF))
-
-# Tru64 5.1b leaks file descriptors with these functions; disable until
-# we can come up with a test for this...
-if test "$uname" != "OSF1"; then
-	AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO))
-	AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO))
-fi
-
-AC_CHECK_MEMBER(struct sockaddr.sa_len,,, [#include <sys/socket.h>])
-AC_CHECK_HEADER(sys/sockio.h, AC_DEFINE(HAVE_SYS_SOCKIO_H))
-
-if test "$uname" = "SunOS"; then
-	case "$uversion" in
-		55* | 56*)
-			maxfiles=1024
-			;;
-		*)
-			maxfiles=4096
-			;;
-	esac
-else
-	maxfiles=4096
-fi
-
-AC_ARG_WITH(maxfiles, [  --with-maxfiles=N       set maximum number of file descriptors for scheduler ],
-	maxfiles=$withval)
-
-AC_DEFINE_UNQUOTED(CUPS_MAX_FDS, $maxfiles)
-
-CUPS_DEFAULT_DOMAINSOCKET=""
-
-dnl Domain socket support...
-AC_ARG_WITH(domainsocket, [  --with-domainsocket     set unix domain socket name],
-	default_domainsocket="$withval",
-	default_domainsocket="")
-
-if test x$enable_domainsocket != xno -a x$default_domainsocket != xno; then
-	if test "x$default_domainsocket" = x; then
-		case "$uname" in
-			Darwin*)
-				# Darwin and MaxOS X do their own thing...
-				CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
-				;;
-			*)
-				# All others use FHS standard...
-				CUPS_DEFAULT_DOMAINSOCKET="$CUPS_STATEDIR/cups.sock"
-				;;
-		esac
-	else
-		CUPS_DEFAULT_DOMAINSOCKET="$default_domainsocket"
-	fi
-
-	CUPS_LISTEN_DOMAINSOCKET="Listen $CUPS_DEFAULT_DOMAINSOCKET"
-
-	AC_DEFINE_UNQUOTED(CUPS_DEFAULT_DOMAINSOCKET, "$CUPS_DEFAULT_DOMAINSOCKET")
-else
-	CUPS_LISTEN_DOMAINSOCKET=""
-fi
-
-AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
-AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
-
-AC_CHECK_HEADERS(AppleTalk/at_proto.h,AC_DEFINE(HAVE_APPLETALK_AT_PROTO_H),,
-	[#include <netat/appletalk.h>])
-
-dnl
-dnl End of "$Id: cups-network.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-opsys.m4

@@ -1,35 +0,0 @@
-dnl
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Get the operating system, version number, and architecture...
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1\2/'`
-uarch=`uname -m`
-
-case "$uname" in
-	GNU* | GNU/*)
-		uname="GNU"
-		;;
-	IRIX*)
-		uname="IRIX"
-		;;
-	Linux*)
-		uname="Linux"
-		;;
-esac
-
-dnl
-dnl "$Id: cups-opsys.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl

config-scripts/cups-pam.m4

@@ -1,89 +0,0 @@
-dnl
-dnl "$Id: cups-pam.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   PAM stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(pam, [  --enable-pam            turn on PAM support, default=yes])
-
-dnl Don't use PAM with AIX...
-if test $uname = AIX; then
-	enable_pam=no
-fi
-
-PAMDIR=""
-PAMFILE=""
-PAMLIBS=""
-PAMMOD="pam_unknown.so"
-
-if test x$enable_pam != xno; then
-	SAVELIBS="$LIBS"
-
-	AC_CHECK_LIB(dl,dlopen)
-	AC_CHECK_LIB(pam,pam_start)
-	AC_CHECK_HEADER(security/pam_appl.h)
-	if test x$ac_cv_header_security_pam_appl_h != xyes; then
-		AC_CHECK_HEADER(pam/pam_appl.h,
-			AC_DEFINE(HAVE_PAM_PAM_APPL_H))
-	fi
-
-	if test x$ac_cv_lib_pam_pam_start != xno; then
-		# Set the necessary libraries for PAM...
-		if test x$ac_cv_lib_dl_dlopen != xno; then
-			PAMLIBS="-lpam -ldl"
-		else
-			PAMLIBS="-lpam"
-		fi
-
-		# Find the PAM configuration directory, if any...
-		for dir in /private/etc/pam.d /etc/pam.d; do
-			if test -d $dir; then
-				PAMDIR=$dir
-				break;
-			fi
-		done
-	fi
-
-	LIBS="$SAVELIBS"
-
-	case "$uname" in
-		Darwin*)
-			# Darwin, MacOS X
-			PAMFILE="pam.darwin"
-			;;
-		IRIX)
-			# SGI IRIX
-			PAMFILE="pam.irix"
-			;;
-		*)
-			# All others; this test might need to be updated
-			# as Linux distributors move things around...
-			for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
-				if test -f /lib/security/$mod; then
-					PAMMOD="$mod"
-					break;
-				fi
-			done
-
-			PAMFILE="pam.std"
-			;;
-	esac
-fi
-
-AC_SUBST(PAMDIR)
-AC_SUBST(PAMFILE)
-AC_SUBST(PAMLIBS)
-AC_SUBST(PAMMOD)
-
-dnl
-dnl End of "$Id: cups-pam.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-pap.m4

@@ -1,28 +0,0 @@
-dnl
-dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
-dnl
-dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-# Currently the PAP backend is only supported on MacOS X with the AppleTalk
-# SDK installed...
-PAP=""
-if test $uname = Darwin; then
-	PAP="pap"
-	AC_CHECK_HEADER(AppleTalk/at_proto.h)
-fi
-
-AC_SUBST(PAP)
-
-dnl
-dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
-dnl

config-scripts/cups-pdf.m4

@@ -1,34 +0,0 @@
-dnl
-dnl "$Id: cups-pdf.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
-
-PDFTOPS=""
-
-if test "x$enable_pdftops" != xno; then
-	AC_MSG_CHECKING(whether to build pdftops filter)
-	if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
-		PDFTOPS="pdftops"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
-
-AC_SUBST(PDFTOPS)
-
-dnl
-dnl End of "$Id: cups-pdf.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-poll.m4

@@ -1,22 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   Select/poll stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL))
-AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
-AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))
-
-dnl
-dnl End of "$Id$".
-dnl

config-scripts/cups-scripting.m4

@@ -1,95 +0,0 @@
-dnl
-dnl "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-dnl Do we have Java?
-AC_ARG_WITH(java, [  --with-java             set Java interpreter for web interfaces ],
-	CUPS_JAVA="$withval",
-	CUPS_JAVA="")
-
-if test "x$CUPS_JAVA" = x; then
-	AC_PATH_PROG(JAVA,java)
-	CUPS_JAVA="$JAVA"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_JAVA, "$CUPS_JAVA")
-
-if test "x$CUPS_JAVA" != x; then
-	AC_DEFINE(HAVE_JAVA)
-fi
-
-dnl Do we have Perl?
-AC_ARG_WITH(perl, [  --with-perl             set Perl interpreter for web interfaces ],
-	CUPS_PERL="$withval",
-	CUPS_PERL="")
-
-if test "x$CUPS_PERL" = x; then
-	AC_PATH_PROG(PERL,perl)
-	CUPS_PERL="$PERL"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PERL, "$CUPS_PERL")
-
-if test "x$CUPS_PERL" != x; then
-	AC_DEFINE(HAVE_PERL)
-fi
-
-dnl Do we have PHP?
-AC_ARG_WITH(php, [  --with-php              set PHP interpreter for web interfaces ],
-	CUPS_PHP="$withval",
-	CUPS_PHP="")
-
-if test "x$CUPS_PHP" = x; then
-	AC_PATH_PROG(PHP,php)
-	CUPS_PHP="$PHP"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PHP, "$CUPS_PHP")
-
-if test "x$CUPS_PHP" = x; then
-	CUPS_PHP="no"
-else
-	AC_DEFINE(HAVE_PHP)
-fi
-
-PHPDIR=""
-if test "x$CUPS_PHP" != xno; then
-	AC_PATH_PROG(PHPCONFIG, php-config)
-
-	if test "x$PHPCONFIG" != x; then
-		PHPDIR="scripting/php"
-	fi
-fi
-
-AC_SUBST(PHPDIR)
-
-dnl Do we have Python?
-AC_ARG_WITH(python, [  --with-python           set Python interpreter for web interfaces ],
-	CUPS_PYTHON="$withval",
-	CUPS_PYTHON="")
-
-if test "x$CUPS_PYTHON" = x; then
-	AC_PATH_PROG(PYTHON,python)
-	CUPS_PYTHON="$PYTHON"
-fi
-
-AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON")
-
-if test "x$CUPS_PYTHON" != x; then
-	AC_DEFINE(HAVE_PYTHON)
-fi
-
-dnl
-dnl End of "$Id: cups-scripting.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-sharedlibs.m4

@@ -1,187 +0,0 @@
-dnl
-dnl "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Shared library support for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-PICFLAG=1
-DSOFLAGS="${DSOFLAGS:=}"
-
-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
-
-if test x$enable_shared != xno; then
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
-			;;
-		HP-UX*)
-			case "$uarch" in
-				ia64)
-					LIBCUPS="libcups.so.2"
-					LIBCUPSIMAGE="libcupsimage.so.2"
-					DSO="\$(CC)"
-					DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
-					;;
-				*)
-					LIBCUPS="libcups.sl.2"
-					LIBCUPSIMAGE="libcupsimage.sl.2"
-					DSO="\$(LD)"
-					DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
-					;;
-			esac
-			;;
-		IRIX)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
-			;;
-		OSF1* | Linux | GNU | *BSD*)
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
-			;;
-		Darwin*)
-			LIBCUPS="libcups.2.dylib"
-			LIBCUPSIMAGE="libcupsimage.2.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
-			;;
-		AIX*)
-			LIBCUPS="libcups_s.a"
-			LIBCUPSIMAGE="libcupsimage_s.a"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
-			;;
-		*)
-			echo "Warning: shared libraries may not be supported.  Trying -shared"
-			echo "         option with compiler."
-			LIBCUPS="libcups.so.2"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBCUPS="libcups.a"
-	LIBCUPSIMAGE="libcupsimage.a"
-	DSO=":"
-fi
-
-# 32-bit and 64-bit libraries need variations of the standard
-# DSOFLAGS...
-DSO32FLAGS="$DSOFLAGS"
-DSO64FLAGS="$DSOFLAGS"
-
-AC_SUBST(DSO)
-AC_SUBST(DSOFLAGS)
-AC_SUBST(DSO32FLAGS)
-AC_SUBST(DSO64FLAGS)
-AC_SUBST(LIBCUPS)
-AC_SUBST(LIBCUPSIMAGE)
-
-if test x$enable_shared = xno; then
-	LINKCUPS="../cups/libcups.a"
-	LINKCUPSIMAGE="../filter/libcupsimage.a"
-else
-	if test $uname = AIX; then
-		LINKCUPS="-lcups_s"
-		LINKCUPSIMAGE="-lcupsimage_s"
-	else
-		LINKCUPS="-lcups"
-		LINKCUPSIMAGE="-lcupsimage"
-	fi
-fi
-
-AC_SUBST(LINKCUPS)
-AC_SUBST(LINKCUPSIMAGE)
-
-dnl Update libraries for DSOs...
-EXPORT_LDFLAGS=""
-
-if test "$DSO" != ":"; then
-	# When using DSOs the image libraries are linked to libcupsimage.so
-	# rather than to the executables.  This makes things smaller if you
-	# are using any static libraries, and it also allows us to distribute
-	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
-	IMGLIBS=""
-
-	# Tell the run-time linkers where to find a DSO.  Some platforms
-	# need this option, even when the library is installed in a
-	# standard location...
-	case $uname in
-                HP-UX*)
-			# HP-UX needs the path, even for /usr/lib...
-			case "$uarch" in
-				ia64)
-					DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS"
-					DSO32FLAGS="-Wl,+s,+b,$LIB32DIR $DSO32FLAGS"
-					DSO64FLAGS="-Wl,+s,+b,$LIB64DIR $DSO64FLAGS"
-					;;
-				*)
-                			DSOFLAGS="+s +b $libdir $DSOFLAGS"
-                			DSO32FLAGS="+s +b $LIB32DIR $DSO32FLAGS"
-                			DSO64FLAGS="+s +b $LIB64DIR $DSO64FLAGS"
-					;;
-			esac
-                	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
-                	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
-			;;
-                SunOS*)
-                	# Solaris...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-R$libdir $DSOFLAGS"
-				DSO32FLAGS="-R$LIB32DIR $DSO32FLAGS"
-				DSO64FLAGS="-R$LIB64DIR $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -R$libdir"
-				EXPORT_LDFLAGS="-R$libdir"
-			fi
-			;;
-                *BSD*)
-                        # *BSD...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-Wl,-R$libdir $DSOFLAGS"
-				DSO32FLAGS="-Wl,-R$LIB32DIR $DSO32FLAGS"
-				DSO64FLAGS="-Wl,-R$LIB64DIR $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -Wl,-R$libdir"
-				EXPORT_LDFLAGS="-Wl,-R$libdir"
-			fi
-			;;
-                IRIX | Linux | GNU)
-                        # IRIX, Linux, and HURD...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
-				DSO32FLAGS="-Wl,-rpath,$LIB32DIR $DSO32FLAGS"
-				DSO64FLAGS="-Wl,-rpath,$LIB64DIR $DSO64FLAGS"
-				LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
-				EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
-			fi
-			;;
-	esac
-else
-	DSOLIBS=""
-	IMGLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
-fi
-
-AC_SUBST(DSOLIBS)
-AC_SUBST(IMGLIBS)
-AC_SUBST(EXPORT_LDFLAGS)
-
-dnl
-dnl End of "$Id: cups-sharedlibs.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-slp.m4

@@ -1,39 +0,0 @@
-dnl
-dnl "$Id: cups-slp.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(slp, [  --enable-slp            turn on SLP support, default=yes])
-AC_ARG_WITH(openslp-libs, [  --with-openslp-libs     set directory for OpenSLP library],
-    LDFLAGS="-L$withval $LDFLAGS"
-    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(openslp-includes, [  --with-openslp-includes set directory for OpenSLP includes],
-    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
-
-LIBSLP=""
-
-if test x$enable_slp != xno; then
-    AC_CHECK_HEADER(slp.h,
-	AC_CHECK_LIB(slp, SLPOpen,
-            AC_DEFINE(HAVE_LIBSLP)
-	    LIBSLP="-lslp"))
-fi
-
-AC_SUBST(LIBSLP)
-
-
-dnl
-dnl End of "$Id: cups-slp.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-ssl.m4

@@ -1,128 +0,0 @@
-dnl
-dnl "$Id: cups-ssl.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(ssl, [  --enable-ssl            turn on SSL/TLS support, default=yes])
-AC_ARG_ENABLE(cdsassl, [  --enable-cdsassl        use CDSA for SSL/TLS support, default=first])
-AC_ARG_ENABLE(gnutls, [  --enable-gnutls         use GNU TLS for SSL/TLS support, default=second])
-AC_ARG_ENABLE(openssl, [  --enable-openssl        use OpenSSL for SSL/TLS support, default=third])
-AC_ARG_WITH(openssl-libs, [  --with-openssl-libs     set directory for OpenSSL library],
-    LDFLAGS="-L$withval $LDFLAGS"
-    DSOFLAGS="-L$withval $DSOFLAGS",)
-AC_ARG_WITH(openssl-includes, [  --with-openssl-includes set directory for OpenSSL includes],
-    CFLAGS="-I$withval $CFLAGS"
-    CXXFLAGS="-I$withval $CXXFLAGS"
-    CPPFLAGS="-I$withval $CPPFLAGS",)
-
-SSLFLAGS=""
-SSLLIBS=""
-ENCRYPTION_REQUIRED=""
-
-if test x$enable_ssl != xno; then
-    dnl Look for CDSA...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_cdsassl}" != "xno"; then
-	if test $uname = Darwin; then
-	    AC_CHECK_HEADER(Security/SecureTransport.h, [
-		SSLLIBS="-framework CoreFoundation -framework Security"
-		# MacOS X doesn't (yet) come with pre-installed encryption
-		# certificates for CUPS, so don't enable encryption on
-		# /admin just yet...
-		#ENCRYPTION_REQUIRED="  Encryption Required"
-		AC_DEFINE(HAVE_SSL)
-		AC_DEFINE(HAVE_CDSASSL)
-
-		dnl Check for the various security headers...
-		AC_CHECK_HEADER(Security/SecPolicy.h,
-		    AC_DEFINE(HAVE_SECPOLICY_H))
-		AC_CHECK_HEADER(Security/SecPolicyPriv.h,
-		    AC_DEFINE(HAVE_SECPOLICYPRIV_H))
-		AC_CHECK_HEADER(Security/SecBasePriv.h,
-		    AC_DEFINE(HAVE_SECBASEPRIV_H))
-		AC_CHECK_HEADER(Security/SecIdentitySearchPriv.h,
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHPRIV_H))
-
-		dnl Check for SecIdentitySearchCreateWithPolicy...
-		AC_MSG_CHECKING(for SecIdentitySearchCreateWithPolicy)
-		if test $uversion -ge 80; then
-		    AC_DEFINE(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY)
-		    AC_MSG_RESULT(yes)
-		else
-		    AC_MSG_RESULT(no)
-		fi])
-	fi
-    fi
-
-    dnl Then look for GNU TLS...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
-    	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-	if test "x$LIBGNUTLSCONFIG" != x; then
-	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
-	    ENCRYPTION_REQUIRED="  Encryption Required"
-	    AC_DEFINE(HAVE_SSL)
-	    AC_DEFINE(HAVE_GNUTLS)
-	fi
-    fi
-
-    dnl Check for the OpenSSL library last...
-    if test "x${SSLLIBS}" = "x" -a "x${enable_openssl}" != "xno"; then
-	AC_CHECK_HEADER(openssl/ssl.h,
-	    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,
-		    [SSLFLAGS="-DOPENSSL_DISABLE_OLD_DES_SUPPORT"
-		     SSLLIBS="-lssl $libcrypto"
-		     ENCRYPTION_REQUIRED="  Encryption Required"
-		     AC_DEFINE(HAVE_SSL)
-		     AC_DEFINE(HAVE_LIBSSL)],,
-		    $libcrypto)
-
-		if test "x${SSLLIBS}" != "x"; then
-		    break
-		fi
-	    done
-
-	    LIBS="$SAVELIBS")
-    fi
-fi
-
-if test "x$SSLLIBS" != x; then
-    AC_MSG_RESULT([    Using SSLLIBS="$SSLLIBS"])
-    AC_MSG_RESULT([    Using SSLFLAGS="$SSLFLAGS"])
-fi
-
-AC_SUBST(SSLFLAGS)
-AC_SUBST(SSLLIBS)
-AC_SUBST(ENCRYPTION_REQUIRED)
-
-EXPORT_SSLLIBS="$SSLLIBS"
-AC_SUBST(EXPORT_SSLLIBS)
-
-
-dnl
-dnl End of "$Id: cups-ssl.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cups-threads.m4

@@ -1,54 +0,0 @@
-dnl
-dnl "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $"
-dnl
-dnl   Threading stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2007 by Apple Inc.
-dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
-dnl
-
-AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
-
-have_pthread=no
-PTHREAD_FLAGS=""
-
-if test "x$enable_threads" != xno; then
-	AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-		dnl Check various threading options for the platforms we support
-		for flag in -lpthreads -lpthread -pthread; do
-        		AC_MSG_CHECKING([for pthread_create using $flag])
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		AC_TRY_LINK([#include <pthread.h>],
-				[pthread_create(0, 0, 0, 0);],
-        			have_pthread=yes,
-				LIBS="$SAVELIBS")
-        		AC_MSG_RESULT([$have_pthread])
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
-				break
-			fi
-		done
-	fi
-fi
-
-AC_SUBST(PTHREAD_FLAGS)
-
-dnl
-dnl End of "$Id: cups-threads.m4 6649 2007-07-11 21:46:42Z mike $".
-dnl

config-scripts/cxx.m4

@@ -0,0 +1,26 @@
+#
+# "$Id$"
+#
+# Common C++ compiler stuff for autoconf...
+#
+
+CXXFLAGS="${CXXFLAGS:=}"
+
+if test x$enable_debug = xyes; then
+	CXXFLAGS="-g $CXXFLAGS"
+fi
+
+AC_PROG_CXX
+
+dnl Add -Wall for GCC...
+if test -n "$GCC"; then
+	dnl Extended warnings...
+	CXXFLAGS="-Wshadow -Wconversion -Winline $CXXFLAGS"
+	dnl Standard warnings...
+	CXXFLAGS="-Wall -Wunused -Wno-char-subscripts -Wno-format-y2k $CXXFLAGS"
+fi
+
+
+#
+# End of "$Id$".
+#