From: Michael R Sweet Date: Tue, 12 Apr 2016 00:28:30 +0000 (-0400) Subject: Remove all of the Subversion keywords from various source files. X-Git-Tag: v2.2b1~63 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=503b54c9302c8de6207e079a80a89a787eb612ea Remove all of the Subversion keywords from various source files. --- diff --git a/Makedefs.in b/Makedefs.in index 5d261c39d..332a12742 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,6 +1,4 @@ # -# "$Id$" -# # Common makefile definitions for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -261,8 +259,3 @@ USBQUIRKS = @USBQUIRKS@ echo -n Compressing $<... $(RM) $@ gzip -v9 <$< >$@ - - -# -# End of "$Id$" -# diff --git a/Makefile b/Makefile index 272b9a800..bac8ac092 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Top-level Makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -348,8 +346,3 @@ dist: all # .NOTPARALLEL: - - -# -# End of "$Id$". -# diff --git a/backend/Makefile b/backend/Makefile index 639a0d7ae..a4017bf77 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,18 +1,16 @@ # -# "$Id$" +# Backend makefile for CUPS. # -# Backend makefile for CUPS. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 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/". # -# 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. +# This file is subject to the Apple OS-Developed Software exception. # include ../Makedefs @@ -312,8 +310,3 @@ usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c # include Dependencies - - -# -# End of "$Id$". -# diff --git a/backend/backend-private.h b/backend/backend-private.h index 1d211e3ed..04bf51674 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backend support definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -331,8 +329,3 @@ extern int backendWaitLoop(int snmp_fd, http_addr_t *addr, } # endif /* __cplusplus */ #endif /* !_CUPS_BACKEND_PRIVATE_H_ */ - - -/* - * End of "$Id$". - */ diff --git a/backend/dnssd.c b/backend/dnssd.c index b46d8cf5f..20beaae29 100644 --- a/backend/dnssd.c +++ b/backend/dnssd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * DNS-SD discovery backend for CUPS. * * Copyright 2008-2015 by Apple Inc. @@ -1315,8 +1313,3 @@ unquote(char *dst, /* I - Destination buffer */ *dst = '\0'; } - - -/* - * End of "$Id$". - */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 6ffa31af7..c77403b0b 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * IEEE-1284 support functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -473,8 +471,3 @@ backendGetMakeModel( return (0); } - - -/* - * End of "$Id$". - */ diff --git a/backend/lpd.c b/backend/lpd.c index 41f14913e..2b811076b 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Line Printer Daemon backend for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -1313,8 +1311,3 @@ sigterm_handler(int sig) /* I - Signal */ abort_job = 1; } - - -/* - * End of "$Id$". - */ diff --git a/backend/network.c b/backend/network.c index 4560fb033..8beced8d2 100644 --- a/backend/network.c +++ b/backend/network.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Common backend network APIs for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -301,8 +299,3 @@ backendNetworkSideCB( return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); } - - -/* - * End of "$Id$". - */ diff --git a/backend/pseudo b/backend/pseudo index 3a82a522a..fb7facdcc 100644 --- a/backend/pseudo +++ b/backend/pseudo @@ -1,18 +1,16 @@ #!/bin/sh # -# "$Id$" +# Psuedo-backend for CUPS testing purposes. # -# Psuedo-backend for CUPS testing purposes. +# Copyright 2011 by Apple Inc. # -# Copyright 2011 by Apple Inc. +# 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/". # -# 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. +# This file is subject to the Apple OS-Developed Software exception. # if test $# = 0; then @@ -24,7 +22,3 @@ fi cat $6 >/dev/null sleep 5 exit 0 - -# -# End of "$Id$". -# diff --git a/backend/runloop.c b/backend/runloop.c index 2a0ec5f9c..baa346273 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Common run loop APIs for CUPS backends. * * Copyright 2007-2014 by Apple Inc. @@ -525,8 +523,3 @@ backendWaitLoop( return (1); } - - -/* - * End of "$Id$". - */ diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index 129f70026..c26e72a23 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP supplies functions for CUPS. * * Copyright 2008-2015 by Apple Inc. @@ -1096,8 +1094,3 @@ utf16_to_utf8( cupsUTF32ToUTF8(dst, temp, (int)dstsize); } - - -/* - * End of "$Id$". - */ diff --git a/backend/snmp.c b/backend/snmp.c index 876ca6520..e66edc980 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP discovery backend for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1361,8 +1359,3 @@ update_cache(snmp_cache_t *device, /* I - Device */ list_device(device); } - - -/* - * End of "$Id$". - */ diff --git a/backend/socket.c b/backend/socket.c index d7f98d9b0..e51582394 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * AppSocket backend for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -514,8 +512,3 @@ wait_bc(int device_fd, /* I - Socket */ else return (-1); } - - -/* - * End of "$Id$". - */ diff --git a/backend/test1284.c b/backend/test1284.c index 49bef87ee..85ac8b5b3 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,22 +1,16 @@ /* - * "$Id$" + * IEEE-1284 support functions test program for CUPS. * - * IEEE-1284 support functions test program for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 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/". * - * 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. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -77,8 +71,3 @@ main(int argc, /* I - Number of command-line args */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/backend/testbackend.c b/backend/testbackend.c index 046fc3e30..969083abf 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backend test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -677,8 +675,3 @@ walk_cb(const char *oid, /* I - OID */ printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, temp); } - - -/* - * End of "$Id$". - */ diff --git a/backend/testsupplies.c b/backend/testsupplies.c index 6cbdf8091..f5414847e 100644 --- a/backend/testsupplies.c +++ b/backend/testsupplies.c @@ -1,21 +1,15 @@ /* - * "$Id$" + * SNMP supplies test program for CUPS. * - * SNMP supplies test program for CUPS. + * Copyright 2008-2011 by Apple Inc. * - * Copyright 2008-2011 by Apple Inc. + * 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/". * - * 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() - Show the supplies state of a printer. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -76,8 +70,3 @@ main(int argc, /* I - Number of command-line args */ sleep(5); } } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 17d62902b..e39c83740 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Copyright 2005-2015 Apple Inc. All rights reserved. * * IMPORTANT: This Apple software is supplied to you by Apple Computer, @@ -2535,8 +2533,3 @@ log_usb_class_driver(int is_64bit) /* I - Is the USB class driver 64-bit? */ asl_free(aslm); } } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index c89727e51..c48c6ecb5 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * LIBUSB interface code for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -2019,9 +2017,3 @@ soft_reset_printer( return (errcode); } - - -/* - * End of "$Id$". - */ - diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 870cbfd68..41a56062a 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * USB port backend for CUPS. * * This file is included from "usb.c" when compiled on UNIX/Linux. @@ -600,8 +598,3 @@ side_cb(int print_fd, /* I - Print file */ return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb.c b/backend/usb.c index ee8c1f4ed..a3b6fba09 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,24 +1,16 @@ /* - * "$Id$" + * USB printer backend for CUPS. * - * USB port backend for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 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/". * - * 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. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -257,8 +249,3 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ return (status); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/Makefile b/berkeley/Makefile index 991481ac0..688efedb0 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Berkeley commands makefile for CUPS. # -# Berkeley commands makefile for CUPS. +# Copyright 2007-2012 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2012 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/". +# 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 @@ -161,8 +159,3 @@ lprm: lprm.o ../cups/$(LIBCUPS) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/berkeley/lpc.c b/berkeley/lpc.c index b2e2e4130..93e029fa7 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpc" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -435,8 +433,3 @@ show_status(http_t *http, /* I - HTTP connection to server */ ippDelete(response); } } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 323870686..592a83665 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpq" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -638,8 +636,3 @@ usage(void) "[-l] [+interval]")); exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 4bda358d5..eb58c8bd9 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpr" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -429,8 +427,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index e2d03e359..981b94b55 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * "lprm" command for CUPS. * - * "lprm" command for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 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. + * 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/". */ /* @@ -109,7 +103,7 @@ main(int argc, /* I - Number of command-line arguments */ cupsSetUser(argv[i]); } break; - + case 'h' : /* Connect to host */ if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); @@ -210,8 +204,3 @@ main(int argc, /* I - Number of command-line arguments */ return (1); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index f1f0a4302..eb136728a 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # CGI makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -350,8 +348,3 @@ testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index e3123986e..c44a42706 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Administration CGI for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -4274,8 +4272,3 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ else return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 1f9690273..3bae75046 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Private CGI definitions for CUPS. * - * Private CGI definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 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/". + * 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/". */ /* @@ -29,8 +27,3 @@ */ #define CUPS_PAGE_MAX 100 /* Maximum items per page */ - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 61eb7fc75..9604f97a2 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * CGI support library definitions for CUPS. * - * CGI support library definitions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 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/". + * 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_ @@ -113,7 +111,3 @@ extern const char *cgiText(const char *message); # endif /* __cplusplus */ #endif /* !_CUPS_CGI_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index 2685e66a3..7c4ac9d25 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Class status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -543,8 +541,3 @@ show_class(http_t *http, /* I - Connection to server */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 42b4ab910..60cda8754 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Online help index routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1303,8 +1301,3 @@ help_sort_words(help_word_t *w1, /* I - Second word */ return (_cups_strcasecmp(w1->text, w2->text)); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 41d8d93db..5fb1ac1f5 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Online help index definitions for CUPS. * - * Online help index definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2011 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/". + * 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_ @@ -81,7 +79,3 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, # endif /* __cplusplus */ #endif /* !_CUPS_HELP_INDEX_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help.c b/cgi-bin/help.c index 215c98bc4..314be87e8 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * Online help CGI for CUPS. * - * Online help CGI for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 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. + * 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/". */ /* @@ -390,8 +384,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index 9db5438eb..e10e2d6a6 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,26 +1,14 @@ /* - * "$Id$" + * HTML support functions for CUPS. * - * HTML support functions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 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. - * cgiEndMultipart() - End the delivery of a multipart web page. - * cgiFormEncode() - Encode a string as a form variable. - * cgiStartHTML() - Start a HTML page. - * cgiStartMultipart() - Start a multipart delivery of a web page. - * cgiSupportsMultipart() - Does the browser support multi-part documents? - * cgi_null_passwd() - Return a NULL password for authentication. + * 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/". */ /* @@ -232,8 +220,3 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 4b43e9cc0..3e2f68c59 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI <-> IPP variable routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1547,8 +1545,3 @@ cgiText(const char *message) /* I - Message */ return (_cupsLangString(language, message)); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index 35f913ca3..a0d7c4b22 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Job status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -201,8 +199,3 @@ do_job_op(http_t *http, /* I - HTTP connection */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 4aee5d9a4..97e130fc6 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -1,30 +1,18 @@ /* - * "$Id$" + * Xcode documentation set generator. * - * Xcode documentation set generator. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2012 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/". + * 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: * * makedocset directory *.tokens - * - * Contents: - * - * main() - Test the help index code. - * compare_html() - Compare the titles of two HTML files. - * compare_sections() - Compare the names of two help sections. - * compare_sections_files() - Compare the number of files and section names. - * write_index() - Write an index file for the CUPS help. - * write_info() - Write the Info.plist file. - * write_nodes() - Write the Nodes.xml file. */ /* @@ -479,8 +467,3 @@ write_nodes(const char *path, /* I - File to write */ cupsFileClose(fp); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index c713c68f4..7d2d5d6be 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -563,8 +561,3 @@ show_printer(http_t *http, /* I - Connection to server */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index b475d9600..95efb3632 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Search routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -368,8 +366,3 @@ cgiFreeSearch(void *search) /* I - Search context */ { regfree((regex_t *)search); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index 532544174..c7d2144f8 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI template function. * * Copyright 2007-2015 by Apple Inc. @@ -683,8 +681,3 @@ cgi_puturi(const char *s, /* I - String to output */ s ++; } } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index ca0158298..fe58bab8a 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -62,8 +60,3 @@ main(void) return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index ce1b94b01..1fbe9063b 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * Help index test program for CUPS. * - * Help index test program for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2011 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... + * 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/". */ /* @@ -106,8 +99,3 @@ list_nodes(const char *title, /* I - Title string */ printf(" (%d words)\n", cupsArrayCount(node->words)); } } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 02c017365..046af47d9 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * CGI template test program for CUPS. * - * CGI template test program for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 2006 by Easy Software Products. * - * Copyright 2007-2011 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. + * 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/". */ /* @@ -96,8 +90,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 3935508fc..6d02e1079 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI form variable and array functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1294,8 +1292,3 @@ cgi_unlink_file(void) form_file = NULL; } } - - -/* - * End of "$Id$". - */ diff --git a/conf/Makefile b/conf/Makefile index c6ff49c0a..bc1f3f944 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Configuration file makefile for CUPS. # -# Configuration file makefile for CUPS. +# Copyright 2007-2015 by Apple Inc. +# Copyright 1993-2006 by Easy Software Products. # -# Copyright 2007-2015 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/". +# 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 @@ -136,8 +134,3 @@ uninstall: $(RM) $(BUILDROOT)$(PAMDIR)/cups; \ $(RMDIR) $(BUILDROOT)$(PAMDIR); \ fi - - -# -# End of "$Id$". -# diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 0b583cd17..8c2e95a6e 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Common configuration stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -472,7 +470,3 @@ case "$COMPONENTS" in esac AC_SUBST(BUILDDIRS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 3c2076aa1..4e71f0c3c 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Compiler stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -244,7 +242,3 @@ case $uname in OPTIM="$OPTIM -D_GNU_SOURCE" ;; esac - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 599825ca7..7c2080a04 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Default cupsd configuration settings for CUPS. dnl -dnl Default cupsd configuration settings for CUPS. +dnl Copyright 2007-2015 by Apple Inc. +dnl Copyright 2006-2007 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2015 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 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... @@ -407,7 +405,3 @@ esac AC_SUBST(CUPS_WEBIF) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 40a17038a..a9dc67b50 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Directory stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -303,7 +301,3 @@ AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state dire esac]) AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") AC_SUBST(CUPS_STATEDIR) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 3b5bee801..86a8de088 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,15 +1,13 @@ dnl -dnl "$Id$" +dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl -dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. +dnl Copyright 2007-2015 by Apple Inc. dnl -dnl Copyright 2007-2015 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 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(avahi, [ --disable-avahi disable DNS Service Discovery support using Avahi]) @@ -80,7 +78,3 @@ AC_SUBST(DNSSDLIBS) AC_SUBST(DNSSD_BACKEND) AC_SUBST(IPPFIND_BIN) AC_SUBST(IPPFIND_MAN) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 531308d86..548898495 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -1,19 +1,17 @@ dnl -dnl "$Id$" +dnl GSSAPI/Kerberos library detection for CUPS. dnl -dnl GSSAPI/Kerberos library detection for CUPS. +dnl Copyright 2007-2013 by Apple Inc. +dnl Copyright 2006-2007 by Easy Software Products. dnl -dnl Copyright 2007-2013 by Apple Inc. -dnl Copyright 2006-2007 by Easy Software Products. +dnl This file contains Kerberos support code, copyright 2006 by +dnl Jelmer Vernooij. 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 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, [ --disable-gssapi disable GSSAPI support]) @@ -127,7 +125,3 @@ fi AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME") - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index 6ef4b81e1..1f0c5388c 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Large file support stuff for CUPS. dnl -dnl Large file support stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 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 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... @@ -46,7 +44,3 @@ if test $ac_cv_c_long_long = yes; then fi AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 5fc0d6e3c..805e806d3 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Libtool stuff for CUPS. dnl -dnl Libtool stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 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 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 @@ -33,7 +31,3 @@ if test x$LIBTOOL != x; then LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" DSO="\$(CC)" fi - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 08aad8459..4224addef 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Manpage stuff for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. @@ -76,7 +74,3 @@ AC_SUBST(MAN5EXT) AC_SUBST(MAN7EXT) AC_SUBST(MAN8EXT) AC_SUBST(MAN8DIR) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 636518fb6..1c2604a73 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Networking stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -70,7 +68,3 @@ fi AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET) AC_SUBST(CUPS_LISTEN_DOMAINSOCKET) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 700a284d0..549b27a21 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Operating system stuff for CUPS. dnl -dnl Operating system stuff for CUPS. +dnl Copyright 2007-2012 by Apple Inc. +dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2012 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 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... @@ -33,7 +31,3 @@ case "$uname" in uname="Linux" ;; esac - -dnl -dnl "$Id$" -dnl diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 0d7d9adb8..de9c476be 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,7 +1,5 @@ dnl -dnl "$Id$" -dnl -dnl PAM stuff for CUPS. +dnl PAM stuff for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. @@ -91,7 +89,3 @@ AC_SUBST(PAMFILE) AC_SUBST(PAMLIBS) AC_SUBST(PAMMOD) AC_SUBST(PAMMODAUTH) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 901068c27..96361969c 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -1,22 +1,16 @@ dnl -dnl "$Id$" +dnl Select/poll stuff for CUPS. dnl -dnl Select/poll stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 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 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 diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index af97a94dc..10b454185 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Scripting configuration stuff for CUPS. dnl -dnl Scripting configuration stuff for CUPS. +dnl Copyright 2007-2010 by Apple Inc. +dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2010 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 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? @@ -83,7 +81,3 @@ AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON") if test "x$CUPS_PYTHON" != x; then AC_DEFINE(HAVE_PYTHON) fi - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 23b1adfb7..33bb30f53 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Shared library support for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. @@ -156,7 +154,3 @@ fi AC_SUBST(DSOLIBS) AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index d48681ea1..d9d858109 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl TLS stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -106,7 +104,3 @@ AC_SUBST(SSLLIBS) EXPORT_SSLLIBS="$SSLLIBS" AC_SUBST(EXPORT_SSLLIBS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 223cf2bde..bbd6b891d 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Launch-on-demand/startup stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -185,8 +183,3 @@ if test "x$xinetd" = x; then elif test "x$xinetd" != xno; then XINETD="$xinetd" fi - - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index bd5c69867..017b91008 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Threading stuff for CUPS. dnl -dnl Threading stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 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 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, [ --disable-threads disable multi-threading support]) @@ -48,7 +46,3 @@ if test "x$enable_threads" != xno; then fi AC_SUBST(PTHREAD_FLAGS) - -dnl -dnl End of "$Id$". -dnl diff --git a/configure b/configure index f1672943a..e2e61108f 100755 --- a/configure +++ b/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2svn. +# Generated by GNU Autoconf 2.68 for CUPS 2.2svn. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -488,10 +452,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -526,16 +486,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1380,6 +1360,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1706,9 +1688,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.2svn -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1859,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2170,7 +2152,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.2svn, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2540,7 +2522,6 @@ case "$uname" in esac - ac_config_headers="$ac_config_headers config.h" @@ -2604,7 +2585,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2652,7 +2633,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2696,7 +2677,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3140,7 +3121,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3390,7 +3372,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3434,7 +3416,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3636,7 +3618,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3676,7 +3658,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3729,7 +3711,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3769,7 +3751,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3809,7 +3791,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3849,7 +3831,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3889,7 +3871,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3929,7 +3911,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3969,7 +3951,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4009,7 +3991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4049,7 +4031,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4089,7 +4071,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4165,7 +4147,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4208,7 +4190,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4618,7 +4600,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4684,7 +4666,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5955,7 +5937,6 @@ esac - if test "$prefix" = "NONE"; then prefix="/" fi @@ -6350,7 +6331,6 @@ _ACEOF - 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... @@ -6415,7 +6395,6 @@ esac - PICFLAG=1 DSOFLAGS="${DSOFLAGS:=}" @@ -6564,7 +6543,6 @@ fi - # Check whether --enable-libtool_unsupported was given. if test "${enable_libtool_unsupported+set}" = set; then : enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then @@ -6589,7 +6567,6 @@ if test x$LIBTOOL != x; then fi - INSTALL_STRIP="" OPTIM="" @@ -6953,7 +6930,6 @@ esac - ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" " #include #include @@ -7598,7 +7574,6 @@ fi - ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" if test "x$ac_cv_func_poll" = xyes; then : $as_echo "#define HAVE_POLL 1" >>confdefs.h @@ -7619,7 +7594,6 @@ fi - # Check whether --enable-gssapi was given. if test "${enable_gssapi+set}" = set; then : enableval=$enable_gssapi; @@ -7649,7 +7623,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7692,7 +7666,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8055,7 +8029,6 @@ _ACEOF - # Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then : enableval=$enable_threads; @@ -8118,7 +8091,6 @@ fi - # Check whether --enable-ssl was given. if test "${enable_ssl+set}" = set; then : enableval=$enable_ssl; @@ -8246,7 +8218,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8289,7 +8261,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8344,7 +8316,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8387,7 +8359,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8483,7 +8455,6 @@ EXPORT_SSLLIBS="$SSLLIBS" - # Check whether --enable-pam was given. if test "${enable_pam+set}" = set; then : enableval=$enable_pam; @@ -8751,7 +8722,6 @@ fi - # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; @@ -8948,8 +8918,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -9010,7 +8978,6 @@ fi - # Check whether --enable-avahi was given. if test "${enable_avahi+set}" = set; then : enableval=$enable_avahi; @@ -9124,7 +9091,6 @@ fi - ONDEMANDFLAGS="" ONDEMANDLIBS="" @@ -9376,8 +9342,6 @@ elif test "x$xinetd" != xno; then fi - - LANGUAGES="`ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`" @@ -9941,7 +9905,6 @@ _ACEOF - # Check whether --with-java was given. if test "${with_java+set}" = set; then : withval=$with_java; CUPS_JAVA="$withval" @@ -9969,7 +9932,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10032,7 +9995,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10095,7 +10058,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHPCGI="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10136,7 +10099,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10204,7 +10167,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10240,7 +10203,6 @@ if test "x$CUPS_PYTHON" != x; then fi - INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" @@ -10673,16 +10635,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10742,16 +10704,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10773,7 +10747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.2svn, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10836,10 +10810,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ CUPS config.status 2.2svn -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10928,7 +10902,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -11569,4 +11543,3 @@ fi chmod +x cups-config - diff --git a/configure.ac b/configure.ac index f55148f46..79aea7920 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Configuration script for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -93,7 +91,3 @@ AC_OUTPUT(Makedefs $LANGFILES) chmod +x cups-config - -dnl -dnl End of "$Id$". -dnl diff --git a/cups-config.in b/cups-config.in index 436800a64..4c69250f5 100755 --- a/cups-config.in +++ b/cups-config.in @@ -1,17 +1,15 @@ #! /bin/sh # -# "$Id$" +# CUPS configuration utility. # -# CUPS configuration utility. +# Copyright 2007-2011 by Apple Inc. +# Copyright 2001-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 2001-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/". +# 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/". # VERSION="@CUPS_VERSION@" @@ -140,7 +138,3 @@ while test $# -gt 0; do shift done - -# -# End of "$Id$". -# diff --git a/cups/Makefile b/cups/Makefile index 473328b51..593113abc 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # API library Makefile for CUPS. # # Copyright 2007-2015 by Apple Inc. @@ -676,8 +674,3 @@ sloc: include Dependencies tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c - - -# -# End of "$Id$". -# diff --git a/cups/adminutil.c b/cups/adminutil.c index 7b487b378..ec660d8cc 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Administration utility API definitions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -2367,8 +2365,3 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name); } - - -/* - * End of "$Id$". - */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 52dfe9260..8c0643143 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Administration utility API definitions for CUPS. * - * Administration utility API definitions for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 2001-2007 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 2001-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/". * - * 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. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_ADMINUTIL_H_ @@ -75,7 +73,3 @@ extern int cupsAdminSetServerSettings(http_t *http, # endif /* __cplusplus */ #endif /* !_CUPS_ADMINUTIL_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/api-array.header b/cups/api-array.header index 4d5acf0d1..557833e58 100644 --- a/cups/api-array.header +++ b/cups/api-array.header @@ -1,6 +1,4 @@ - - Printer Driver API - - - - - - -
- - -

