Since there's no sndiod -> aucat link anymore, allow aucat to be run

in server mode even when not invoked as sndiod. This allows aucat and
the new sndiod daemon to live together in /usr/bin, which makes easy
to quickly compare sndiod and aucat (and spot possible regressions)
without having to modify /usr/bin.

1 files changed, 4 insertions, 4 deletions

diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c
index db6aeae504e..1665e0f8432 100644
--- a/usr.bin/aucat/aucat.c
+++ b/usr.bin/aucat/aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aucat.c,v 1.139 2012/10/27 08:39:03 ratchov Exp $	*/
+/*	$OpenBSD: aucat.c,v 1.140 2012/11/23 07:15:47 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -97,7 +97,7 @@ volatile sig_atomic_t debug_level = 1;
 #endif
 volatile sig_atomic_t quit_flag = 0;
 
-char aucat_usage[] = "usage: " PROG_AUCAT " [-dn] [-b nframes] "
+char aucat_usage[] = "usage: " PROG_AUCAT " [-dlMn] [-a flag] [-b nframes] "
     "[-C min:max] [-c min:max] [-e enc]\n\t"
     "[-f device] [-h fmt] [-i file] [-j flag] [-m mode] [-o file]\n\t"
     "[-q port] [-r rate] [-t mode] [-v volume] [-w flag] [-x policy]\n\t"
@@ -428,13 +428,13 @@ main(int argc, char **argv)
 	else
 		prog++;
 	if (strcmp(prog, PROG_AUCAT) == 0) {
-		optstr = "b:c:C:de:f:h:i:j:m:no:q:r:t:v:w:x:z:";
+ 		optstr = "a:b:c:C:de:f:h:i:j:lL:m:Mno:q:r:s:t:U:v:w:x:z:";
 		usagestr = aucat_usage;
+		hold = 1;
 	} else if (strcmp(prog, PROG_SNDIOD) == 0) {
 		optstr = "a:b:c:C:de:f:j:L:m:Mq:r:s:t:U:v:w:x:z:";
 		usagestr = sndiod_usage;
 		background = 1;
-		hold = 0;
 	} else
 		errx(1, "%s: can't determine program to run", prog);