RepoMirrors
/
k9core
mirror of https://git.qorg11.net/k9core.git

wc prints the filename

This commit is contained in:
qorg11 2020-08-29 00:20:17 +02:00
parent 21718a0a61
commit ea00641408
No known key found for this signature in database
GPG Key ID: 343FC20A4ACA62B9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wc.c
View File

@ -11,7 +11,6 @@ struct wc_values
int lines; int lines;
int bytes; int bytes;
int words; int words;
char *filename;
}; };
struct wc_values struct wc_values
@ -42,7 +41,7 @@ wc(FILE *file)
return foobar; return foobar;
} }
void void
print_values() print_values(const char*filename)
{ {
if(show_bytes && show_lines && show_words) if(show_bytes && show_lines && show_words)
printf("%i %i %i", printf("%i %i %i",
@ -58,7 +57,7 @@ print_values()
if(!show_bytes) if(!show_bytes)
printf("%i ",data.bytes); printf("%i ",data.bytes);
} }
printf("\n"); printf(" %s\n",filename);
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
@ -89,7 +88,7 @@ main(int argc, char *argv[])
if(optind == argc) if(optind == argc)
{ {
data = wc(stdin); data = wc(stdin);
print_values(); print_values("stdin");
} }
else for(int i = optind; i<argc; i++) else for(int i = optind; i<argc; i++)
{ {
@ -97,7 +96,7 @@ main(int argc, char *argv[])
data = wc(stdin); data = wc(stdin);
else else
data = wc(fopen(argv[i],"r")); data = wc(fopen(argv[i],"r"));
print_values(); print_values(argv[i]);
} }
return 0; return 0;
} }