Driver API

- -
- - - - - - - - - - - - - - - - -
Headercups/driver.h
Library-lcupsdriver
See AlsoProgramming: Introduction to CUPS Programming
-

Contents

- - - -

Overview

- -

The driver API provides common dithering, color conversion, and utility -functions for CUPS drivers.

-

Functions

-

cupsCMYKDelete

-

Delete a color separation.

-

-void cupsCMYKDelete (
-    cups_cmyk_t *cmyk
-);

-

Parameters

-
-
cmyk
-
Color separation
-
-

cupsCMYKDoBlack

-

Do a black separation...

-

-void cupsCMYKDoBlack (
-    const cups_cmyk_t *cmyk,
-    const unsigned char *input,
-    short *output,
-    int num_pixels
-);

-

Parameters

-
-
cmyk
-
Color separation
-
input
-
Input grayscale pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsCMYKDoCMYK

-

Do a CMYK separation...

-

-void cupsCMYKDoCMYK (
-    const cups_cmyk_t *cmyk,
-    const unsigned char *input,
-    short *output,
-    int num_pixels
-);

-

Parameters

-
-
cmyk
-
Color separation
-
input
-
Input grayscale pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsCMYKDoGray

-

Do a grayscale separation...

-

-void cupsCMYKDoGray (
-    const cups_cmyk_t *cmyk,
-    const unsigned char *input,
-    short *output,
-    int num_pixels
-);

