mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
pactl: fix getopt indexing for set-*-volume
When pactl is invoked with any options or the -- specifier, optind will be > 1. Therefore using a static 3 value is wrong. Use optind+2 as both offset and count difference. Bug-Debian: http://bugs.debian.org/774810
This commit is contained in:
parent
ce950b150d
commit
4edc15346b
1 changed files with 4 additions and 4 deletions
|
|
@ -1897,7 +1897,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
sink_name = pa_xstrdup(argv[optind+1]);
|
||||
|
||||
if (parse_volumes(argv+optind+2, argc-3) < 0)
|
||||
if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
|
||||
goto quit;
|
||||
|
||||
} else if (pa_streq(argv[optind], "set-source-volume")) {
|
||||
|
|
@ -1910,7 +1910,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
source_name = pa_xstrdup(argv[optind+1]);
|
||||
|
||||
if (parse_volumes(argv+optind+2, argc-3) < 0)
|
||||
if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
|
||||
goto quit;
|
||||
|
||||
} else if (pa_streq(argv[optind], "set-sink-input-volume")) {
|
||||
|
|
@ -1926,7 +1926,7 @@ int main(int argc, char *argv[]) {
|
|||
goto quit;
|
||||
}
|
||||
|
||||
if (parse_volumes(argv+optind+2, argc-3) < 0)
|
||||
if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
|
||||
goto quit;
|
||||
|
||||
} else if (pa_streq(argv[optind], "set-source-output-volume")) {
|
||||
|
|
@ -1942,7 +1942,7 @@ int main(int argc, char *argv[]) {
|
|||
goto quit;
|
||||
}
|
||||
|
||||
if (parse_volumes(argv+optind+2, argc-3) < 0)
|
||||
if (parse_volumes(argv+optind+2, argc-(optind+2)) < 0)
|
||||
goto quit;
|
||||
|
||||
} else if (pa_streq(argv[optind], "set-sink-mute")) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue