 @@ -1,107 +1,107 @@
-/*	$NetBSD: h_intr.c,v 1.4 2021/07/09 20:00:26 kre Exp $	*/
+/*	$NetBSD: h_intr.c,v 1.5 2021/07/10 07:50:20 christos Exp $	*/
 /**
  * Test of interrupted I/O to popen()ed commands.
+ *
  * Example 1:
  * ./h_intr -c "gzip -t" *.gz
+ *
  * Example 2:
  * while :; do ./h_intr -b $((12*1024)) -t 10 -c "bzip2 -t" *.bz2; sleep 2; done
+ *
  * Example 3:
  * Create checksum file:
  * find /mnt -type f -exec sha512 -n {} + >SHA512
+ *
  * Check program:
  * find /mnt -type f -exec ./h_intr -b 512 -c run.sh {} +
+ *
  * ./run.sh:
 	#!/bin/sh
 	set -eu
 	grep -q "^$(sha512 -q)" SHA512
+ *
  * Author: RVP at sdf.org
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: h_intr.c,v 1.4 2021/07/09 20:00:26 kre Exp $");
+__RCSID("$NetBSD: h_intr.c,v 1.5 2021/07/10 07:50:20 christos Exp $");
 #include <time.h>
 #include <err.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <libgen.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 static bool process(const char *fn);
 ssize_t maxread(FILE *fp, void *buf, size_t size);
 ssize_t smaxread(FILE *fp, void *buf, size_t size);
 ssize_t maxwrite(FILE *fp, const void *buf, size_t size);
 ssize_t smaxwrite(FILE *fp, const void *buf, size_t size);
 static int rndbuf(void);
 static int rndmode(void);
 static sig_t xsignal(int signo, sig_t handler);
 static void alarmtimer(int wait);
 static void pr_star(int signo);
-static int do_opts(int argc, char* argv[]);
+static int do_opts(int argc, char *argv[]);
 static void usage(FILE *fp);
 /* Globals */
 static struct options {
-	const char* cmd;	/* cmd to run (which must read from stdin) */
+	const char *cmd;	/* cmd to run (which must read from stdin) */
 	size_t bsize;		/* block size to use */
 	size_t asize;		/* alt. stdio buffer size */
 	int btype;		/* buffering type: _IONBF, ... */
 	int tmout;		/* alarm timeout */
 	int flush;		/* call fflush() after write if 1 */
 	int rndbuf;		/* switch buffer randomly if 1 */
 	int rndmod;		/* switch buffering modes randomly if 1 */
 } opts;
 static const struct {
 	const char *name;
 	int value;
 } btypes[] = {
 	{ "IONBF", _IONBF },
 	{ "IOLBF", _IOLBF },
 	{ "IOFBF", _IOFBF },
 };
 static void (*alarm_fn)(int);				/* real/dummy alarm fn. */
 static int (*sintr_fn)(int, int);			/*  " siginterrupt fn. */
-static ssize_t (*rd_fn)(FILE*, void*, size_t);		/* read fn. */
+static ssize_t (*rd_fn)(FILE *, void *, size_t);	/* read fn. */
-static ssize_t (*wr_fn)(FILE*, const void*, size_t);	/* write fn. */
+static ssize_t (*wr_fn)(FILE *, const void *, size_t);	/* write fn. */
 enum {
 	MB = 1024 * 1024,	/* a megabyte */
 	BSIZE = 16 * 1024,	/* default RW buffer size */
 	DEF_MS = 100,		/* interrupt 10x a second */
 	MS = 1000,		/* msecs. in a second */
 };
 /**
  * M A I N
  */
 int
-main(int argc, char* argv[])
+main(int argc, char *argv[])
+{
 	int i, rc = EXIT_SUCCESS;
 	i = do_opts(argc, argv);
 	argc -= i;
 	argv += i;
 	if (argc == 0) {
 		usage(stderr);
 		return rc;
+	}
 	xsignal(SIGPIPE, SIG_IGN);
 @@ -195,55 +195,55 @@ process(const char *fn)
 		rc = true;
 fail:
 	free(abuf);
 	free(buf);
 	return rc;
+}
 /**
  * maxread - syscall version
  */
 ssize_t
-smaxread(FILE* fp, void* buf, size_t size)
+smaxread(FILE* fp, void *buf, size_t size)
+{
-	char* p = buf;
+	char *p = buf;
 	ssize_t nrd = 0;
 	ssize_t n;
 	while (size > 0) {
 		n = read(fileno(fp), p, size);
 		if (n < 0) {
 			if (errno == EINTR)
 				continue;
 			else
 				return -1;
 		} else if (n == 0)
 			break;
 		p += n;
 		nrd += n;
 		size -= n;
+	}
 	return nrd;
+}
 /**
  * maxread - stdio version
  */
 ssize_t
-maxread(FILE* fp, void* buf, size_t size)
+maxread(FILE* fp, void *buf, size_t size)
+{
-	char* p = buf;
+	char *p = buf;
 	ssize_t nrd = 0;
 	size_t n;
 	while (size > 0) {
 		errno = 0;
 		n = fread(p, 1, size, fp);
 		if (n == 0) {
 			printf("ir.");
 			fflush(stdout);
 			if (errno == EINTR)
 				continue;
 			if (feof(fp) || nrd > 0)
 				break;
 @@ -252,54 +252,54 @@ maxread(FILE* fp, void* buf, size_t size
 		if (n != size)
 			clearerr(fp);
 		p += n;
 		nrd += n;
 		size -= n;
+	}
 	return nrd;
+}
 /**
  * maxwrite - syscall version
  */
 ssize_t
-smaxwrite(FILE* fp, const void* buf, size_t size)
+smaxwrite(FILE* fp, const void *buf, size_t size)
+{
-	const char* p = buf;
+	const char *p = buf;
 	ssize_t nwr = 0;
 	ssize_t n;
 	while (size > 0) {
 		n = write(fileno(fp), p, size);
 		if (n <= 0) {
 			if (errno == EINTR)
 				n = 0;
 			else
 				return -1;
+		}
 		p += n;
 		nwr += n;
 		size -= n;
+	}
 	return nwr;
+}
 /**
  * maxwrite - stdio version (warning: substrate may be buggy)
  */
 ssize_t
-maxwrite(FILE* fp, const void* buf, size_t size)
+maxwrite(FILE* fp, const void *buf, size_t size)
+{
-	const char* p = buf;
+	const char *p = buf;
 	ssize_t nwr = 0;
 	size_t n;
 	while (size > 0) {
 		errno = 0;
 		n = fwrite(p, 1, size, fp);
 		if (n == 0) {
 			printf("iw.");
 			fflush(stdout);
 			if (errno == EINTR)
 				continue;
 			if (nwr > 0)
 				break;
 @@ -402,27 +402,27 @@ isvalid(const char *s)
 	return strspn(s, " \t") != strlen(s);
+}
 static const char *
 btype2str(int val)
+{
 	for (size_t i = 0; i < __arraycount(btypes); i++)
 		if (btypes[i].value == val)
 			return btypes[i].name;
 	return "*invalid*";
+}
 static int
-str2btype(const char* s)
+str2btype(const char *s)
+{
 	for (size_t i = 0; i < __arraycount(btypes); i++)
 		if (strcmp(btypes[i].name, s) == 0)
 			return btypes[i].value;
 	return EOF;
+}
 /**
  * Print usage information.
  */
 static void
 usage(FILE* fp)
+{