-

Parameters

-
-
cmyk
-
Color separation
-
input
-
Input grayscale pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsCMYKDoRGB

-

Do an sRGB separation...

-

-void cupsCMYKDoRGB (
-    const cups_cmyk_t *cmyk,
-    const unsigned char *input,
-    short *output,
-    int num_pixels
-);

-

Parameters

-
-
cmyk
-
Color separation
-
input
-
Input grayscale pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsCMYKLoad

-

Load a CMYK color profile from PPD attributes.

-

-cups_cmyk_t *cupsCMYKLoad (
-    ppd_file_t *ppd,
-    const char *colormodel,
-    const char *media,
-    const char *resolution
-);

-

Parameters

-
-
ppd
-
PPD file
-
colormodel
-
ColorModel value
-
media
-
MediaType value
-
resolution
-
Resolution value
-
-

Return Value

-

CMYK color separation

-

cupsCMYKNew

-

Create a new CMYK color separation.

-

-cups_cmyk_t *cupsCMYKNew (
-    int num_channels
-);

-

Parameters

-
-
num_channels
-
Number of color components
-
-

Return Value

-

New CMYK separation or NULL

-

cupsCMYKSetBlack

-

Set the transition range for CMY to black.

-

-void cupsCMYKSetBlack (
-    cups_cmyk_t *cmyk,
-    float lower,
-    float upper
-);

