fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite foldline() in fold(1)

Browse Source 
After the audit, I had this noted down as a TODO-item, but
considered the function to be tested enough to hold the line
until I came to rewrite it.
Admittedly, I didn't take a closer look at the previous loop
and there probably were some edge-cases which caused trouble, but
so far so good, the new version of this commit should be safe
and considered audited.
This commit is contained in:
FRIGN 2015-03-16 19:26:42 +01:00
parent 64da0d1ebc
commit fbda47b964
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fold.c
View File

@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "util.h" #include "util.h"
@ -11,29 +12,28 @@ static int sflag = 0;
static size_t width = 80; static size_t width = 80;
static void static void
foldline(const char *str) foldline(const char *str) {
{ const char *p, *spacesect = NULL;
size_t i = 0, n = 0, col, j; size_t col, off;
int space;
char c;
do { for (p = str, col = 0; *p && *p != '\n'; p++) {
space = 0; if (!UTF8_POINT(*p) && !bflag)
for (j = i, col = 0; str[j] && col <= width; j++) {
c = str[j];
if (!UTF8_POINT(c) && !bflag)
continue; continue;
if (sflag && isspace(c)) { if (col >= width) {
space = 1; off = (sflag && spacesect) ? spacesect - str : p - str;
n = j + 1; if (fwrite(str, 1, off, stdout) != off)
} else if (!space) { eprintf("fwrite <stdout>:");
n = j; putchar('\n');
spacesect = NULL;
col = 0;
p = str += off;
} }
if (sflag && isspace(*p))
if (!bflag && iscntrl(c)) { spacesect = p + 1;
switch(c) { if (!bflag && iscntrl(*p)) {
switch(*p) {
case '\b': case '\b':
col--; col -= (col > 0);
break; break;
case '\r': case '\r':
col = 0; col = 0;
@ -46,11 +46,7 @@ foldline(const char *str)
col++; col++;
} }
} }
if (fwrite(str + i, 1, n - i, stdout) != n - i) fputs(str, stdout);
eprintf("fwrite <stdout>:");
if (str[n])
putchar('\n');
} while (str[i = n] && str[i] != '\n');
} }
static void static void
@ -69,7 +65,7 @@ fold(FILE *fp, const char *fname)
static void static void
usage(void) usage(void)
{ {
eprintf("usage: %s [-bs] [-w width | -width] [FILE...]\n", argv0); eprintf("usage: %s [-bs] [-w num | -num] [FILE ...]\n", argv0);
} }
int int
@ -102,12 +98,12 @@ main(int argc, char *argv[])
if (!(fp = fopen(*argv, "r"))) { if (!(fp = fopen(*argv, "r"))) {
weprintf("fopen %s:", *argv); weprintf("fopen %s:", *argv);
ret = 1; ret = 1;
continue; } else {
}
fold(fp, *argv); fold(fp, *argv);
fclose(fp); fclose(fp);
} }
} }
}
return ret; return ret;
} }