emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

w: Adjust command width

Browse Source 
w would error out if the window size was smaller than 71 or some
other fields through environment grew too big. The code was a little
convoluted as well. The minimum length for command was 3, which is
pretty useless.

This change does the following:
 w doesn't care by default the window size
 w will adjust the command length up and down, to a minimum of 7
characters.
 if the fields don't fit, w will line-wrap each line.

The idea being its better the line-wrap than it is to error out.

References: https://bugs.debian.org/183394

Signed-off-by: Craig Small <csmall@enc.com.au>

Ported-by: Jim Warner <james.warner@comcast.net>
From original:
commit 151c05b497
This commit is contained in:
Craig Small 2015-07-21 22:45:02 +10:00
parent 2f78b195ad
commit 7b08ad19cc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
w.c
View File

@ -65,6 +65,7 @@ typedef struct utmp utmp_t;
#endif #endif
#define MAX_CMD_WIDTH 512 #define MAX_CMD_WIDTH 512
#define MIN_CMD_WIDTH 7
/* /*
* This routine is careful since some programs leave utmp strings * This routine is careful since some programs leave utmp strings
@ -621,16 +622,11 @@ int main(int argc, char **argv)
maxcmd = atoi(p); maxcmd = atoi(p);
else else
maxcmd = MAX_CMD_WIDTH; maxcmd = MAX_CMD_WIDTH;
if (maxcmd < 71) if (MAX_CMD_WIDTH < maxcmd)
xerrx(EXIT_FAILURE, _("%d column window is too narrow"), maxcmd);
if (MAX_CMD_WIDTH < maxcmd) {
xwarnx(_("%d column width exceeds command buffer size, truncating to %d"),
maxcmd, MAX_CMD_WIDTH);
maxcmd = MAX_CMD_WIDTH; maxcmd = MAX_CMD_WIDTH;
}
maxcmd -= 21 + userlen + (from ? fromlen : 0) + (longform ? 20 : 0); maxcmd -= 21 + userlen + (from ? fromlen : 0) + (longform ? 20 : 0);
if (maxcmd < 3) if (maxcmd < MIN_CMD_WIDTH)
xwarnx(_("warning: screen width %d suboptimal"), win.ws_col); maxcmd = MIN_CMD_WIDTH;
if (header) { if (header) {