Wed Jun 8 13:51:13 2011 UTC ()

err -> errx where appropriate


(yamt)

diff -r1.19 -r1.20 src/usr.bin/script/script.c

--- src/usr.bin/script/script.c 2009/10/17 22:36:23	1.19
+++ src/usr.bin/script/script.c 2011/06/08 13:51:13	1.20

 @@ -1,14 +1,14 @@
-/*	$NetBSD: script.c,v 1.19 2009/10/17 22:36:23 christos Exp $	*/
+/*	$NetBSD: script.c,v 1.20 2011/06/08 13:51:13 yamt Exp $	*/
 /*
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: script.c,v 1.19 2009/10/17 22:36:23 christos Exp $");
+__RCSID("$NetBSD: script.c,v 1.20 2011/06/08 13:51:13 yamt Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -375,27 +375,27 @@ playback(FILE *fp)
 	for (nread = 0; !reg || nread < pst.st_size; nread += save_len) {
 		if (fread(&stamp, sizeof(stamp), 1, fp) != 1) {
 			if (reg)
 				err(1, "reading playback header");
 			else
 				break;
+		}
 		swapstamp(stamp);
 		save_len = sizeof(stamp);
 		if (reg && stamp.scr_len >
 		    (uint64_t)(pst.st_size - save_len) - nread)
-			err(1, "invalid stamp");
+			errx(1, "invalid stamp");
 		save_len += stamp.scr_len;
 		tclock = stamp.scr_sec;
 		tso.tv_sec = stamp.scr_sec;
 		tso.tv_nsec = stamp.scr_usec * 1000;
 		switch (stamp.scr_direction) {
 		case 's':
 			if (!quiet)
 			    (void)printf("Script started on %s",
 				ctime(&tclock));
 			tsi = tso;
 			(void)consume(fp, stamp.scr_len, buf, reg);
 @@ -420,19 +420,19 @@ playback(FILE *fp)
 			if (usesleep)
 				(void)nanosleep(&tsi, NULL);
 			tsi = tso;
 			while (stamp.scr_len > 0) {
 				l = MIN(DEF_BUF, stamp.scr_len);
 				if (fread(buf, sizeof(char), l, fp) != l)
 					err(1, "cannot read buffer");
 				(void)write(STDOUT_FILENO, buf, l);
 				stamp.scr_len -= l;
+			}
 			break;
 		default:
-			err(1, "invalid direction");
+			errx(1, "invalid direction");
+		}
+	}
 	(void)fclose(fp);
 	exit(0);
+}