Update ippfind to support -N/--literal-name.

Update man pages.

diff --git a/doc/help/man-backend.html b/doc/help/man-backend.html
index ff1d7d0926e2ffbc2debc14539f5ecf0362d2c4c..c2c75ae91db549c2043912439bd371c652ea1d99 100644 (file)
--- a/doc/help/man-backend.html
+++ b/doc/help/man-backend.html
@@ -173,7 +173,7 @@ for more information.
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cancel.html b/doc/help/man-cancel.html
index 42a9962ce1d03291159e12a6b0a806bd700f79ac..8048ce9d364385ec92f34495c1b2dbc42e3cf1b2 100644 (file)
--- 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 <i>-
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-classes.conf.html b/doc/help/man-classes.conf.html
index 6eb1f6e8c92617a58db389ea5931433d9092ca09..d3be116c3a94b56b623e899a26f856322686d1cf 100644 (file)
--- 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
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index 85d9d8d4fb54853fa7da9d1f114f2fff95a85e6d..879213735a68e7bae1ecdd06a1f40cbdc15c636f 100644 (file)
--- 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 <i>/etc/cups/ssl/site.crl</i> file
 <b>default</b>(1),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-config.html b/doc/help/man-cups-config.html
index bfb11f1ed46ed7c40515fbf5f263d7d63bfc55b9..821ade72311991feb265fe9a9edf06c659887ec6 100644 (file)
--- 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:
 <a href="man-cups.html?TOPIC=Man+Pages"><b>cups</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 6dd442ef4d445644cb6a450fe2e998837aaf21f2..131c33f013b26ee1f327bbb0ab14aea5c757407e 100644 (file)
--- 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.
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-lpd.html b/doc/help/man-cups-lpd.html
index e7b4fb9cf43a0451a9299cc8de724d38c18702ba..97ad2d34d63c12001a701dd874fc94a2d46171d1 100644 (file)
--- 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 (<a href="http://localhost:631/help)">http://localhost:631/help)</a>,
 RFC 2569
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-snmp.conf.html b/doc/help/man-cups-snmp.conf.html
index fbfb575a7cfec4582cf17ed5b5cad14c7ff7f9fa..7ff33532f0e1718083b974ef16282a5140fb0e58 100644 (file)
--- 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).
 <a href="man-cups-snmp.html?TOPIC=Man+Pages"><b>cups-snmp</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups-snmp.html b/doc/help/man-cups-snmp.html
index 54601472634f221e56b0420a7ab54192dd0723a5..debbaf92c0c7fcd900d79bbfcfaedd5248a17ccb 100644 (file)
--- 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
 <a href="man-lpinfo.html?TOPIC=Man+Pages"><b>lpinfo</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cups.html b/doc/help/man-cups.html
