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

Make the standard 'lpq' output a little more informative when listing jobs

Browse Source 
which have long names.  Instead of just listing '...', try to list some
reasonable subset of the name (with a "..." to indicate something missing).

Reviewed by:	freebsd-print@bostonradio.org (only a little review)
This commit is contained in:
Garance A Drosehn 2000-10-31 20:11:30 +00:00
parent ec6b8da5b0
commit be794da76a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=68101
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
usr.sbin/lpr/common_source/displayq.c
View File

@ -439,27 +439,54 @@ dump(nfile, file, copies)
char *nfile, *file;
int copies;
{
register short n, fill;
struct stat lbuf;
const char etctmpl[] = ", ...";
char etc[sizeof(etctmpl)];
char *lastsep;
short fill, nlen;
short rem, remetc;
/*
* Print as many files as will fit
* (leaving room for the total size)
* Print as many filenames as will fit
* (leaving room for the 'total size' field)
*/
fill = first ? 0 : 2; /* fill space for ``, '' */
if (((n = strlen(nfile)) + col + fill) >= SIZCOL-4) {
if (col < SIZCOL) {
printf(" ..."), col += 4;
blankfill(SIZCOL);
fill = first ? 0 : 2; /* fill space for ``, '' */
nlen = strlen(nfile);
rem = SIZCOL - 1 - col;
if (nlen + fill > rem) {
if (first) {
/* print the right-most part of the name */
printf("...%s ", &nfile[3+nlen-rem]);
col = SIZCOL;
} else if (rem > 0) {
/* fit as much of the etc-string as we can */
remetc = rem;
if (rem > strlen(etctmpl))
remetc = strlen(etctmpl);
etc[0] = '\0';
strncat(etc, etctmpl, remetc);
printf(etc);
col += remetc;
rem -= remetc;
/* room for the last segment of this filename? */
lastsep = strrchr(nfile, '/');
if ((lastsep != NULL) && (rem > strlen(lastsep))) {
/* print the right-most part of this name */
printf("%s", lastsep);
col += strlen(lastsep);
} else {
/* do not pack any more names in here */
blankfill(SIZCOL);
}
}
} else {
if (first)
first = 0;
else
if (!first)
printf(", ");
printf("%s", nfile);
col += n+fill;
col += nlen + fill;
}
first = 0;
seteuid(euid);
if (*file && !stat(file, &lbuf))
totsize += copies * lbuf.st_size;