Update svn:keyword properties.

[thirdparty/cups.git] / berkeley / lpc.c

diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 808ed674ddc907f9d98f87281b6efd57fb5345fd..e8ccb91c09065f5f7090b7ada8631280deae1234 100644 (file)
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: lpc.c 6070 2006-11-02 16:20:46Z mike $"
+ * "$Id$"
  *
- *   "lpc" command for the Common UNIX Printing System (CUPS).
+ *   "lpc" command for CUPS.
  *
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   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:
  *
@@ -34,12 +25,7 @@
  * Include necessary headers...
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <cups/cups.h>
-#include <cups/i18n.h>
-#include <cups/debug.h>
-#include <cups/string.h>
+#include <cups/cups-private.h>
 
 
 /*
@@ -87,7 +73,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
     * Do the command prompt thing...
     */
 
-    _cupsLangPuts(stdout, _("lpc> "));
+    _cupsLangPuts(stdout, _("lpc> ")); /* TODO: Need no-newline version */
     while (fgets(line, sizeof(line), stdin) != NULL)
     {
      /*
@@ -115,7 +101,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
         * Nothing left, just show a prompt...
        */
 
-       _cupsLangPuts(stdout, _("lpc> "));
+       _cupsLangPuts(stdout, _("lpc> ")); /* TODO: Need no newline version */
        continue;
       }
 
@@ -151,7 +137,7 @@ main(int  argc,                             /* I - Number of command-line arguments */
       * Put another prompt out to the user...
       */
 
-      _cupsLangPuts(stdout, _("lpc> "));
+      _cupsLangPuts(stdout, _("lpc> ")); /* TODO: Need no newline version */
     }
   }
 
@@ -200,7 +186,7 @@ do_command(http_t     *http,                /* I - HTTP connection to server */
     show_help(params);
   else
     _cupsLangPrintf(stdout,
-                    _("%s is not implemented by the CUPS version of lpc.\n"),
+                    _("%s is not implemented by the CUPS version of lpc."),
                    command);
 }
 
@@ -217,14 +203,14 @@ show_help(const char *command)            /* I - Command to describe or NULL */
     _cupsLangPrintf(stdout,
                     _("Commands may be abbreviated.  Commands are:\n"
                      "\n"
-                     "exit    help    quit    status  ?\n"));
+                     "exit    help    quit    status  ?"));
   }
   else if (!compare_strings(command, "help", 1) || !strcmp(command, "?"))
-    _cupsLangPrintf(stdout, _("help\t\tget help on commands\n"));
+    _cupsLangPrintf(stdout, _("help\t\tGet help on commands."));
   else if (!compare_strings(command, "status", 4))
-    _cupsLangPrintf(stdout, _("status\t\tshow status of daemon and queue\n"));
+    _cupsLangPrintf(stdout, _("status\t\tShow status of daemon and queue."));
   else
-    _cupsLangPrintf(stdout, _("?Invalid help command unknown\n"));
+    _cupsLangPrintf(stdout, _("?Invalid help command unknown."));
 }
 
 
@@ -239,7 +225,6 @@ show_status(http_t     *http,               /* I - HTTP connection to server */
   ipp_t                *request,               /* IPP Request */
                *response;              /* IPP Response */
   ipp_attribute_t *attr;               /* Current attribute */
-  cups_lang_t  *language;              /* Default language */
   char         *printer,               /* Printer name */
                *device,                /* Device URI */
                 *delimiter;            /* Char search result */
@@ -272,18 +257,7 @@ show_status(http_t     *http,              /* I - HTTP connection to server */
   *    attributes-natural-language
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_PRINTERS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
+  request = ippNewRequest(CUPS_GET_PRINTERS);
 
   ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
                 "requested-attributes", sizeof(requested) / sizeof(requested[0]),
@@ -390,7 +364,8 @@ show_status(http_t     *http,               /* I - HTTP connection to server */
 
          for (ptr = printer;
               *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-              ptr ++, dptr ++);
+              ptr ++, dptr ++)
+           /* do nothing */;
 
           if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
                               isspace(*dptr & 255)))
@@ -426,7 +401,7 @@ show_status(http_t     *http,               /* I - HTTP connection to server */
         printf("%s:\n", printer);
        if (!strncmp(device, "file:", 5))
          _cupsLangPrintf(stdout,
-                         _("\tprinter is on device \'%s\' speed -1\n"),
+                         _("\tprinter is on device \'%s\' speed -1"),
                          device + 5);
        else
        {
@@ -438,27 +413,27 @@ show_status(http_t     *http,             /* I - HTTP connection to server */
          {
            *delimiter = '\0';
            _cupsLangPrintf(stdout,
-                           _("\tprinter is on device \'%s\' speed -1\n"),
+                           _("\tprinter is on device \'%s\' speed -1"),
                            device);
          }
        }
 
         if (accepting)
-         _cupsLangPuts(stdout, _("\tqueuing is enabled\n"));
+         _cupsLangPuts(stdout, _("\tqueuing is enabled"));
        else
-         _cupsLangPuts(stdout, _("\tqueuing is disabled\n"));
+         _cupsLangPuts(stdout, _("\tqueuing is disabled"));
 
         if (pstate != IPP_PRINTER_STOPPED)
-         _cupsLangPuts(stdout, _("\tprinting is enabled\n"));
+         _cupsLangPuts(stdout, _("\tprinting is enabled"));
        else
-         _cupsLangPuts(stdout, _("\tprinting is disabled\n"));
+         _cupsLangPuts(stdout, _("\tprinting is disabled"));
 
        if (jobcount == 0)
-         _cupsLangPuts(stdout, _("\tno entries\n"));
+         _cupsLangPuts(stdout, _("\tno entries"));
        else
-         _cupsLangPrintf(stdout, _("\t%d entries\n"), jobcount);
+         _cupsLangPrintf(stdout, _("\t%d entries"), jobcount);
 
-       _cupsLangPuts(stdout, _("\tdaemon present\n"));
+       _cupsLangPuts(stdout, _("\tdaemon present"));
       }
 
       if (attr == NULL)
@@ -471,5 +446,5 @@ show_status(http_t     *http,               /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 6070 2006-11-02 16:20:46Z mike $".
+ * End of "$Id$".
  */