-

Parameters

-
-
cmyk
-
CMYK color separation
-
lower
-
No black ink
-
upper
-
Only black ink
-
-

cupsCMYKSetCurve

-

Set a color transform curve using points.

-

-void cupsCMYKSetCurve (
-    cups_cmyk_t *cmyk,
-    int channel,
-    int num_xypoints,
-    const float *xypoints
-);

-

Parameters

-
-
cmyk
-
CMYK color separation
-
channel
-
Color channel
-
num_xypoints
-
Number of X,Y points
-
xypoints
-
X,Y points
-
-

cupsCMYKSetGamma

-

Set a color transform curve using gamma and density.

-

-void cupsCMYKSetGamma (
-    cups_cmyk_t *cmyk,
-    int channel,
-    float gamval,
-    float density
-);

-

Parameters

-
-
cmyk
-
CMYK color separation
-
channel
-
Ink channel
-
gamval
-
Gamma correction
-
density
-
Maximum density
-
-

cupsCMYKSetInkLimit

-

Set the limit on the amount of ink.

-

-void cupsCMYKSetInkLimit (
-    cups_cmyk_t *cmyk,
-    float limit
-);

-

Parameters

-
-
cmyk
-
CMYK color separation
-
limit
-
Limit of ink
-
-

cupsCMYKSetLtDk

-

Set light/dark ink transforms.

-

-void cupsCMYKSetLtDk (
-    cups_cmyk_t *cmyk,
-    int channel,
-    float light,
-    float dark
-);

-

Parameters

-
-
cmyk
-
CMYK color separation
-
channel
-
Dark ink channel (+1 for light)
-
light
-
Light ink only level
-
dark
-
Dark ink only level
-
-

cupsCheckBytes

-

Check to see if all bytes are zero.

-

-int cupsCheckBytes (
-    const unsigned char *bytes,
-    int length
-);

-

Parameters

-
-
bytes
-
Bytes to check
-
length
-
Number of bytes to check
-
-

Return Value

-

1 if they match

-

cupsCheckValue

-

Check to see if all bytes match the given value.

-

-int cupsCheckValue (
-    const unsigned char *bytes,
-    int length,
-    const unsigned char value
-);

-

Parameters

-
-
bytes
-
Bytes to check
-
length
-
Number of bytes to check
-
value
-
Value to check
-
-

Return Value

-

1 if they match

-

cupsDitherDelete

-

Free a dithering buffer.

-

-void cupsDitherDelete (
-    cups_dither_t *d
-);

-

Parameters

-
-
d
-
Dithering buffer
-
-

Discussion

-

Returns 0 on success, -1 on failure.