index e1aac4bf1fd0779671342533e33c3106d093aa16..458980b8e62f985b60259d25cf38dfd9e0d7cb20 100644 (file)
--- a/doc/help/man-cups.html
+++ b/doc/help/man-cups.html
@@ -113,7 +113,7 @@ CUPS Online Help (<a href="http://localhost:631/help)">http://localhost:631/help
 CUPS Web Site (<a href="http://www.CUPS.org)">http://www.CUPS.org)</a>,
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsaccept.html b/doc/help/man-cupsaccept.html
index 5f8dac2e4b39b3f7ade3ade395164a3056f82456..89b9aec827863971d30d5af53109f18115de7610 100644 (file)
--- a/doc/help/man-cupsaccept.html
+++ b/doc/help/man-cupsaccept.html
@@ -78,7 +78,7 @@ Also, printer and class names are <i>not</i> case-sensitive.
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html
index 14c0e0130e19f9d05d63a7010ff8d6cfbc831961..9d771c1d5485f810eb7aaeb95605c2206b31bde1 100644 (file)
--- a/doc/help/man-cupsaddsmb.html
+++ b/doc/help/man-cupsaddsmb.html
@@ -115,7 +115,7 @@ This is useful for debugging SAMBA configuration problems.
 <b>smb.conf</b>(5),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index ada5b67cf60ecc1c488e9277aca4b8b7ef388f19..fab73129ca0a273ad4413b96996b230c113eabca 100644 (file)
--- 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 <b>cupsctl</b>.
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html
index 9384c729b8819e699dba9f5968a423de1409da4a..afb16cc49507c5d4d564795acfab4e36c9849ec3 100644 (file)
--- a/doc/help/man-cupsd-helper.html
+++ b/doc/help/man-cupsd-helper.html
@@ -78,7 +78,7 @@ archives to further reduce their size.
 <a href="man-ppdcfile.html?TOPIC=Man+Pages"><b>ppdcfile</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsd-logs.html b/doc/help/man-cupsd-logs.html
index e2bf3880295bed6ec61a541d3a92256384bd5282..e90dd405bf35818c7cabc80e61f3c03f076f2aba 100644 (file)
--- 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 <i>access_lo
 <a href="man-cups-files.conf.html?TOPIC=Man+Pages"><b>cups-files.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index f4e744833f06b696f7aa0fb849445f9882e07c72..77428bdb6927fd8e6f8e94793ce5814d10e4d5c5 100644 (file)
--- 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:
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsd.html b/doc/help/man-cupsd.html
index e10961b01173256b14c3303b77517d2f22212fb4..90cc08374c26cbf8a414dee800cb1751b6372a63 100644 (file)
--- 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
 <b>systemd</b>(8),
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html
index 405f214e2a6f45505a533172ad08715a1277caea..4511b246ef4a342421929c27953d461b0a1b7e81 100644 (file)
--- 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
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupsfilter.html b/doc/help/man-cupsfilter.html
index 11501c903ea350bfb85f16fa648a39ab7b74ab03..cf61739b5dfbf9bbe45ffa9c7c5dfc97a42036df 100644 (file)
--- 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
 <a href="man-mime.types.html?TOPIC=Man+Pages"><b>mime.types</b>(7),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupstestdsc.html b/doc/help/man-cupstestdsc.html
index 09fef031900d173878d338d8dd9d1ce9505ad910..a69caed6a0eb606e39dd0d06caf7d69d35a0ae77 100644 (file)
--- a/doc/help/man-cupstestdsc.html
+++ b/doc/help/man-cupstestdsc.html
@@ -38,7 +38,7 @@ CUPS Online Help (<a href="http://localhost:631/help)">http://localhost:631/help
 Adobe PostScript Language Document Structuring Conventions
 Specification, Version 3.0.
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-cupstestppd.html b/doc/help/man-cupstestppd.html
index 3a1f60f35b6806d6ef557221513b8747509773ed..7287079b43d027fb561132354301e7cbb467b7eb 100644 (file)
--- 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 (<a href="http://localhost:631/help)">http://localhost:631/help)</a>,
 Adobe PostScript Printer Description File Format Specification, Version 4.3.
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-filter.html b/doc/help/man-filter.html
index 36e0765696a86c9173c3ee3a49e9e57222e032bd..229e29eb33b3c7d70b39f890878850204d722f58 100644 (file)
--- 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.
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ippfind.html b/doc/help/man-ippfind.html
index 41445fefc723efdbacebce3c50338806c3baa889..2e2ebb1e9507f007b80e424c3e51c163f36e3cc4 100644 (file)
--- 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.
 <dt><b>--local</b>
 <dd style="margin-left: 5.0em">True if the service is local to this computer.
+<dt><b>-N </b><i>name</i>
+<dd style="margin-left: 5.0em"><dt><b>--literal-name </b><i>name</i>
+<dd style="margin-left: 5.0em">True if the service instance name matches the given name.
 <dt><b>-n </b><i>regex</i>
 <dd style="margin-left: 5.0em"><dt><b>--name </b><i>regex</i>
 <dd style="margin-left: 5.0em">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:
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <a href="man-ipptool.html?TOPIC=Man+Pages"><b>ipptool</b>(1)</a>
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2013-2015 by Apple Inc.
+Copyright &copy; 2013-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index fbcb92d21214643d2f9d59306c5aa2def9ddb62c..a19d1b202d0a05dfe44238e2c86575e0ad84a2c5 100644 (file)
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -225,7 +225,7 @@ IANA IPP Registry (<a href="http://www.iana.org/assignments/ipp\-registrations)"
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp">http://www.pwg.org/ipp</a>)
 RFC 8011 (<a href="http://tools.ietf.org/html/rfc8011)">http://tools.ietf.org/html/rfc8011)</a>,
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index c426af7d836baedcfa93b4c6d79d248cb9fdf5a8..8f2e65177446205424c5fe11f5f69a51d9245943 100644 (file)
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -532,7 +532,7 @@ IANA IPP Registry (<a href="http://www.iana.org/assignments/ipp-registrations)">
 PWG Internet Printing Protocol Workgroup (<a href="http://www.pwg.org/ipp)">http://www.pwg.org/ipp)</a>,
 RFC 8011 (<a href="http://tools.ietf.org/html/rfc8011">http://tools.ietf.org/html/rfc8011</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lp.html b/doc/help/man-lp.html
index b2603a22ef17be38fef8129837877dd37c643b0e..3c5bb5dd1f1a1fe9eef5bc72c596e0e781d23f75 100644 (file)
--- 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":
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index ae740b9522014242c6ed4152a609dc351a4178ee..3b04c876893d32c640d835a52b196ec44df5b7d9 100644 (file)
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -181,7 +181,7 @@ Create an IPP Everywhere print queue:
 <a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpc.html b/doc/help/man-lpc.html
index 9e40388bcc646026cfca7c654352074ecd54d63b..cddf8c44790d04b4cfe97bb3a919c2ccccaf6da1 100644 (file)
--- 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.
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpinfo.html b/doc/help/man-lpinfo.html
index a46758fc82adad2545df3980c8af5037591e1bf6..8ed50e16c2c1f18837de61521a391e7aa117738c 100644 (file)
--- a/doc/help/man-lpinfo.html
+++ b/doc/help/man-lpinfo.html
@@ -109,7 +109,7 @@ List drivers matching "HP LaserJet":
 <a href="man-lpadmin.html?TOPIC=Man+Pages"><b>lpadmin</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpmove.html b/doc/help/man-lpmove.html
index e9bf4fcc4d558eb7bcd178bca64d62bc412de8cc..228afb97d6e11d542c03ced2ab18a81157c5b26e 100644 (file)
--- a/doc/help/man-lpmove.html
+++ b/doc/help/man-lpmove.html
@@ -69,7 +69,7 @@ Move all jobs from "oldprinter" to "newprinter":
 <br>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index e4eaf714e857e74c87c86f70bc8cac49dbc47c83..d12221dbae9cf760ca1bf5ddd0bd7124f714ded4 100644 (file)
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -119,7 +119,7 @@ The <b>lpoptions</b> command is unique to CUPS.
 <a href="man-lprm.html?TOPIC=Man+Pages"><b>lprm</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpq.html b/doc/help/man-lpq.html
index c38b226d43e9642125109d2bf2fe6306222756f5..ecba7ee4cf7fe884503a9ea9ea618c77423a10cc 100644 (file)
--- 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
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpr.html b/doc/help/man-lpr.html
index 7c7bf2763f23ae2b6e83cc86a725724a2b9db037..986ef33e9c8e1ff05f5076d47d3b90ebbdd6e367 100644 (file)
--- 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":
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html
index 78cdb4ff6dce3d4f80b438a24afd1195a1bf3105..25f801749dbaba438764da42154da40c010f2671 100644 (file)
--- a/doc/help/man-lprm.html
+++ b/doc/help/man-lprm.html
@@ -76,7 +76,7 @@ Cancel all jobs:
 <a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-lpstat.html b/doc/help/man-lpstat.html
index 106b9f59881f1005dfbe485264a78f9d6eb0d323..876de1f2d7e00061e87b90eac588eb97b70f083a 100644 (file)
--- a/doc/help/man-lpstat.html
+++ b/doc/help/man-lpstat.html
@@ -127,7 +127,7 @@ Also, printer and class names are <i>not</i> case-sensitive.
 <a href="man-lprm.html?TOPIC=Man+Pages"><b>lprm</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-mailto.conf.html b/doc/help/man-mailto.conf.html
index c13da985e51f00db054446f3f38616885b1cc447..ddfb2753e13639b6caaf9591b56747603d99bd7a 100644 (file)
--- 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.
 <a href="man-cupsd.html?TOPIC=Man+Pages"><b>cupsd</b>(8),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-mime.convs.html b/doc/help/man-mime.convs.html
index 772262c110eefa4c1d88d7340a5084777f64ad9d..2228aaccb99a9d40c5ae9ca276494c82b2958df5 100644 (file)
--- 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:
 <a href="man-mime.types.html?TOPIC=Man+Pages"><b>mime.types</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-mime.types.html b/doc/help/man-mime.types.html
index 7f092ce2f0444d48358e4b1a4682c7053c452981..290dfa7b0f9a5c28ed8dc2f16f639708202620b2 100644 (file)
--- 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
 <a href="man-mime.convs.html?TOPIC=Man+Pages"><b>mime.convs</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-notifier.html b/doc/help/man-notifier.html
index 3130afbd6724891ebece1196a4aad208fb918a8b..08353d032f4c28711fc0a4d3c1ca0eda99231506 100644 (file)
--- 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
 <a href="man-filter.html?TOPIC=Man+Pages"><b>filter</b>(7),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdc.html b/doc/help/man-ppdc.html
index 7fdd58005ea461ebd68402717779145bfcfef95e..725574858ff3424521d1be79712fb3cce4e3fb82 100644 (file)
--- 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.
 <a href="man-ppdcfile.html?TOPIC=Man+Pages"><b>ppdcfile</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdcfile.html b/doc/help/man-ppdcfile.html
index 08067733f48af32a945f2b084586ccb8203182ee..f6ddef6b1508436463476663d0cec9e189809fb2 100644 (file)
--- 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
 <a href="man-ppdpo.html?TOPIC=Man+Pages"><b>ppdpo</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdhtml.html b/doc/help/man-ppdhtml.html
index 5ce154941438bb07aceba5d1205effe9c8f0cb39..aa76ff7b2feb85938101421843bfb54cb1ab88d6 100644 (file)
--- a/doc/help/man-ppdhtml.html
+++ b/doc/help/man-ppdhtml.html
@@ -39,7 +39,7 @@ Multiple <i>-I</i> options can be supplied to add additional directories.
 <a href="man-ppdpo.html?TOPIC=Man+Pages"><b>ppdpo</b>(1),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdi.html b/doc/help/man-ppdi.html
index dd8cefc7120a5d1f1d5f411cf92065545c2b49bb..0c83f630e5e900e9cb657610e34e7f2b57745fa0 100644 (file)
--- a/doc/help/man-ppdi.html
+++ b/doc/help/man-ppdi.html
@@ -46,7 +46,7 @@ If no source file is specified, the filename <i>ppdi.drv</i> is used.
 <a href="man-ppdcfile.html?TOPIC=Man+Pages"><b>ppdcfile</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdmerge.html b/doc/help/man-ppdmerge.html
index d20e0ed3986a32d7b9c2c68f6a4080640e1e12fa..e88435c404d34ecfb80be1f35df634f00788dc21 100644 (file)
--- 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.
 <a href="man-ppdcfile.html?TOPIC=Man+Pages"><b>ppdcfile</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-ppdpo.html b/doc/help/man-ppdpo.html
index 448e7337ce8fbee38f99799774ce416ebe716572..0345637751823aed024d3f9913c2e7bc0ed44c16 100644 (file)
--- a/doc/help/man-ppdpo.html
+++ b/doc/help/man-ppdpo.html
@@ -45,7 +45,7 @@ The supported extensions are <i>.po</i> or <i>.po.gz</i> for GNU gettext format
 <b>ppdcfile(5),</b>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-printers.conf.html b/doc/help/man-printers.conf.html
index 8f1bf058265c483c1ea99bddf7809dc39e4e881e..7b60a8cbe1e503d73d3572f3a5e1c45c131c6f54 100644 (file)
--- 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
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/doc/help/man-subscriptions.conf.html b/doc/help/man-subscriptions.conf.html
index bb0555fd5895898617c2faaf59b3254eec3859ba..ea4af7c555603b930d4a4c5c2926f93e691f42a4 100644 (file)
--- 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
 <a href="man-printers.conf.html?TOPIC=Man+Pages"><b>printers.conf</b>(5),</a>
 CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/man/ippfind.man b/man/ippfind.man
index 737e43593aef36b53f30f5e06699c5b2c7268248..eee35489a50500e92ad3aee0f11370be21b3896f 100644 (file)
--- 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 ba814147364e2c86a2d75bca2e95ad8d461f1fdd..c7e8765d0dc3efa2a4fe14c3797aa8008d87e9a3 100644 (file)
--- 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)
   {
    /*