1
0
mirror of git://git.suckless.org/sbase synced 2024-12-22 23:13:44 +00:00
sbase/wc.c
FRIGN 79e8e330cb Fix wc(1) output for large files
Previously, we used the System V output format:
	"%7d%7d%7d %s\n"
The problem here is, that if any number has more than six digits, the
result looks like one big number, as we don't mandate spaces.

POSIX says the output format should rather be
	"%d %d %d %s\n"
but in this case we wouldn't get consistent results.

To serve both camps, I changed it to the following:
	"%6d %6d %6d %s\n"
This won't change the output for normal values, but also
prevent the output of large files to be ambiguous.
2016-02-24 14:45:20 +00:00

118 lines
1.9 KiB
C

/* See LICENSE file for copyright and license details. */
#include <string.h>
#include "utf.h"
#include "util.h"
static int lflag = 0;
static int wflag = 0;
static char cmode = 0;
static size_t tc = 0, tl = 0, tw = 0;
static void
output(const char *str, size_t nc, size_t nl, size_t nw)
{
int noflags = !cmode && !lflag && !wflag;
int first = 1;
if (lflag || noflags) {
if (!first)
putchar(' ');
printf("%*.1zu", first ? (first = 0) : 6, nl);
}
if (wflag || noflags) {
if (!first)
putchar(' ');
printf("%*.1zu", first ? (first = 0) : 6, nw);
}
if (cmode || noflags) {
if (!first)
putchar(' ');
printf("%*.1zu", first ? (first = 0) : 6, nc);
}
if (str)
printf(" %s", str);
putchar('\n');
}
static void
wc(FILE *fp, const char *str)
{
int word = 0, rlen;
Rune c;
size_t nc = 0, nl = 0, nw = 0;
while ((rlen = efgetrune(&c, fp, str))) {
nc += (cmode == 'c' || !cmode) ? rlen : (c != Runeerror);
if (c == '\n')
nl++;
if (!isspacerune(c))
word = 1;
else if (word) {
word = 0;
nw++;
}
}
if (word)
nw++;
tc += nc;
tl += nl;
tw += nw;
output(str, nc, nl, nw);
}
static void
usage(void)
{
eprintf("usage: %s [-c | -m] [-lw] [file ...]\n", argv0);
}
int
main(int argc, char *argv[])
{
FILE *fp;
int many;
int ret = 0;
ARGBEGIN {
case 'c':
cmode = 'c';
break;
case 'm':
cmode = 'm';
break;
case 'l':
lflag = 1;
break;
case 'w':
wflag = 1;
break;
default:
usage();
} ARGEND
if (!argc) {
wc(stdin, NULL);
} else {
for (many = (argc > 1); *argv; argc--, argv++) {
if (!strcmp(*argv, "-")) {
*argv = "<stdin>";
fp = stdin;
} else if (!(fp = fopen(*argv, "r"))) {
weprintf("fopen %s:", *argv);
ret = 1;
continue;
}
wc(fp, *argv);
if (fp != stdin && fshut(fp, *argv))
ret = 1;
}
if (many)
output("total", tc, tl, tw);
}
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
return ret;
}