From 853389e344087efe23a5cc688693e5301a1cb90d Mon Sep 17 00:00:00 2001 From: wendyp Date: Wed, 21 May 2008 12:16:32 -0700 Subject: 6180823 S10 BETA 6: printmgr(1M) say banner "always" when it's "never" 6667354 printmgr fails to add/modify printer 6689188 modify queue display values in printmgr incorrect for filecontents, notification, and printer type. --- usr/src/cmd/print/bsd-sysv-commands/lpstat.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'usr/src/cmd/print/bsd-sysv-commands/lpstat.c') diff --git a/usr/src/cmd/print/bsd-sysv-commands/lpstat.c b/usr/src/cmd/print/bsd-sysv-commands/lpstat.c index 116d3fa1bb..af26bfb43e 100644 --- a/usr/src/cmd/print/bsd-sysv-commands/lpstat.c +++ b/usr/src/cmd/print/bsd-sysv-commands/lpstat.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * */ @@ -388,7 +388,7 @@ report_printer(papi_service_t svc, char *name, papi_printer_t printer, "document-format-supported", &str); printf(gettext("\tContent types: %s"), str); while (papiAttributeListGetString(attrs, &iter, NULL, &str) - == PAPI_OK) + == PAPI_OK) printf(", %s", str); printf("\n"); @@ -397,6 +397,16 @@ report_printer(papi_service_t svc, char *name, papi_printer_t printer, "printer-info", &str); printf(gettext("\tDescription: %s\n"), str); + str = ""; + iter = NULL; + (void) papiAttributeListGetString(attrs, &iter, + "lpsched-printer-type", &str); + printf(gettext("\tPrinter types: %s"), str); + while (papiAttributeListGetString(attrs, &iter, NULL, &str) + == PAPI_OK) + printf(", %s", str); + printf("\n"); + str = ""; (void) papiAttributeListGetString(attrs, NULL, "lpsched-dial-info", &str); @@ -477,9 +487,15 @@ report_printer(papi_service_t svc, char *name, papi_printer_t printer, str = ""; (void) papiAttributeListGetString(attrs, NULL, "job-sheets-supported", &str); - printf(gettext("\tBanner %s\n"), - (strcasecmp(str, "none") == 0 ? - gettext("not required") : gettext("required"))); + if ((strcasecmp(str, "none")) == 0) + str = gettext("page never printed"); + else if (strcasecmp(str, "optional") == 0) + str = gettext("not required"); + else + str = gettext("required"); + + printf(gettext("\tBanner %s\n"), str); + str = ""; iter = NULL; -- cgit v1.2.3