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

Adjust some limits to more flexibility for strtonum

Browse Source
This commit is contained in:
FRIGN
2015-02-01 01:24:03 +01:00
parent 5a20d0e9d7
commit 27b770c02c
10 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nl.c
View File

@@ -2,6 +2,7 @@
#include <limits.h>
#include <regex.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -9,12 +10,29 @@
#include "text.h"
#include "util.h"
static void nl(const char *, FILE *);
static char mode = 't';
static char mode = 't';
static const char *sep = "\t";
static long incr = 1;
static regex_t preg;
static size_t incr = 1;
static regex_t preg;
void
nl(const char *name, FILE *fp)
{
char *buf = NULL;
size_t n = 0, size = 0;
while (getline(&buf, &size, fp) != -1) {
if ((mode == 'a')
|| (mode == 'p' && !regexec(&preg, buf, 0, NULL, 0))
|| (mode == 't' && buf[0] != '\n'))
printf("%6ld%s%s", n += incr, sep, buf);
else
printf(" %s", buf);
}
free(buf);
if (ferror(fp))
eprintf("%s: read error:", name);
}
static void
usage(void)
@@ -38,7 +56,7 @@ main(int argc, char *argv[])
usage();
break;
case 'i':
incr = estrtonum(EARGF(usage()), 0, LONG_MAX);
incr = estrtonum(EARGF(usage()), 0, MIN(LLONG_MAX, SIZE_MAX));
break;
case 's':
sep = EARGF(usage());
@@ -60,23 +78,3 @@ main(int argc, char *argv[])
}
return 0;
}
void
nl(const char *name, FILE *fp)
{
char *buf = NULL;
long n = 0;
size_t size = 0;
while (getline(&buf, &size, fp) != -1) {
if ((mode == 'a')
|| (mode == 'p' && !regexec(&preg, buf, 0, NULL, 0))
|| (mode == 't' && buf[0] != '\n'))
printf("%6ld%s%s", n += incr, sep, buf);
else
printf(" %s", buf);
}
free(buf);
if (ferror(fp))
eprintf("%s: read error:", name);
}