From: mike Date: Wed, 7 Mar 2001 16:54:21 +0000 (+0000) Subject: Fix for netatalk example in SAMs. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6795c5a9d9f8ef3a8a59c0f121eda6977cd43cc7;p=thirdparty%2Fcups.git Fix for netatalk example in SAMs. Set boolean options to =true or =false. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1616 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/CHANGES.txt b/CHANGES.txt index 0985f85fe9..33bf302c0c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -79,6 +79,8 @@ CHANGES IN CUPS V1.1.7 - The scheduler enforced a 30 second timeout on all clients regardless of the Timeout directive and if a CGI was currently running. + - cupsParseOptions() now sets boolean options to + option=true or option=false. CHANGES IN CUPS V1.1.6-3 diff --git a/cups/options.c b/cups/options.c index 2e16283ac9..5394aacbfd 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c,v 1.19 2001/02/09 16:23:35 mike Exp $" + * "$Id: options.c,v 1.20 2001/03/07 16:54:20 mike Exp $" * * Option routines for the Common UNIX Printing System (CUPS). * @@ -476,7 +476,12 @@ cupsParseOptions(const char *arg, /* I - Argument to parse */ * Start of another option... */ - num_options = cupsAddOption(name, "", num_options, options); + if (strncasecmp(name, "no", 2) == 0) + num_options = cupsAddOption(name + 2, "false", num_options, + options); + else + num_options = cupsAddOption(name, "true", num_options, options); + continue; } @@ -672,5 +677,5 @@ cupsMarkOptions(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: options.c,v 1.19 2001/02/09 16:23:35 mike Exp $". + * End of "$Id: options.c,v 1.20 2001/03/07 16:54:20 mike Exp $". */ diff --git a/doc/sam.shtml b/doc/sam.shtml index d94b82c3ce..3c9657d5c1 100644 --- a/doc/sam.shtml +++ b/doc/sam.shtml @@ -3207,7 +3207,7 @@ would look like: Printer Description:MyPrinter@MyServer:\ :pr=|/usr/bin/lp -d MyPrinter:\ :op=daemon:\ - :pd=/etc/cups/ppd/MyPrinter.ppd + :pd=/etc/cups/ppd/MyPrinter.ppd: