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

watch: truncate command in non-8 bit mode

Browse Source 
When the screen width is not long enough to display the entire
command, watch puts three dots ... like elipses at the end of
the truncated line.

It's been like that for years, perhaps noone uses non 8-bit
watch?

References:
 commit 367b8bb616

Signed-off-by: Craig Small <csmall@enc.com.au>
This commit is contained in:
Craig Small 2016-07-02 16:07:56 +10:00
parent 80594403cc
commit 458845f575
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
watch.c
View File

@ -364,7 +364,7 @@ wint_t my_getwc(FILE * s)
#endif /* WITH_WATCH8BIT */ #endif /* WITH_WATCH8BIT */
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
static void output_header(wchar_t *restrict wcommand, int wcommand_columns, int wcommand_characters, double interval) static void output_header(wchar_t *restrict wcommand, int wcommand_characters, double interval)
#else #else
static void output_header(char *restrict command, double interval) static void output_header(char *restrict command, double interval)
#endif /* WITH_WATCH8BIT */ #endif /* WITH_WATCH8BIT */
@ -374,6 +374,7 @@ static void output_header(char *restrict command, double interval)
char *header; char *header;
char *right_header; char *right_header;
char hostname[HOST_NAME_MAX + 1]; char hostname[HOST_NAME_MAX + 1];
int command_columns = 0; /* not including final \0 */
gethostname(hostname, sizeof(hostname)); gethostname(hostname, sizeof(hostname));
@ -407,10 +408,11 @@ static void output_header(char *restrict command, double interval)
mvaddstr(0, width - rhlen - 4, "... "); mvaddstr(0, width - rhlen - 4, "... ");
} else { } else {
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
if (width < rhlen + hlen + wcommand_columns) { command_columns = wcswidth(wcommand, -1);
if (width < rhlen + hlen + command_columns) {
/* print truncated */ /* print truncated */
int available = width - rhlen - hlen; int available = width - rhlen - hlen;
int in_use = wcommand_columns; int in_use = command_columns;
int wcomm_len = wcommand_characters; int wcomm_len = wcommand_characters;
while (available - 4 < in_use) { while (available - 4 < in_use) {
wcomm_len--; wcomm_len--;
@ -422,7 +424,14 @@ static void output_header(char *restrict command, double interval)
mvaddwstr(0, hlen, wcommand); mvaddwstr(0, hlen, wcommand);
} }
#else #else
mvaddnstr(0, hlen, command, width - rhlen - hlen); command_columns = strlen(command);
if (width < rhlen + hlen + command_columns) {
/* print truncated */
mvaddnstr(0, hlen, command, width - rhlen - hlen - 4);
mvaddstr(0, width - rhlen - 4, "... ");
} else {
mvaddnstr(0, hlen, command, width - rhlen - hlen);
}
#endif /* WITH_WATCH8BIT */ #endif /* WITH_WATCH8BIT */
} }
} }
@ -661,7 +670,6 @@ int main(int argc, char *argv[])
* keeping only */ * keeping only */
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
wchar_t *wcommand = NULL; wchar_t *wcommand = NULL;
int wcommand_columns = 0; /* not including final \0 */
int wcommand_characters = 0; /* not including final \0 */ int wcommand_characters = 0; /* not including final \0 */
#endif /* WITH_WATCH8BIT */ #endif /* WITH_WATCH8BIT */
@ -773,7 +781,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
mbstowcs(wcommand, command, wcommand_characters + 1); mbstowcs(wcommand, command, wcommand_characters + 1);
wcommand_columns = wcswidth(wcommand, -1);
#endif /* WITH_WATCH8BIT */ #endif /* WITH_WATCH8BIT */
get_terminal_size(); get_terminal_size();