]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - berkeley/lpq.c
Merge changes from CUPS 1.4svn-r7874.
[thirdparty/cups.git] / berkeley / lpq.c
index a5e009171c2d106bfce880390cdc9f80cae7391d..db089867eb69d0804abdbc091a75689e0836390f 100644 (file)
@@ -1,25 +1,16 @@
 /*
- * "$Id: lpq.c 4906 2006-01-10 20:53:28Z mike $"
+ * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 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:
  *
  * Local functions...
  */
 
-static int     show_jobs(http_t *, const char *, const char *, const int,
-                         const int);
-static void    show_printer(http_t *, const char *);
+static http_t  *connect_server(const char *, http_t *);
+static int     show_jobs(const char *, http_t *, const char *,
+                         const char *, const int, const int);
+static void    show_printer(const char *, http_t *, const char *);
 static void    usage(void);
 
 
@@ -60,52 +52,38 @@ static void usage(void);
  */
 
 int
-main(int  argc,                /* I - Number of command-line arguments */
-     char *argv[])     /* I - Command-line arguments */
+main(int  argc,                                /* I - Number of command-line arguments */
+     char *argv[])                     /* I - Command-line arguments */
 {
-  int          i;              /* Looping var */
-  http_t       *http;          /* Connection to server */
-  const char   *dest,          /* Desired printer */
-               *user,          /* Desired user */
-               *val;           /* Environment variable name */
-  char         *instance;      /* Printer instance */
-  int          id,             /* Desired job ID */
-               all,            /* All printers */
-               interval,       /* Reporting interval */
-               longstatus;     /* Show file details */
-  int          num_dests;      /* Number of destinations */
-  cups_dest_t  *dests;         /* Destinations */
-  cups_lang_t  *language;      /* Language */
-#ifdef HAVE_SSL
-  http_encryption_t encryption;        /* Encryption? */
-#endif /* HAVE_SSL */
-
-
-  language = cupsLangDefault();
-
- /*
-  * Connect to the scheduler...
-  */
-
-  if ((http = httpConnectEncrypt(cupsServer(), ippPort(),
-                                 cupsEncryption())) == NULL)
-  {
-    _cupsLangPuts(stderr, language,
-                  _("lpq: Unable to contact server!\n"));
-    return (1);
-  }
+  int          i;                      /* Looping var */
+  http_t       *http;                  /* Connection to server */
+  const char   *dest,                  /* Desired printer */
+               *user,                  /* Desired user */
+               *val;                   /* Environment variable name */
+  char         *instance;              /* Printer instance */
+  int          id,                     /* Desired job ID */
+               all,                    /* All printers */
+               interval,               /* Reporting interval */
+               longstatus;             /* Show file details */
+  int          num_dests;              /* Number of destinations */
+  cups_dest_t  *dests;                 /* Destinations */
+
+
+  _cupsSetLocale(argv);
 
  /*
   * Check for command-line options...
   */
 
+  http       = NULL;
   dest       = NULL;
   user       = NULL;
   id         = 0;
   interval   = 0;
   longstatus = 0;
   all        = 0;
-  num_dests  = cupsGetDests(&dests);
+  num_dests  = 0;
+  dests      = NULL;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '+')
@@ -116,17 +94,36 @@ main(int  argc,            /* I - Number of command-line arguments */
       {
         case 'E' : /* Encrypt */
 #ifdef HAVE_SSL
-           encryption = HTTP_ENCRYPT_REQUIRED;
+           cupsSetEncryption(HTTP_ENCRYPT_REQUIRED);
 
            if (http)
-             httpEncryption(http, encryption);
+             httpEncryption(http, HTTP_ENCRYPT_REQUIRED);
 #else
-            _cupsLangPrintf(stderr, language,
+            _cupsLangPrintf(stderr,
                            _("%s: Sorry, no encryption support compiled in!\n"),
                            argv[0]);
 #endif /* HAVE_SSL */
            break;
 
+        case 'U' : /* Username */
+           if (argv[i][2] != '\0')
+             cupsSetUser(argv[i] + 2);
+           else
+           {
+             i ++;
+             if (i >= argc)
+             {
+               _cupsLangPrintf(stderr,
+                               _("%s: Error - expected username after "
+                                 "\'-U\' option!\n"),
+                               argv[0]);
+               return (1);
+             }
+
+              cupsSetUser(argv[i]);
+           }
+           break;
+           
         case 'P' : /* Printer */
            if (argv[i][2])
              dest = argv[i] + 2;
@@ -148,15 +145,21 @@ main(int  argc,           /* I - Number of command-line arguments */
            if ((instance = strchr(dest, '/')) != NULL)
              *instance++ = '\0';
 
+            http = connect_server(argv[0], http);
+
+            if (num_dests == 0)
+              num_dests = cupsGetDests2(http, &dests);
+
             if (cupsGetDest(dest, instance, num_dests, dests) == NULL)
            {
              if (instance)
-               _cupsLangPrintf(stderr, language,
-                               _("lpq: Unknown destination \"%s/%s\"!\n"),
-                               dest, instance);
+               _cupsLangPrintf(stderr,
+                               _("%s: Error - unknown destination \"%s/%s\"!\n"),
+                               argv[0], dest, instance);
               else
-               _cupsLangPrintf(stderr, language,
-                               _("lpq: Unknown destination \"%s\"!\n"), dest);
+               _cupsLangPrintf(stderr,
+                               _("%s: Unknown destination \"%s\"!\n"),
+                               argv[0], dest);
 
              return (1);
            }
@@ -166,6 +169,32 @@ main(int  argc,            /* I - Number of command-line arguments */
            all = 1;
            break;
 
+        case 'h' : /* Connect to host */
+           if (http)
+           {
+             httpClose(http);
+             http = NULL;
+           }
+
+           if (argv[i][2] != '\0')
+              cupsSetServer(argv[i] + 2);
+           else
+           {
+             i ++;
+
+             if (i >= argc)
+             {
+               _cupsLangPrintf(stderr,
+                               _("%s: Error - expected hostname after "
+                                 "\'-h\' option!\n"),
+                               argv[0]);
+               return (1);
+              }
+             else
+                cupsSetServer(argv[i]);
+           }
+           break;
+
        case 'l' : /* Long status */
            longstatus = 1;
            break;
@@ -183,8 +212,13 @@ main(int  argc,            /* I - Number of command-line arguments */
     else
       user = argv[i];
 
+  http = connect_server(argv[0], http);
+
   if (dest == NULL && !all)
   {
+    if (num_dests == 0)
+      num_dests = cupsGetDests2(http, &dests);
+
     for (i = 0; i < num_dests; i ++)
       if (dests[i].is_default)
        dest = dests[i].name;
@@ -207,13 +241,14 @@ main(int  argc,           /* I - Number of command-line arguments */
        val = "LPDEST";
 
       if (dest && !cupsGetDest(dest, NULL, num_dests, dests))
-       _cupsLangPrintf(stderr, language,
-                       _("lp: error - %s environment variable names "
+       _cupsLangPrintf(stderr,
+                       _("%s: error - %s environment variable names "
                          "non-existent destination \"%s\"!\n"),
-                       val, dest);
+                       argv[0], val, dest);
       else
-       _cupsLangPuts(stderr, language,
-                     _("lpq: error - no default destination available.\n"));
+       _cupsLangPrintf(stderr,
+                       _("%s: error - no default destination available.\n"),
+                       argv[0]);
       httpClose(http);
       cupsFreeDests(num_dests, dests);
       return (1);
@@ -227,9 +262,9 @@ main(int  argc,             /* I - Number of command-line arguments */
   for (;;)
   {
     if (dest)
-      show_printer(http, dest);
+      show_printer(argv[0], http, dest);
 
-    i = show_jobs(http, dest, user, id, longstatus);
+    i = show_jobs(argv[0], http, dest, user, id, longstatus);
 
     if (i && interval)
     {
@@ -251,37 +286,61 @@ main(int  argc,           /* I - Number of command-line arguments */
 }
 
 
+/*
+ * 'connect_server()' - Connect to the server as necessary...
+ */
+
+static http_t *                                /* O - New HTTP connection */
+connect_server(const char *command,    /* I - Command name */
+               http_t     *http)       /* I - Current HTTP connection */
+{
+  if (!http)
+  {
+    http = httpConnectEncrypt(cupsServer(), ippPort(),
+                             cupsEncryption());
+
+    if (http == NULL)
+    {
+      _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command);
+      exit(1);
+    }
+  }
+
+  return (http);
+}
+
+
 /*
  * 'show_jobs()' - Show jobs.
  */
 
-static int                     /* O - Number of jobs in queue */
-show_jobs(http_t     *http,    /* I - HTTP connection to server */
-          const char *dest,    /* I - Destination */
-         const char *user,     /* I - User */
-         const int  id,        /* I - Job ID */
-         const int  longstatus)/* I - 1 if long report desired */
+static int                             /* O - Number of jobs in queue */
+show_jobs(const char *command,         /* I - Command name */
+          http_t     *http,            /* I - HTTP connection to server */
+          const char *dest,            /* I - Destination */
+         const char *user,             /* I - User */
+         const int  id,                /* I - Job ID */
+         const int  longstatus)        /* I - 1 if long report desired */
 {
-  ipp_t                *request,       /* IPP Request */
-               *response;      /* IPP Response */
-  ipp_attribute_t *attr;       /* Current attribute */
-  cups_lang_t  *language;      /* Default language */
-  const char   *jobdest,       /* Pointer into job-printer-uri */
-               *jobuser,       /* Pointer to job-originating-user-name */
-               *jobname;       /* Pointer to job-name */
-  ipp_jstate_t jobstate;       /* job-state */
-  int          jobid,          /* job-id */
-               jobsize,        /* job-k-octets */
+  ipp_t                *request,               /* IPP Request */
+               *response;              /* IPP Response */
+  ipp_attribute_t *attr;               /* Current attribute */
+  const char   *jobdest,               /* Pointer into job-printer-uri */
+               *jobuser,               /* Pointer to job-originating-user-name */
+               *jobname;               /* Pointer to job-name */
+  ipp_jstate_t jobstate;               /* job-state */
+  int          jobid,                  /* job-id */
+               jobsize,                /* job-k-octets */
 #ifdef __osf__
-               jobpriority,    /* job-priority */
+               jobpriority,            /* job-priority */
 #endif /* __osf__ */
-               jobcount,       /* Number of jobs */
-               jobcopies,      /* Number of copies */
-               rank;           /* Rank of job */
-  char         resource[1024]; /* Resource string */
-  char         rankstr[255];   /* Rank string */
-  char         namestr[1024];  /* Job name string */
-  static const char *ranks[10] =/* Ranking strings */
+               jobcount,               /* Number of jobs */
+               jobcopies,              /* Number of copies */
+               rank;                   /* Rank of job */
+  char         resource[1024];         /* Resource string */
+  char         rankstr[255];           /* Rank string */
+  char         namestr[1024];          /* Job name string */
+  static const char *ranks[10] =       /* Ranking strings */
                {
                  "th",
                  "st",
@@ -296,8 +355,8 @@ show_jobs(http_t     *http, /* I - HTTP connection to server */
                };
 
 
-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
+  DEBUG_printf(("show_jobs(http=%p, dest=%p, user=%p, id=%d, longstatus%d)\n",
+                http, dest, user, id, longstatus));
 
   if (http == NULL)
     return (0);
@@ -311,18 +370,7 @@ show_jobs(http_t     *http,        /* I - HTTP connection to server */
   *    job-uri or printer-uri
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
+  request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
 
   if (dest == NULL)
   {
@@ -336,8 +384,8 @@ show_jobs(http_t     *http, /* I - HTTP connection to server */
   }
   else
   {
-    httpAssembleURIf(resource, sizeof(resource), "ipp", NULL, "localhost", 0,
-                    "/printers/%s", dest);
+    httpAssembleURIf(HTTP_URI_CODING_ALL, resource, sizeof(resource), "ipp",
+                     NULL, "localhost", 0, "/printers/%s", dest);
 
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
                  NULL, resource);
@@ -360,8 +408,7 @@ show_jobs(http_t     *http, /* I - HTTP connection to server */
   {
     if (response->request.status.status_code > IPP_OK_CONFLICT)
     {
-      _cupsLangPrintf(stderr, language, _("lpq: get-jobs failed: %s\n"),
-                     ippErrorString(response->request.status.status_code));
+      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
       ippDelete(response);
       return (0);
     }
@@ -401,38 +448,38 @@ show_jobs(http_t     *http,       /* I - HTTP connection to server */
 
       while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
       {
-        if (strcmp(attr->name, "job-id") == 0 &&
+        if (!strcmp(attr->name, "job-id") &&
            attr->value_tag == IPP_TAG_INTEGER)
          jobid = attr->values[0].integer;
 
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
+        if (!strcmp(attr->name, "job-k-octets") &&
            attr->value_tag == IPP_TAG_INTEGER)
          jobsize = attr->values[0].integer;
 
 #ifdef __osf__
-        if (strcmp(attr->name, "job-priority") == 0 &&
+        if (!strcmp(attr->name, "job-priority") &&
            attr->value_tag == IPP_TAG_INTEGER)
          jobpriority = attr->values[0].integer;
 #endif /* __osf__ */
 
-        if (strcmp(attr->name, "job-state") == 0 &&
+        if (!strcmp(attr->name, "job-state") &&
            attr->value_tag == IPP_TAG_ENUM)
          jobstate = (ipp_jstate_t)attr->values[0].integer;
 
-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
+        if (!strcmp(attr->name, "job-printer-uri") &&
            attr->value_tag == IPP_TAG_URI)
          if ((jobdest = strrchr(attr->values[0].string.text, '/')) != NULL)
            jobdest ++;
 
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
+        if (!strcmp(attr->name, "job-originating-user-name") &&
            attr->value_tag == IPP_TAG_NAME)
          jobuser = attr->values[0].string.text;
 
-        if (strcmp(attr->name, "job-name") == 0 &&
+        if (!strcmp(attr->name, "job-name") &&
            attr->value_tag == IPP_TAG_NAME)
          jobname = attr->values[0].string.text;
 
-        if (strcmp(attr->name, "copies") == 0 &&
+        if (!strcmp(attr->name, "copies") &&
            attr->value_tag == IPP_TAG_INTEGER)
          jobcopies = attr->values[0].integer;
 
@@ -453,11 +500,11 @@ show_jobs(http_t     *http,       /* I - HTTP connection to server */
 
       if (!longstatus && jobcount == 0)
 #ifdef __osf__
-       _cupsLangPuts(stdout, language,
+       _cupsLangPuts(stdout,
                      _("Rank   Owner      Pri  Job        Files"
                        "                       Total Size\n"));
 #else
-       _cupsLangPuts(stdout, language,
+       _cupsLangPuts(stdout,
                      _("Rank    Owner   Job     File(s)"
                        "                         Total Size\n"));
 #endif /* __osf__ */
@@ -487,7 +534,7 @@ show_jobs(http_t     *http, /* I - HTTP connection to server */
 
       if (longstatus)
       {
-        _cupsLangPuts(stdout, language, "");
+        _cupsLangPuts(stdout, "\n");
 
         if (jobcopies > 1)
          snprintf(namestr, sizeof(namestr), "%d copies of %s", jobcopies,
@@ -495,19 +542,19 @@ show_jobs(http_t     *http,       /* I - HTTP connection to server */
        else
          strlcpy(namestr, jobname, sizeof(namestr));
 
-        _cupsLangPrintf(stdout, language, _("%s: %-33.33s [job %d localhost]\n"),
+        _cupsLangPrintf(stdout, _("%s: %-33.33s [job %d localhost]\n"),
                        jobuser, rankstr, jobid);
-        _cupsLangPrintf(stdout, language, _("        %-39.39s %.0f bytes\n"),
+        _cupsLangPrintf(stdout, _("        %-39.39s %.0f bytes\n"),
                        namestr, 1024.0 * jobsize);
       }
       else
 #ifdef __osf__
-        _cupsLangPrintf(stdout, language,
+        _cupsLangPrintf(stdout,
                        _("%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes\n"),
                        rankstr, jobuser, jobpriority, jobid, jobname,
                        1024.0 * jobsize);
 #else
-        _cupsLangPrintf(stdout, language,
+        _cupsLangPrintf(stdout,
                        _("%-7s %-7.7s %-7d %-31.31s %.0f bytes\n"),
                        rankstr, jobuser, jobid, jobname, 1024.0 * jobsize);
 #endif /* __osf */
@@ -520,13 +567,12 @@ show_jobs(http_t     *http,       /* I - HTTP connection to server */
   }
   else
   {
-    _cupsLangPrintf(stderr, language, _("lpq: get-jobs failed: %s\n"),
-                    ippErrorString(cupsLastError()));
+    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
     return (0);
   }
 
   if (jobcount == 0)
-    _cupsLangPuts(stdout, language, _("no entries\n"));
+    _cupsLangPuts(stdout, _("no entries\n"));
 
   return (jobcount);
 }
@@ -537,16 +583,15 @@ show_jobs(http_t     *http,       /* I - HTTP connection to server */
  */
 
 static void
-show_printer(http_t     *http, /* I - HTTP connection to server */
-             const char *dest) /* I - Destination */
+show_printer(const char *command,      /* I - Command name */
+             http_t     *http,         /* I - HTTP connection to server */
+             const char *dest)         /* I - Destination */
 {
-  ipp_t                *request,       /* IPP Request */
-               *response;      /* IPP Response */
-  ipp_attribute_t *attr;       /* Current attribute */
-  cups_lang_t  *language;      /* Default language */
-  ipp_pstate_t state;          /* Printer state */
-  char         uri[HTTP_MAX_URI];
-                               /* Printer URI */
+  ipp_t                *request,               /* IPP Request */
+               *response;              /* IPP Response */
+  ipp_attribute_t *attr;               /* Current attribute */
+  ipp_pstate_t state;                  /* Printer state */
+  char         uri[HTTP_MAX_URI];      /* Printer URI */
 
 
   if (http == NULL)
@@ -561,21 +606,10 @@ show_printer(http_t     *http,    /* I - HTTP connection to server */
   *    printer-uri
   */
 
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-  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(IPP_GET_PRINTER_ATTRIBUTES);
 
-  httpAssembleURIf(uri, sizeof(uri), "ipp", NULL, "localhost", 0,
-                  "/printers/%s", dest);
+  httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
+                   "localhost", 0, "/printers/%s", dest);
   ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
                "printer-uri", NULL, uri);
 
@@ -587,9 +621,7 @@ show_printer(http_t     *http,      /* I - HTTP connection to server */
   {
     if (response->request.status.status_code > IPP_OK_CONFLICT)
     {
-      _cupsLangPrintf(stderr, language,
-                      _("lpq: get-printer-attributes failed: %s\n"),
-                     ippErrorString(response->request.status.status_code));
+      _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
       ippDelete(response);
       return;
     }
@@ -602,23 +634,21 @@ show_printer(http_t     *http,    /* I - HTTP connection to server */
     switch (state)
     {
       case IPP_PRINTER_IDLE :
-          _cupsLangPrintf(stdout, language, _("%s is ready\n"), dest);
+          _cupsLangPrintf(stdout, _("%s is ready\n"), dest);
          break;
       case IPP_PRINTER_PROCESSING :
-          _cupsLangPrintf(stdout, language, _("%s is ready and printing\n"),
+          _cupsLangPrintf(stdout, _("%s is ready and printing\n"),
                          dest);
          break;
       case IPP_PRINTER_STOPPED :
-          _cupsLangPrintf(stdout, language, _("%s is not ready\n"), dest);
+          _cupsLangPrintf(stdout, _("%s is not ready\n"), dest);
          break;
     }
 
     ippDelete(response);
   }
   else
-    _cupsLangPrintf(stderr, language,
-                    _("lpq: get-printer-attributes failed: %s\n"),
-                   ippErrorString(cupsLastError()));
+    _cupsLangPrintf(stderr, "%s: %s\n", command, cupsLastErrorString());
 }
 
 
@@ -629,12 +659,13 @@ show_printer(http_t     *http,    /* I - HTTP connection to server */
 static void
 usage(void)
 {
-  _cupsLangPuts(stderr, cupsLangDefault(),
-                _("Usage: lpq [-P dest] [-l] [+interval]\n"));
+  _cupsLangPuts(stderr,
+                _("Usage: lpq [-P dest] [-U username] [-h hostname[:port]] "
+                 "[-l] [+interval]\n"));
   exit(1);
 }
 
 
 /*
- * End of "$Id: lpq.c 4906 2006-01-10 20:53:28Z mike $".
+ * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $".
  */