diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-02-25 00:52:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-02-25 00:52:27 +0000 |
| commit | f8b3a85b79b8eb74c37c839079ecbf8266a6f4ed (patch) | |
| tree | ced1b724e207ab15c0c21c198bb3105639e57ff4 /systemv/lpstat.c | |
| parent | 41681883895f928191cfa6472b453d9753cc26ec (diff) | |
| download | cups-f8b3a85b79b8eb74c37c839079ecbf8266a6f4ed.tar.gz | |
Merge changes from CUPS 1.5svn-r9000.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1912 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv/lpstat.c')
| -rw-r--r-- | systemv/lpstat.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/systemv/lpstat.c b/systemv/lpstat.c index e98aaa70d..5f4e0b47a 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1,9 +1,9 @@ /* * "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $" * - * "lpstat" command for the Common UNIX Printing System (CUPS). + * "lpstat" command for CUPS. * - * Copyright 2007-2009 by Apple Inc. + * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -34,10 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <errno.h> -#include <cups/http-private.h> -#include <cups/string.h> -#include <cups/cups.h> -#include <cups/i18n.h> +#include <cups/globals.h> #include <cups/debug.h> @@ -1518,7 +1515,7 @@ show_printers(const char *printers, /* I - Destinations */ char printer_uri[HTTP_MAX_URI], /* Printer URI */ printer_state_time[255];/* Printer state time */ - const char *root; /* Server root directory... */ + _cups_globals_t *cg = _cupsGlobals(); /* Global data */ static const char *pattrs[] = /* Attributes we need for printers... */ { "printer-name", @@ -1543,9 +1540,6 @@ show_printers(const char *printers, /* I - Destinations */ DEBUG_printf(("show_printers(printers=\"%s\", num_dests=%d, dests=%p, " "long_status=%d)\n", printers, num_dests, dests, long_status)); - if ((root = getenv("CUPS_SERVERROOT")) == NULL) - root = CUPS_SERVERROOT; - if (printers != NULL && !strcmp(printers, "all")) printers = NULL; @@ -1820,10 +1814,11 @@ show_printers(const char *printers, /* I - Destinations */ if (make_model && strstr(make_model, "System V Printer")) _cupsLangPrintf(stdout, _("\tInterface: %s/interfaces/%s\n"), - root, printer); + cg->cups_serverroot, printer); else if (make_model && !strstr(make_model, "Raw Printer")) _cupsLangPrintf(stdout, - _("\tInterface: %s/ppd/%s.ppd\n"), root, printer); + _("\tInterface: %s/ppd/%s.ppd\n"), + cg->cups_serverroot, printer); } _cupsLangPuts(stdout, _("\tOn fault: no alert\n")); _cupsLangPuts(stdout, _("\tAfter fault: continue\n")); @@ -1933,10 +1928,11 @@ show_printers(const char *printers, /* I - Destinations */ if (make_model && strstr(make_model, "System V Printer")) _cupsLangPrintf(stdout, _("\tInterface: %s/interfaces/%s\n"), - root, printer); + cg->cups_serverroot, printer); else if (make_model && !strstr(make_model, "Raw Printer")) _cupsLangPrintf(stdout, - _("\tInterface: %s/ppd/%s.ppd\n"), root, printer); + _("\tInterface: %s/ppd/%s.ppd\n"), + cg->cups_serverroot, printer); } _cupsLangPuts(stdout, _("\tOn fault: no alert\n")); _cupsLangPuts(stdout, _("\tAfter fault: continue\n")); |