-

cupsDitherLine

-

Dither a line of pixels...

-

-void cupsDitherLine (
-    cups_dither_t *d,
-    const cups_lut_t *lut,
-    const short *data,
-    int num_channels,
-    unsigned char *p
-);

-

Parameters

-
-
d
-
Dither data
-
lut
-
Lookup table
-
data
-
Separation data
-
num_channels
-
Number of components
-
p
-
Pixels
-
-

cupsDitherNew

-

Create an error-diffusion dithering buffer.

-

-cups_dither_t *cupsDitherNew (
-    int width
-);

-

Parameters

-
-
width
-
Width of output in pixels
-
-

Return Value

-

New state array

-

cupsFindAttr

-

Find a PPD attribute based on the colormodel, -media, and resolution.

-

-ppd_attr_t *cupsFindAttr (
-    ppd_file_t *ppd,
-    const char *name,
-    const char *colormodel,
-    const char *media,
-    const char *resolution,
-    char *spec,
-    int specsize
-);

-

Parameters

-
-
ppd
-
PPD file
-
name
-
Attribute name
-
colormodel
-
Color model
-
media
-
Media type
-
resolution
-
Resolution
-
spec
-
Final selection string
-
specsize
-
Size of string buffer
-
-

Return Value

-

Matching attribute or NULL

