 @@ -1,14 +1,14 @@
-/*	$NetBSD: midiplay.c,v 1.28 2011/08/14 13:26:23 christos Exp $	*/
+/*	$NetBSD: midiplay.c,v 1.29 2011/11/25 01:39:47 jmcneill Exp $	*/
 /*
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (augustss@NetBSD.org).
+ *
  * 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.
 @@ -21,34 +21,36 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: midiplay.c,v 1.28 2011/08/14 13:26:23 christos Exp $");
+__RCSID("$NetBSD: midiplay.c,v 1.29 2011/11/25 01:39:47 jmcneill Exp $");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/midiio.h>
 #define DEVMUSIC "/dev/music"
 struct track {
 	struct track *indirect; /* for fast swaps in heap code */
 	u_char *start, *end;
 	u_long delta;
 @@ -386,32 +388,39 @@ playfile(FILE *f, const char *name)
 		buf = nbuf;
 		size *= 2;
+	}
 	playdata(buf, tot, name);
 	free(buf);
+}
 static void
 playdata(u_char *buf, u_int tot, const char *name)
+{
 	int format, ntrks, divfmt, ticks, t;
 	u_int len, mlen, status, chan;
 	u_char *p, *end, byte, meta, *msg;
 	struct synth_info info;
 	struct track *tracks;
 	struct track *tp;
 	/* verify that the requested midi unit exists */
 	info.device = unit;
 	if (ioctl(fd, SEQUENCER_INFO, &info) < 0)
 		err(1, "ioctl(SEQUENCER_INFO) failed");
 	end = buf + tot;
 	if (verbose)
-		printf("Playing %s (%d bytes) ... \n", name, tot);
+		printf("Playing %s (%d bytes) on %s (unit %d)... \n",
 		    name, tot, info.name, info.device);
 	if (tot < MARK_LEN + 4) {
 		warnx("Not a MIDI file, too short");
 		return;
+	}
 	if (memcmp(buf, RMID_SIG, MARK_LEN) == 0) {
 		u_char *eod;
 		/* Detected a RMID file, let's just check if it's
 		 * a MIDI file */
 		if ((u_int)GET32_LE(buf + MARK_LEN) != tot - 8) {
 			warnx("Not a RMID file, bad header");
 			return;
 @@ -669,45 +678,65 @@ playdata(u_char *buf, u_int tot, const c
 			if (0 == ntrks)
 				break;
 		} else
 			tp->delta = getvar(tp);
 		Heapify(tracks, ntrks, 0);
+	}
 	if (ioctl(fd, SEQUENCER_SYNC, 0) < 0)
 		err(1, "SEQUENCER_SYNC");
  ret:
 	free(tracks);
+}
 static int
 parse_unit(const char *sunit)
+{
 	const char *osunit = sunit;
 	long n;
 	char *ep;
 	if (strncmp(sunit, "midi", strlen("midi")) == 0)
 		sunit += strlen("midi");
 	errno = 0;
 	n = strtol(sunit, &ep, 10);
 	if (n < 0 || n > INT_MAX || *ep != '\0' ||
 	    (errno == ERANGE &&
 	    (n == LONG_MAX || n == LONG_MIN)))
 		errx(1, "bad midi unit -- %s", osunit);
 	return (int)n;
+}
 int
 main(int argc, char **argv)
+{
 	int ch;
 	int listdevs = 0;
 	int example = 0;
 	int nmidi;
 	const char *file = DEVMUSIC;
 	const char *sunit;
 	struct synth_info info;
 	FILE *f;
 	if ((sunit = getenv("MIDIUNIT")))
-		unit = atoi(sunit);
+		unit = parse_unit(sunit);
 	while ((ch = getopt(argc, argv, "?d:f:lmp:qt:vx")) != -1) {
 		switch(ch) {
 		case 'd':
-			unit = atoi(optarg);
+			unit = parse_unit(optarg);
 			break;
 		case 'f':
 			file = optarg;
 			break;
 		case 'l':
 			listdevs++;
 			break;
 		case 'm':
 			showmeta++;
 			break;
 		case 'p':
 			sameprogram = atoi(optarg);
 			break;