diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-08 18:05:23 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-08 18:05:23 +0000 |
commit | 66d93438b1666f17c65a937a171687938361710d (patch) | |
tree | 97bf444e7c3ed3415a6fc0740a5162d3da3f1a29 | |
parent | 95d13d1b02e0280679959d1f5e5eff693d259ad6 (diff) | |
download | src-66d93438b1666f17c65a937a171687938361710d.tar.gz src-66d93438b1666f17c65a937a171687938361710d.zip |
Record command exit status in the typescript file when running simple commands.
Also capitalize 'command:'.
Relnotes: yes
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=296526
-rw-r--r-- | usr.bin/script/script.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 4c5e40273199..6ffb46ab99ff 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -74,7 +74,7 @@ static int child; static const char *fname; static char *fmfname; static int fflg, qflg, ttyflg; -static int usesleep, rawout; +static int usesleep, rawout, showexit; static struct termios tt; @@ -107,6 +107,7 @@ main(int argc, char *argv[]) flushtime = 30; fm_fd = -1; /* Shut up stupid "may be used uninitialized" GCC warning. (not needed w/clang) */ + showexit = 0; while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1) switch(ch) { @@ -198,7 +199,8 @@ main(int argc, char *argv[]) (void)fprintf(fscript, "Script started on %s", ctime(&tvec)); if (argv[0]) { - fprintf(fscript, "command: "); + showexit = 1; + fprintf(fscript, "Command: "); for (k = 0 ; argv[k] ; ++k) fprintf(fscript, "%s%s", k ? " " : "", argv[k]); @@ -360,9 +362,13 @@ done(int eno) if (rawout) record(fscript, NULL, 0, 'e'); if (!qflg) { - if (!rawout) + if (!rawout) { + if (showexit) + (void)fprintf(fscript, "\nCommand exit status:" + " %d", eno); (void)fprintf(fscript,"\nScript done on %s", ctime(&tvec)); + } (void)printf("\nScript done, output file is %s\n", fname); if (fflg) { (void)printf("Filemon done, output file is %s\n", |