-

cupsLutDelete

-

Free the memory used by a lookup table.

-

-void cupsLutDelete (
-    cups_lut_t *lut
-);

-

Parameters

-
-
lut
-
Lookup table to free
-
-

cupsLutLoad

-

Load a LUT from a PPD file.

-

-cups_lut_t *cupsLutLoad (
-    ppd_file_t *ppd,
-    const char *colormodel,
-    const char *media,
-    const char *resolution,
-    const char *ink
-);

-

Parameters

-
-
ppd
-
PPD file
-
colormodel
-
Color model
-
media
-
Media type
-
resolution
-
Resolution
-
ink
-
Ink name
-
-

Return Value

-

New lookup table

-

cupsLutNew

-

Make a lookup table from a list of pixel values.

-

-cups_lut_t *cupsLutNew (
-    int num_values,
-    const float *values
-);

-

Parameters

-
-
num_values
-
Number of values
-
values
-
Lookup table values
-
-

Return Value

-

New lookup table

-

Discussion

-

Returns a pointer to the lookup table on success, NULL on failure.

-

cupsPackHorizontal

-

Pack pixels horizontally...

-

-void cupsPackHorizontal (
-    const unsigned char *ipixels,
-    unsigned char *obytes,
-    int width,
-    const unsigned char clearto,
-    const int step
-);

-

Parameters

-
-
ipixels
-
Input pixels
-
obytes
-
Output bytes
-
width
-
Number of pixels
-
clearto
-
Initial value of bytes
-
step
-
Step value between pixels
-
-

cupsPackHorizontal2

-

Pack 2-bit pixels horizontally...

-

-void cupsPackHorizontal2 (
-    const unsigned char *ipixels,
-    unsigned char *obytes,
-    int width,
-    const int step
-);

-

Parameters

-
-
ipixels
-
Input pixels
-
obytes
-
Output bytes
-
width
-
Number of pixels
-
step
-
Stepping value
-
-

cupsPackHorizontalBit

-

Pack pixels horizontally by bit...

-

-void cupsPackHorizontalBit (
-    const unsigned char *ipixels,
-    unsigned char *obytes,
-    int width,
-    const unsigned char clearto,
-    const unsigned char bit
-);

-

Parameters

-
-
ipixels
-
Input pixels
-
obytes
-
Output bytes
-
width
-
Number of pixels
-
clearto
-
Initial value of bytes
-
bit
-
Bit to check
-
-

cupsPackVertical

-

Pack pixels vertically...

-

-void cupsPackVertical (
-    const unsigned char *ipixels,
-    unsigned char *obytes,
-    int width,
-    const unsigned char bit,
-    const int step
-);

-

Parameters

-
-
ipixels
-
Input pixels
-
obytes
-
Output bytes
-
width
-
Number of input pixels
-
bit
-
Output bit
-
step
-
Number of bytes between columns
-
-

cupsRGBDelete

-

Delete a color separation.

-

-void cupsRGBDelete (
-    cups_rgb_t *rgbptr
-);

-

Parameters

-
-
rgbptr
-
Color separation
-
-

cupsRGBDoGray

