suckless/sbase
1
0
Fork 0
mirror of git://git.suckless.org/sbase synced 2024-12-21 22:50:16 +00:00
Code Issues Projects Releases Wiki Activity

strings: Rename len to min

Browse Source
This commit is contained in:
Michael Forney 2021-01-14 21:45:37 -08:00
parent 5377a9c3d1
commit 7ef4038fb5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
strings.c
View File

@ -10,33 +10,33 @@
static char *format = "";
static void
strings(FILE *fp, const char *fname, size_t len)
strings(FILE *fp, const char *fname, size_t min)
{
Rune r, *rbuf;
size_t i, bread;
off_t off;
rbuf = ereallocarray(NULL, len, sizeof(*rbuf));
rbuf = ereallocarray(NULL, min, sizeof(*rbuf));
for (off = 0, i = 0; (bread = efgetrune(&r, fp, fname)); ) {
off += bread;
if (r == Runeerror)
continue;
if (!isprintrune(r)) {
if (i == len)
if (i == min)
putchar('\n');
i = 0;
continue;
}
if (i == len) {
if (i == min) {
efputrune(&r, stdout, "<stdout>");
continue;
}
rbuf[i++] = r;
if (i < len)
if (i < min)
continue;
printf(format, (long)off - i);
for (i = 0; i < len; i++)
for (i = 0; i < min; i++)
efputrune(rbuf + i, stdout, "<stdout>");
}
free(rbuf);
@ -52,7 +52,7 @@ int
main(int argc, char *argv[])
{
FILE *fp;
size_t len = 4;
size_t min = 4;
int ret = 0;
char f;
@ -60,7 +60,7 @@ main(int argc, char *argv[])
case 'a':
break;
case 'n':
len = estrtonum(EARGF(usage()), 1, LLONG_MAX);
min = estrtonum(EARGF(usage()), 1, LLONG_MAX);
break;
case 't':
format = estrdup("%8l#: ");
@ -75,7 +75,7 @@ main(int argc, char *argv[])
} ARGEND
if (!argc) {
strings(stdin, "<stdin>", len);
strings(stdin, "<stdin>", min);
} else {
for (; *argv; argc--, argv++) {
if (!strcmp(*argv, "-")) {
@ -86,7 +86,7 @@ main(int argc, char *argv[])
ret = 1;
continue;
}
strings(fp, *argv, len);
strings(fp, *argv, min);
if (fp != stdin && fshut(fp, *argv))
ret = 1;
}