From afad2da22d1e301c13472e365a58a5179acb9429 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 14 Feb 2018 17:10:06 -0500 Subject: [PATCH] Update ippfind to support -N/--literal-name. Update man pages. --- doc/help/man-backend.html | 2 +- doc/help/man-cancel.html | 2 +- doc/help/man-classes.conf.html | 2 +- doc/help/man-client.conf.html | 2 +- doc/help/man-cups-config.html | 2 +- doc/help/man-cups-files.conf.html | 2 +- doc/help/man-cups-lpd.html | 2 +- doc/help/man-cups-snmp.conf.html | 2 +- doc/help/man-cups-snmp.html | 2 +- doc/help/man-cups.html | 2 +- doc/help/man-cupsaccept.html | 2 +- doc/help/man-cupsaddsmb.html | 2 +- doc/help/man-cupsctl.html | 2 +- doc/help/man-cupsd-helper.html | 2 +- doc/help/man-cupsd-logs.html | 2 +- doc/help/man-cupsd.conf.html | 2 +- doc/help/man-cupsd.html | 2 +- doc/help/man-cupsenable.html | 2 +- doc/help/man-cupsfilter.html | 2 +- doc/help/man-cupstestdsc.html | 2 +- doc/help/man-cupstestppd.html | 2 +- doc/help/man-filter.html | 2 +- doc/help/man-ippfind.html | 5 +++- doc/help/man-ipptool.html | 2 +- doc/help/man-ipptoolfile.html | 2 +- doc/help/man-lp.html | 2 +- doc/help/man-lpadmin.html | 2 +- doc/help/man-lpc.html | 2 +- doc/help/man-lpinfo.html | 2 +- doc/help/man-lpmove.html | 2 +- doc/help/man-lpoptions.html | 2 +- doc/help/man-lpq.html | 2 +- doc/help/man-lpr.html | 2 +- doc/help/man-lprm.html | 2 +- doc/help/man-lpstat.html | 2 +- doc/help/man-mailto.conf.html | 2 +- doc/help/man-mime.convs.html | 2 +- doc/help/man-mime.types.html | 2 +- doc/help/man-notifier.html | 2 +- doc/help/man-ppdc.html | 2 +- doc/help/man-ppdcfile.html | 2 +- doc/help/man-ppdhtml.html | 2 +- doc/help/man-ppdi.html | 2 +- doc/help/man-ppdmerge.html | 2 +- doc/help/man-ppdpo.html | 2 +- doc/help/man-printers.conf.html | 2 +- doc/help/man-subscriptions.conf.html | 2 +- man/ippfind.man | 17 +++++++++--- test/ippfind.c | 41 ++++++++++++++++++++++++---- 49 files changed, 98 insertions(+), 57 deletions(-) diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html index ff1d7d092..c2c75ae91 100644 --- a/doc/help/man-backend.html +++ b/doc/help/man-backend.html @@ -173,7 +173,7 @@ for more information.
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html index 42a9962ce..8048ce9d3 100644 --- a/doc/help/man-cancel.html +++ b/doc/help/man-cancel.html @@ -83,7 +83,7 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the - lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html index 6eb1f6e8c..d3be116c3 100644 --- a/doc/help/man-classes.conf.html +++ b/doc/help/man-classes.conf.html @@ -24,7 +24,7 @@ The name, location, and format of this file are an implementation detail that wi subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index 85d9d8d4f..879213735 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -82,7 +82,7 @@ On Linux and other systems using GNU TLS, the /etc/cups/ssl/site.crl file default(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html index bfb11f1ed..821ade723 100644 --- a/doc/help/man-cups-config.html +++ b/doc/help/man-cups-config.html @@ -94,7 +94,7 @@ Compile a simple one-file CUPS filter: cups(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 6dd442ef4..131c33f01 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -196,7 +196,7 @@ On macOS the Font Book application manages system-installed fonts. subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html index e7b4fb9cf..97ad2d34d 100644 --- a/doc/help/man-cups-lpd.html +++ b/doc/help/man-cups-lpd.html @@ -108,7 +108,7 @@ service using the corresponding control program. CUPS Online Help (http://localhost:631/help), RFC 2569

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html index fbfb575a7..7ff33532f 100644 --- a/doc/help/man-cups-snmp.conf.html +++ b/doc/help/man-cups-snmp.conf.html @@ -49,7 +49,7 @@ The default is 120 seconds (2 minutes). cups-snmp(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html index 546014726..debbaf92c 100644 --- a/doc/help/man-cups-snmp.html +++ b/doc/help/man-cups-snmp.html @@ -48,7 +48,7 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni lpinfo(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html index e1aac4bf1..458980b8e 100644 --- a/doc/help/man-cups.html +++ b/doc/help/man-cups.html @@ -113,7 +113,7 @@ CUPS Online Help (http://localhost:631/help CUPS Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html index 5f8dac2e4..89b9aec82 100644 --- a/doc/help/man-cupsaccept.html +++ b/doc/help/man-cupsaccept.html @@ -78,7 +78,7 @@ Also, printer and class names are not case-sensitive.
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html index 14c0e0130..9d771c1d5 100644 --- a/doc/help/man-cupsaddsmb.html +++ b/doc/help/man-cupsaddsmb.html @@ -115,7 +115,7 @@ This is useful for debugging SAMBA configuration problems. smb.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html index ada5b67cf..fab73129c 100644 --- a/doc/help/man-cupsctl.html +++ b/doc/help/man-cupsctl.html @@ -88,7 +88,7 @@ You cannot set the Listen or Port directives using cupsctl.
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html index 9384c729b..afb16cc49 100644 --- a/doc/help/man-cupsd-helper.html +++ b/doc/help/man-cupsd-helper.html @@ -78,7 +78,7 @@ archives to further reduce their size. ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html index e2bf38802..e90dd405b 100644 --- a/doc/help/man-cupsd-logs.html +++ b/doc/help/man-cupsd-logs.html @@ -178,7 +178,7 @@ The format of this field is identical to the data-time field in the access_lo cups-files.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index f4e744833..77428bdb6 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -616,7 +616,7 @@ Require authentication for accesses from outside the 10. network: subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html index e10961b01..90cc08374 100644 --- a/doc/help/man-cupsd.html +++ b/doc/help/man-cupsd.html @@ -117,7 +117,7 @@ in the foreground with a test configuration file called systemd(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html index 405f214e2..4511b246e 100644 --- a/doc/help/man-cupsenable.html +++ b/doc/help/man-cupsenable.html @@ -86,7 +86,7 @@ This differs from the System V versions which require the root user to execute t lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html index 11501c903..cf61739b5 100644 --- a/doc/help/man-cupsfilter.html +++ b/doc/help/man-cupsfilter.html @@ -120,7 +120,7 @@ The following command will generate a PDF preview of job 42 for a printer named mime.types(7), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupstestdsc.html b/doc/help/man-cupstestdsc.html index 09fef0319..a69caed6a 100644 --- a/doc/help/man-cupstestdsc.html +++ b/doc/help/man-cupstestdsc.html @@ -38,7 +38,7 @@ CUPS Online Help (http://localhost:631/help Adobe PostScript Language Document Structuring Conventions Specification, Version 3.0.

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html index 3a1f60f35..7287079b4 100644 --- a/doc/help/man-cupstestppd.html +++ b/doc/help/man-cupstestppd.html @@ -121,7 +121,7 @@ The next command tests all PPD files under the current directory and print detai CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3.

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html index 36e076569..229e29eb3 100644 --- a/doc/help/man-filter.html +++ b/doc/help/man-filter.html @@ -180,7 +180,7 @@ program to use the appropriate filters to do the conversions you need.
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html index 41445fefc..2e2ebb1e9 100644 --- a/doc/help/man-ippfind.html +++ b/doc/help/man-ippfind.html @@ -70,6 +70,9 @@ The following expressions are supported: The result is true if the URI is accessible, false otherwise.
--local
True if the service is local to this computer. +
-N name +
--literal-name name +
True if the service instance name matches the given name.
-n regex
--name regex
True if the service instance name matches the given regular expression. @@ -198,7 +201,7 @@ Similarly, to send a PostScript test page to every PostScript printer, run:

See Also

ipptool(1)

Copyright

-Copyright © 2013-2015 by Apple Inc. +Copyright © 2013-2018 by Apple Inc. diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html index fbcb92d21..a19d1b202 100644 --- a/doc/help/man-ipptool.html +++ b/doc/help/man-ipptool.html @@ -225,7 +225,7 @@ IANA IPP Registry (http://www.pwg.org/ipp) RFC 8011 (http://tools.ietf.org/html/rfc8011),

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html index c426af7d8..8f2e65177 100644 --- a/doc/help/man-ipptoolfile.html +++ b/doc/help/man-ipptoolfile.html @@ -532,7 +532,7 @@ IANA IPP Registry ( PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 8011 (http://tools.ietf.org/html/rfc8011)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html index b2603a22e..3c5bb5dd1 100644 --- a/doc/help/man-lp.html +++ b/doc/help/man-lp.html @@ -222,7 +222,7 @@ Print a presentation document 2-up to a printer called "foo": lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index ae740b952..3b04c8768 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -181,7 +181,7 @@ Create an IPP Everywhere print queue: lpoptions(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html index 9e40388bc..cddf8c447 100644 --- a/doc/help/man-lpc.html +++ b/doc/help/man-lpc.html @@ -48,7 +48,7 @@ command or another CUPS-compatible client with that functionality. lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html index a46758fc8..8ed50e16c 100644 --- a/doc/help/man-lpinfo.html +++ b/doc/help/man-lpinfo.html @@ -109,7 +109,7 @@ List drivers matching "HP LaserJet": lpadmin(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html index e9bf4fcc4..228afb97d 100644 --- a/doc/help/man-lpmove.html +++ b/doc/help/man-lpmove.html @@ -69,7 +69,7 @@ Move all jobs from "oldprinter" to "newprinter":
CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html index e4eaf714e..d12221dba 100644 --- a/doc/help/man-lpoptions.html +++ b/doc/help/man-lpoptions.html @@ -119,7 +119,7 @@ The lpoptions command is unique to CUPS. lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html index c38b226d4..ecba7ee4c 100644 --- a/doc/help/man-lpq.html +++ b/doc/help/man-lpq.html @@ -55,7 +55,7 @@ Jobs queued on the default destination will be shown if no printer or class is s lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html index 7c7bf2763..986ef33e9 100644 --- a/doc/help/man-lpr.html +++ b/doc/help/man-lpr.html @@ -179,7 +179,7 @@ Print a presentation document 2-up to a printer called "foo": lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html index 78cdb4ff6..25f801749 100644 --- a/doc/help/man-lprm.html +++ b/doc/help/man-lprm.html @@ -76,7 +76,7 @@ Cancel all jobs: lpstat(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html index 106b9f598..876de1f2d 100644 --- a/doc/help/man-lpstat.html +++ b/doc/help/man-lpstat.html @@ -127,7 +127,7 @@ Also, printer and class names are not case-sensitive. lprm(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html index c13da985e..ddfb2753e 100644 --- a/doc/help/man-mailto.conf.html +++ b/doc/help/man-mailto.conf.html @@ -36,7 +36,7 @@ If multiple lines are present, only the last one is used. cupsd(8), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html index 772262c11..2228aaccb 100644 --- a/doc/help/man-mime.convs.html +++ b/doc/help/man-mime.convs.html @@ -49,7 +49,7 @@ Define a filter that converts PostScript documents to CUPS Raster format: mime.types(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html index 7f092ce2f..290dfa7b0 100644 --- a/doc/help/man-mime.types.html +++ b/doc/help/man-mime.types.html @@ -91,7 +91,7 @@ Define two MIME media types for raster data, with one being a subset with higher mime.convs(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html index 3130afbd6..08353d032 100644 --- a/doc/help/man-notifier.html +++ b/doc/help/man-notifier.html @@ -31,7 +31,7 @@ Notifiers inherit the environment and can use the logging mechanism documented i filter(7), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html index 7fdd58005..725574858 100644 --- a/doc/help/man-ppdc.html +++ b/doc/help/man-ppdc.html @@ -85,7 +85,7 @@ The default is to use the line feed character alone. ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html index 08067733f..f6ddef6b1 100644 --- a/doc/help/man-ppdcfile.html +++ b/doc/help/man-ppdcfile.html @@ -89,7 +89,7 @@ This man page provides a quick reference to the supported keywords and should be ppdpo(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html index 5ce154941..aa76ff7b2 100644 --- a/doc/help/man-ppdhtml.html +++ b/doc/help/man-ppdhtml.html @@ -39,7 +39,7 @@ Multiple -I options can be supplied to add additional directories. ppdpo(1), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html index dd8cefc71..0c83f630e 100644 --- a/doc/help/man-ppdi.html +++ b/doc/help/man-ppdi.html @@ -46,7 +46,7 @@ If no source file is specified, the filename ppdi.drv is used. ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html index d20e0ed39..e88435c40 100644 --- a/doc/help/man-ppdmerge.html +++ b/doc/help/man-ppdmerge.html @@ -43,7 +43,7 @@ Merging of different device PPDs will yield unpredictable results. ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html index 448e7337c..034563775 100644 --- a/doc/help/man-ppdpo.html +++ b/doc/help/man-ppdpo.html @@ -45,7 +45,7 @@ The supported extensions are .po or .po.gz for GNU gettext format ppdcfile(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html index 8f1bf0582..7b60a8cbe 100644 --- a/doc/help/man-printers.conf.html +++ b/doc/help/man-printers.conf.html @@ -24,7 +24,7 @@ The name, location, and format of this file are an implementation detail that wi subscriptions.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html index bb0555fd5..ea4af7c55 100644 --- a/doc/help/man-subscriptions.conf.html +++ b/doc/help/man-subscriptions.conf.html @@ -24,7 +24,7 @@ The name, location, and format of this file are an implementation detail that wi printers.conf(5), CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright © 2007-2017 by Apple Inc. +Copyright © 2007-2018 by Apple Inc. diff --git a/man/ippfind.man b/man/ippfind.man index 737e43593..eee35489a 100644 --- a/man/ippfind.man +++ b/man/ippfind.man @@ -1,11 +1,15 @@ .\" -.\" ippfind man page for CUPS. +.\" ippfind man page. .\" -.\" Copyright 2013-2014 by Apple Inc. +.\" Copyright © 2013-2018 by Apple Inc. .\" -.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information. +.\" 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/". .\" -.TH ippfind 1 "CUPS" "11 June 2014" "Apple Inc." +.TH ippfind 1 "ippsample" "14 February 2018" "Apple Inc." .SH NAME ippfind \- find internet printing protocol printers .SH SYNOPSIS @@ -80,6 +84,11 @@ The result is true if the URI is accessible, false otherwise. .B \-\-local True if the service is local to this computer. .TP 5 +\fB\-N \fIname\fR +.TP 5 +\fB\-\-literal\-name \fIname\fR +True if the service instance name matches the given name. +.TP 5 \fB\-n \fIregex\fR .TP 5 \fB\-\-name \fIregex\fR diff --git a/test/ippfind.c b/test/ippfind.c index ba8141473..c7e8765d0 100644 --- a/test/ippfind.c +++ b/test/ippfind.c @@ -3,7 +3,7 @@ * commands such as IPP and Bonjour conformance tests. This tool is * inspired by the UNIX "find" command, thus its name. * - * Copyright 2008-2017 by Apple Inc. + * Copyright © 2008-2018 by Apple Inc. * * Licensed under Apache License v2.0. See the file "LICENSE" for more * information. @@ -64,6 +64,7 @@ typedef enum ippfind_op_e /* Operations for expressions */ IPPFIND_OP_IS_REMOTE, /* Is a remote service */ IPPFIND_OP_DOMAIN_REGEX, /* Domain matches regular expression */ IPPFIND_OP_NAME_REGEX, /* Name matches regular expression */ + IPPFIND_OP_NAME_LITERAL, /* Name matches literal string */ IPPFIND_OP_HOST_REGEX, /* Hostname matches regular expression */ IPPFIND_OP_PORT_RANGE, /* Port matches range */ IPPFIND_OP_PATH_REGEX, /* Path matches regular expression */ @@ -88,7 +89,7 @@ typedef struct ippfind_expr_s /* Expression */ *child; /* Child expressions */ ippfind_op_t op; /* Operation code (see above) */ int invert; /* Invert the result */ - char *key; /* TXT record key */ + char *name; /* TXT record key or literal name */ regex_t re; /* Regular expression for matching */ int range[2]; /* Port number range */ int num_args; /* Number of arguments for exec */ @@ -269,6 +270,7 @@ main(int argc, /* I - Number of command-line args */ "IS_REMOTE", "DOMAIN_REGEX", "NAME_REGEX", + "NAME_LITERAL", "HOST_REGEX", "PORT_RANGE", "PATH_REGEX", @@ -414,6 +416,18 @@ main(int argc, /* I - Number of command-line args */ NULL)) == NULL) return (IPPFIND_EXIT_MEMORY); } + else if (!strcmp(argv[i], "--literal-name")) + { + i ++; + if (i >= argc) + { + _cupsLangPrintf(stderr, _("ippfind: Missing name after %s."), "--literal-name"); + show_usage(); + } + + if ((temp = new_expr(IPPFIND_OP_NAME_LITERAL, invert, argv[i], NULL, NULL)) == NULL) + return (IPPFIND_EXIT_MEMORY); + } else if (!strcmp(argv[i], "--name")) { i ++; @@ -719,6 +733,18 @@ main(int argc, /* I - Number of command-line args */ address_family = AF_INET6; break; + case 'N' : /* Literal name */ + i ++; + if (i >= argc) + { + _cupsLangPrintf(stderr, _("ippfind: Missing name after %s."), "-N"); + show_usage(); + } + + if ((temp = new_expr(IPPFIND_OP_NAME_LITERAL, invert, argv[i], NULL, NULL)) == NULL) + return (IPPFIND_EXIT_MEMORY); + break; + case 'P' : i ++; if (i >= argc) @@ -1790,6 +1816,9 @@ eval_expr(ippfind_srv_t *service, /* I - Service */ case IPPFIND_OP_NAME_REGEX : result = !regexec(&(expression->re), service->name, 0, NULL, 0); break; + case IPPFIND_OP_NAME_LITERAL : + result = !_cups_strcasecmp(expression->name, service->name); + break; case IPPFIND_OP_HOST_REGEX : result = !regexec(&(expression->re), service->host, 0, NULL, 0); break; @@ -1801,11 +1830,11 @@ eval_expr(ippfind_srv_t *service, /* I - Service */ result = !regexec(&(expression->re), service->resource, 0, NULL, 0); break; case IPPFIND_OP_TXT_EXISTS : - result = cupsGetOption(expression->key, service->num_txt, + result = cupsGetOption(expression->name, service->num_txt, service->txt) != NULL; break; case IPPFIND_OP_TXT_REGEX : - val = cupsGetOption(expression->key, service->num_txt, + val = cupsGetOption(expression->name, service->num_txt, service->txt); if (val) result = !regexec(&(expression->re), val, 0, NULL, 0); @@ -2433,8 +2462,8 @@ new_expr(ippfind_op_t op, /* I - Operation */ temp->op = op; temp->invert = invert; - if (op == IPPFIND_OP_TXT_EXISTS || op == IPPFIND_OP_TXT_REGEX) - temp->key = (char *)value; + if (op == IPPFIND_OP_TXT_EXISTS || op == IPPFIND_OP_TXT_REGEX || op == IPPFIND_OP_NAME_LITERAL) + temp->name = (char *)value; else if (op == IPPFIND_OP_PORT_RANGE) { /* -- 2.39.2