d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "lprm -" (remove all jobs) processing for remote printer queues.

Browse Source 
PR:		bin/25544
This commit is contained in:
gad 2001-03-12 01:16:09 +00:00
parent 86ca9deb04
commit 0152ddfe77
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
usr.sbin/lpr/common_source/rmjob.c
View File

@ -314,7 +314,7 @@ void
rmremote(pp)
const struct printer *pp;
{
int i, rem, niov, totlen;
int i, elem, firstreq, niov, rem, totlen;
char buf[BUFSIZ];
void (*savealrm)(int);
struct iovec *iov;
@ -338,24 +338,31 @@ rmremote(pp)
* us to process requests of indeterminate length without
* applying an arbitrary limit. Arbitrary Limits Are Bad (tm).
*/
niov = 4 + 2 * users + requests + 1;
if (users > 0)
niov = 4 + 2 * users + requests + 1;
else
niov = 4 + requests + 1;
iov = malloc(niov * sizeof *iov);
if (iov == 0)
fatal(pp, "out of memory");
fatal(pp, "out of memory in rmremote()");
iov[0].iov_base = "\5";
iov[1].iov_base = pp->remote_queue;
iov[2].iov_base = " ";
iov[3].iov_base = all ? "-all" : person;
elem = 4;
for (i = 0; i < users; i++) {
iov[4 + 2 * i].iov_base = " ";
iov[4 + 2 * i + 1].iov_base = user[i];
iov[elem].iov_base = " ";
iov[elem + 1].iov_base = user[i];
elem += 2;
}
firstreq = elem;
for (i = 0; i < requests; i++) {
asprintf(&iov[4 + 2 * users + i].iov_base, " %d", requ[i]);
if (iov[4 + 2 * users + i].iov_base == 0)
fatal(pp, "out of memory");
asprintf(&iov[elem].iov_base, " %d", requ[i]);
if (iov[elem].iov_base == 0)
fatal(pp, "out of memory in rmremote()");
elem++;
}
iov[4 + 2 * users + requests].iov_base = "\n";
iov[elem++].iov_base = "\n";
for (totlen = i = 0; i < niov; i++)
totlen += (iov[i].iov_len = strlen(iov[i].iov_base));
@ -375,7 +382,7 @@ rmremote(pp)
(void) close(rem);
}
for (i = 0; i < requests; i++)
free(iov[4 + 2 * users + i].iov_base);
free(iov[firstreq + i].iov_base);
free(iov);
}