d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

head: fix style nits

Browse Source 
No functional change intended.

Reviewed by:	emaste
MFC after:	3 weeks
Differential Revision:	https://reviews.freebsd.org/D14498
This commit is contained in:
Mariusz Zaborski 2018-11-12 16:44:26 +00:00
parent 389474c122
commit 509111af21
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340370
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/head/head.c
View File

@ -75,14 +75,17 @@ static const struct option long_opts[] =
int
main(int argc, char *argv[])
{
int ch;
FILE *fp;
int first, linecnt = -1, eval = 0;
off_t bytecnt = -1;
char *ep;
off_t bytecnt;
int ch, first, linecnt, eval;
linecnt = -1;
eval = 0;
bytecnt = -1;
obsolete(argv);
while ((ch = getopt_long(argc, argv, "+n:c:", long_opts, NULL)) != -1)
while ((ch = getopt_long(argc, argv, "+n:c:", long_opts, NULL)) != -1) {
switch(ch) {
case 'c':
bytecnt = strtoimax(optarg, &ep, 10);
@ -97,16 +100,18 @@ main(int argc, char *argv[])
case '?':
default:
usage();
/* NOTREACHED */
}
}
argc -= optind;
argv += optind;
if (linecnt != -1 && bytecnt != -1)
errx(1, "can't combine line and byte counts");
if (linecnt == -1 )
if (linecnt == -1)
linecnt = 10;
if (*argv) {
for (first = 1; *argv; ++argv) {
if (*argv != NULL) {
for (first = 1; *argv != NULL; ++argv) {
if ((fp = fopen(*argv, "r")) == NULL) {
warn("%s", *argv);
eval = 1;
@ -137,7 +142,7 @@ head(FILE *fp, int cnt)
char *cp;
size_t error, readlen;
while (cnt && (cp = fgetln(fp, &readlen)) != NULL) {
while (cnt != 0 && (cp = fgetln(fp, &readlen)) != NULL) {
error = fwrite(cp, sizeof(char), readlen, stdout);
if (error != readlen)
err(1, "stdout");