mirror of https://github.com/ericonr/sndio.git
don't require -U to precede -L
This commit is contained in:
parent
cac23d61dc
commit
2009e44d9d
|
@ -291,9 +291,6 @@ used in
|
||||||
.Xr sndio 7
|
.Xr sndio 7
|
||||||
device names.
|
device names.
|
||||||
The default is 0.
|
The default is 0.
|
||||||
The unit number must be set before any
|
|
||||||
.Fl L
|
|
||||||
is used.
|
|
||||||
.It Fl v Ar volume
|
.It Fl v Ar volume
|
||||||
Software volume attenuation of playback.
|
Software volume attenuation of playback.
|
||||||
The value must be between 1 and 127,
|
The value must be between 1 and 127,
|
||||||
|
|
|
@ -346,6 +346,10 @@ main(int argc, char **argv)
|
||||||
struct port *p;
|
struct port *p;
|
||||||
struct listen *l;
|
struct listen *l;
|
||||||
struct passwd *pw;
|
struct passwd *pw;
|
||||||
|
struct tcpaddr {
|
||||||
|
char *host;
|
||||||
|
struct tcpaddr *next;
|
||||||
|
} *tcpaddr_list = NULL, *ta;
|
||||||
|
|
||||||
atexit(log_flush);
|
atexit(log_flush);
|
||||||
|
|
||||||
|
@ -379,14 +383,15 @@ main(int argc, char **argv)
|
||||||
background = 0;
|
background = 0;
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
if (listen_list)
|
|
||||||
errx(1, "-U must come before -L");
|
|
||||||
unit = strtonum(optarg, 0, 15, &str);
|
unit = strtonum(optarg, 0, 15, &str);
|
||||||
if (str)
|
if (str)
|
||||||
errx(1, "%s: unit number is %s", optarg, str);
|
errx(1, "%s: unit number is %s", optarg, str);
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
listen_new_tcp(optarg, AUCAT_PORT + unit);
|
ta = xmalloc(sizeof(struct tcpaddr));
|
||||||
|
ta->host = optarg;
|
||||||
|
ta->next = tcpaddr_list;
|
||||||
|
tcpaddr_list = ta;
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
mode = opt_mode();
|
mode = opt_mode();
|
||||||
|
@ -479,6 +484,8 @@ main(int argc, char **argv)
|
||||||
getbasepath(base, sizeof(base));
|
getbasepath(base, sizeof(base));
|
||||||
snprintf(path, SOCKPATH_MAX, "%s/" SOCKPATH_FILE "%u", base, unit);
|
snprintf(path, SOCKPATH_MAX, "%s/" SOCKPATH_FILE "%u", base, unit);
|
||||||
listen_new_un(path);
|
listen_new_un(path);
|
||||||
|
for (ta = tcpaddr_list; ta != NULL; ta = ta->next)
|
||||||
|
listen_new_tcp(ta->host, AUCAT_PORT + unit);
|
||||||
if (geteuid() == 0) {
|
if (geteuid() == 0) {
|
||||||
if ((pw = getpwnam(SNDIO_USER)) == NULL)
|
if ((pw = getpwnam(SNDIO_USER)) == NULL)
|
||||||
errx(1, "unknown user %s", SNDIO_USER);
|
errx(1, "unknown user %s", SNDIO_USER);
|
||||||
|
|
Loading…
Reference in New Issue