diff options
| author | Xavier Beaudouin <xavier.beaudouin@klarasystems.com> | 2024-04-26 16:10:15 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2024-04-29 05:29:02 +0000 |
| commit | fb4c7bf8ac2d72c3f886ef3f8317a8400c2a96d8 (patch) | |
| tree | 08e15d7cd55adf42141a9ea5997f99293bafa9de /usr.bin/script/script.c | |
| parent | 3e498912702094b35f61fd86e557c4f4148aead8 (diff) | |
Diffstat (limited to 'usr.bin/script/script.c')
| -rw-r--r-- | usr.bin/script/script.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index b3a1869fcb42..3d82bad9ae2b 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #include <sys/endian.h> #include <dev/filemon/filemon.h> +#include <assert.h> #include <err.h> #include <errno.h> #include <fcntl.h> @@ -123,19 +124,19 @@ main(int argc, char *argv[]) usesleep = 1; rawout = 0; flushtime = 30; - fm_fd = -1; /* Shut up stupid "may be used uninitialized" GCC - warning. (not needed w/clang) */ + fm_fd = -1; showexit = 0; while ((ch = getopt(argc, argv, "adeFfkpqrT:t:")) != -1) - switch(ch) { + switch (ch) { case 'a': aflg = 1; break; case 'd': usesleep = 0; break; - case 'e': /* Default behavior, accepted for linux compat */ + case 'e': + /* Default behavior, accepted for linux compat. */ break; case 'F': Fflg = 1; @@ -248,6 +249,8 @@ main(int argc, char *argv[]) (void)tcsetattr(STDIN_FILENO, TCSAFLUSH, &rtt); } + assert(fflg ? fm_fd >= 0 : fm_fd < 0); + child = fork(); if (child < 0) { warn("fork"); @@ -340,7 +343,7 @@ main(int argc, char *argv[]) } } if (n > 0 && FD_ISSET(master, &rfd)) { - cc = read(master, obuf, sizeof (obuf)); + cc = read(master, obuf, sizeof(obuf)); if (cc <= 0) break; (void)write(STDOUT_FILENO, obuf, cc); @@ -426,7 +429,7 @@ done(int eno) if (showexit) (void)fprintf(fscript, "\nCommand exit status:" " %d", eno); - (void)fprintf(fscript,"\nScript done on %s", + (void)fprintf(fscript, "\nScript done on %s", ctime(&tvec)); } (void)printf("\nScript done, output file is %s\n", fname); @@ -468,8 +471,7 @@ consume(FILE *fp, off_t len, char *buf, int reg) if (reg) { if (fseeko(fp, len, SEEK_CUR) == -1) err(1, NULL); - } - else { + } else { while (len > 0) { l = MIN(DEF_BUF, len); if (fread(buf, sizeof(char), l, fp) != l) |