-

Do a grayscale separation...

-

-void cupsRGBDoGray (
-    cups_rgb_t *rgbptr,
-    const unsigned char *input,
-    unsigned char *output,
-    int num_pixels
-);

-

Parameters

-
-
rgbptr
-
Color separation
-
input
-
Input grayscale pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsRGBDoRGB

-

Do a RGB separation...

-

-void cupsRGBDoRGB (
-    cups_rgb_t *rgbptr,
-    const unsigned char *input,
-    unsigned char *output,
-    int num_pixels
-);

-

Parameters

-
-
rgbptr
-
Color separation
-
input
-
Input RGB pixels
-
output
-
Output Device-N pixels
-
num_pixels
-
Number of pixels
-
-

cupsRGBLoad

-

Load a RGB color profile from a PPD file.

-

-cups_rgb_t *cupsRGBLoad (
-    ppd_file_t *ppd,
-    const char *colormodel,
-    const char *media,
-    const char *resolution
-);

-

Parameters

-
-
ppd
-
PPD file
-
colormodel
-
Color model
-
media
-
Media type
-
resolution
-
Resolution
-
-

Return Value

-

New color profile

-

cupsRGBNew

-

Create a new RGB color separation.

-

-cups_rgb_t *cupsRGBNew (
-    int num_samples,
-    cups_sample_t *samples,
-    int cube_size,
-    int num_channels
-);

-

Parameters

-
-
num_samples
-
Number of samples
-
samples
-
Samples
-
cube_size
-
Size of LUT cube
-
num_channels
-
Number of color components
-
-

Return Value

-

New color separation or NULL

-

Data Types

-

cups_cmyk_t

-

Simple CMYK lookup table

-

-typedef struct cups_cmyk_s cups_cmyk_t; -

-

cups_dither_t

-

Dithering State

-

-typedef struct cups_dither_s cups_dither_t; -

-

cups_lut_t

-

Lookup Table for Dithering

-

-typedef struct cups_lut_s cups_lut_t; -

-

cups_rgb_t

-

Color separation lookup table

-

-typedef struct cups_rgb_s cups_rgb_t; -

-

cups_sample_t

-

Color sample point

-

-typedef struct cups_sample_s cups_sample_t; -

-

Structures

-

cups_cmyk_s

-

Simple CMYK lookup table

-

struct cups_cmyk_s {
-    unsigned char black_lut[256];
-    short *channels[CUPS_MAX_CHAN];
-    unsigned char color_lut[256];
-    int ink_limit;
-    int num_channels;
-};

-

Members

-
-
black_lut[256]
-
Black generation LUT
-
channels[CUPS_MAX_CHAN]
-
Lookup tables
-
color_lut[256]
-
Color removal LUT
-
ink_limit
-
Ink limit
-
num_channels
-
Number of components
-
-

cups_dither_s

-

Dithering State

-

struct cups_dither_s {
-    int errors[96];
-    int row;
-    int width;
-};

-

Members

-
-
errors[96]
-
Error values
-
row
-
Current row
-
width
-
Width of buffer
-
-

cups_lut_s

-

Lookup Table for Dithering

-

struct cups_lut_s {
-    int error;
-    short intensity;
-    short pixel;
-};

-

Members

-
-
error
-
Error from desired value
-
intensity
-
Adjusted intensity
-
pixel
-
Output pixel value
-
-

cups_rgb_s

-

Color separation lookup table

-

struct cups_rgb_s {
-    unsigned char black[CUPS_MAX_RGB];
-    int cache_init;
-    unsigned char ****colors;
-    int cube_index[256];
-    int cube_mult[256];
-    int cube_size;
-    int num_channels;
-    unsigned char white[CUPS_MAX_RGB];
-};

-

Members

-
-
black[CUPS_MAX_RGB]
-
Cached black (sRGB = 0,0,0)
-
cache_init
-
Are cached values initialized?
-
colors
-
4-D array of sample values
-
cube_index[256]
-
Index into cube for a given sRGB value
-
cube_mult[256]
-
Multiplier value for a given sRGB value
-
cube_size
-
Size of color cube (2-N) on a side
-
num_channels
-
Number of colors per sample
-
white[CUPS_MAX_RGB]
-
Cached white (sRGB = 255,255,255)
-
-

cups_sample_s

-

Color sample point

-

struct cups_sample_s {
-    unsigned char colors[CUPS_MAX_RGB];
-    unsigned char rgb[3];
-};

-

Members

-
-
colors[CUPS_MAX_RGB]
-
Color values
-
rgb[3]
-
sRGB values
-
-

Variables

-

cups_scmy_lut[256]

-

sRGB gamma lookup table (inverted)

-

extern const unsigned char cups_scmy_lut[256];

-

cups_srgb_lut[256]

-

sRGB gamma lookup table

-

extern const unsigned char cups_srgb_lut[256];

-
- - diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index 309d09daa..a3d517e96 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li {