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

Fix -t and -l with less than 11 lines

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

10
src/pr.c
View File

@ -67,7 +67,7 @@ static int _pr_do(Prefs * prefs, FILE * fp, char const * filename)
return _pr_error("malloc", 1); return _pr_error("malloc", 1);
while(fgets(buf, prefs->width, fp) != NULL) while(fgets(buf, prefs->width, fp) != NULL)
{ {
if(nb == 0 && !(prefs->flags & PREFS_t)) if(nb == 0 && !(prefs->flags & PREFS_t) && prefs->lines > 10)
{ {
printf("\n\n%s\n\n\n", filename); printf("\n\n%s\n\n\n", filename);
nb = 5; nb = 5;
@ -76,14 +76,16 @@ static int _pr_do(Prefs * prefs, FILE * fp, char const * filename)
buf[len - 1] = '\0'; buf[len - 1] = '\0';
fputs(buf, stdout); fputs(buf, stdout);
fputc('\n', stdout); fputc('\n', stdout);
if(nb++ == prefs->lines && !(prefs->flags & PREFS_t)) if(nb++ == prefs->lines && prefs->lines > 10
&& !(prefs->flags & PREFS_t))
{ {
fputs("\n\n\n\n\n\n", stdout); fputs("\n\n\n\n\n\n", stdout);
nb = 0; nb = 0;
} }
} }
for(; nb != prefs->lines; nb++) if(prefs->lines > 10 && !(prefs->flags & PREFS_t))
fputc('\n', stdout); for(; nb != prefs->lines; nb++)
fputc('\n', stdout);
free(buf); free(buf);
return 0; return 0;
} }