diff options
| author | Sami Kerola | 2014-05-11 21:26:45 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-05-12 13:38:25 +0200 |
| commit | 42e296b59dd018836d172cad395a8938438241c3 (patch) | |
| tree | 7d60d24d4d5aaedacf57411becb4e666e5699743 /term-utils/wall.c | |
| parent | term-utils: avoid error message string length couting errors (diff) | |
| download | kernel-qcow2-util-linux-42e296b59dd018836d172cad395a8938438241c3.tar.gz kernel-qcow2-util-linux-42e296b59dd018836d172cad395a8938438241c3.tar.xz kernel-qcow2-util-linux-42e296b59dd018836d172cad395a8938438241c3.zip | |
wall: replace magic number by named value
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils/wall.c')
| -rw-r--r-- | term-utils/wall.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/term-utils/wall.c b/term-utils/wall.c index 1bae9d652..80b8678d9 100644 --- a/term-utils/wall.c +++ b/term-utils/wall.c @@ -69,7 +69,8 @@ #include "fileutils.h" #include "closestream.h" -#define WRITE_TIME_OUT 300 /* in seconds */ +#define TERM_WIDTH 79 +#define WRITE_TIME_OUT 300 /* in seconds */ /* Function prototypes */ static char *makemsg(char *fname, char **mvec, int mvecsz, @@ -225,14 +226,14 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, */ /* snprintf is not always available, but the sprintf's here will not overflow as long as %d takes at most 100 chars */ - fprintf(fp, "\r%79s\r\n", " "); + fprintf(fp, "\r%*s\r\n", TERM_WIDTH, " "); sprintf(lbuf, _("Broadcast message from %s@%s (%s) (%s):"), whom, hostname, where, date); - fprintf(fp, "%-79.79s\007\007\r\n", lbuf); + fprintf(fp, "%-*.*s\007\007\r\n", TERM_WIDTH, TERM_WIDTH, lbuf); free(hostname); free(date); } - fprintf(fp, "%79s\r\n", " "); + fprintf(fp, "%*s\r\n", TERM_WIDTH, " "); if (mvec) { /* @@ -274,8 +275,8 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, */ while (fgets(lbuf, line_max, stdin)) { for (cnt = 0, p = lbuf; (ch = *p) != '\0'; ++p, ++cnt) { - if (cnt == 79 || ch == '\n') { - for (; cnt < 79; ++cnt) + if (cnt == TERM_WIDTH || ch == '\n') { + for (; cnt < TERM_WIDTH; ++cnt) putc(' ', fp); putc('\r', fp); putc('\n', fp); @@ -288,7 +289,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, } } } - fprintf(fp, "%79s\r\n", " "); + fprintf(fp, "%*s\r\n", TERM_WIDTH, " "); free(lbuf); rewind(fp); |