summaryrefslogtreecommitdiff
path: root/usr/src/cmd/print/bsd-sysv-commands/lpstat.c
diff options
context:
space:
mode:
authorsonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>2009-04-02 10:55:13 +0530
committersonam gupta - Sun Microsystems - Bangalore India <Sonam.Gupta@Sun.COM>2009-04-02 10:55:13 +0530
commit35a603ad9532c431e0923d22b1e5151c73aca44e (patch)
tree0263b2e4c7d8751c740386748603bfd3f2d5afc0 /usr/src/cmd/print/bsd-sysv-commands/lpstat.c
parent4a9fd251254a5d3b654717d88da3fc34a79bba8c (diff)
downloadillumos-joyent-35a603ad9532c431e0923d22b1e5151c73aca44e.tar.gz
6815300 lpstat output for remote queues does not match the behavior prior to s10 u5
Diffstat (limited to 'usr/src/cmd/print/bsd-sysv-commands/lpstat.c')
-rw-r--r--usr/src/cmd/print/bsd-sysv-commands/lpstat.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/cmd/print/bsd-sysv-commands/lpstat.c b/usr/src/cmd/print/bsd-sysv-commands/lpstat.c
index 77daed6f4d..42e56b2fe3 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/lpstat.c
+++ b/usr/src/cmd/print/bsd-sysv-commands/lpstat.c
@@ -687,7 +687,7 @@ match_user(char *user, char **list)
static char **users = NULL;
static int
-report_job(papi_job_t job, int show_rank, int verbose)
+report_job(char *printer, papi_job_t job, int show_rank, int verbose)
{
papi_attribute_t **attrs = papiJobGetAttributeList(job);
time_t clock = 0;
@@ -797,7 +797,8 @@ report_job(papi_job_t job, int show_rank, int verbose)
"printer-name", &destination);
(void) papiAttributeListGetInteger(attrs, NULL,
"job-id", &id);
- snprintf(request, sizeof (request), "%s-%d", destination, id);
+
+ snprintf(request, sizeof (request), "%s-%d", printer, id);
if (show_rank != 0) {
int32_t rank = -1;
@@ -841,7 +842,7 @@ report_job(papi_job_t job, int show_rank, int verbose)
}
static int
-job_query(char *request, int (*report)(papi_job_t, int, int),
+job_query(char *request, int (*report)(char *, papi_job_t, int, int),
papi_encryption_t encryption, int show_rank, int verbose)
{
int result = 0;
@@ -910,8 +911,9 @@ job_query(char *request, int (*report)(papi_job_t, int, int),
int i;
for (i = 0; jobs[i] != NULL; i++)
- result += report(jobs[i],
- show_rank, verbose);
+ result += report(printer,
+ jobs[i], show_rank,
+ verbose);
}
papiJobListFree(jobs);
@@ -934,7 +936,8 @@ job_query(char *request, int (*report)(papi_job_t, int, int),
}
if (job != NULL)
- result = report(job, show_rank, verbose);
+ result = report(printer, job,
+ show_rank, verbose);
papiJobFree(job);
}