DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supports arbitrary large width

Browse Source
This commit is contained in:
Pierre Pronchery 2007-05-09 20:09:08 +00:00
parent 1cf9a01bc0
commit bdd46b87e2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pr.c
View File

@ -8,8 +8,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#define min(a, b) ((a) < (b)) ? (a) : (b)
/* pr */ /* pr */
/* types */ /* types */
@ -61,11 +59,13 @@ static int _pr_error(char const * message, int ret)
static int _pr_do(Prefs * prefs, FILE * fp, char const * filename) static int _pr_do(Prefs * prefs, FILE * fp, char const * filename)
{ {
char buf[513]; char * buf;
size_t len; size_t len;
int nb = 0; int nb = 0;
while(fgets(buf, min(prefs->width, sizeof(buf)), fp) != NULL) if((buf = malloc(prefs->width + 1)) == NULL)
return _pr_error("malloc", 1);
while(fgets(buf, prefs->width, fp) != NULL)
{ {
if(nb == 0 && !(prefs->flags & PREFS_t)) if(nb == 0 && !(prefs->flags & PREFS_t))
{ {
@ -84,6 +84,7 @@ static int _pr_do(Prefs * prefs, FILE * fp, char const * filename)
} }
for(; nb != prefs->lines; nb++) for(; nb != prefs->lines; nb++)
fputc('\n', stdout); fputc('\n', stdout);
free(buf);
return 0; return 0;
} }
@ -125,8 +126,7 @@ int main(int argc, char * argv[])
case 'w': case 'w':
prefs.width = strtol(optarg, &p, 10); prefs.width = strtol(optarg, &p, 10);
if(optarg[0] == '\0' || *p != '\0' if(optarg[0] == '\0' || *p != '\0'
|| prefs.width <= 0 || prefs.width <= 0)
|| prefs.width > 512)
return _usage(); return _usage();
break; break;
default: default: