[pulseaudio-commits] 2 commits - man/pulse-daemon.conf.5.xml.in src/utils

[Peter Meerwald]

 man/pulse-daemon.conf.5.xml.in |    4 ++--
 src/utils/pactl.c              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 997e369691496be4ecfe38e3516f7e007ed69a7b
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Tue Apr 15 10:58:21 2014 +0200

    pactl: Stop parsing option when the first non-option is encountered
    
    fix bug
    https://bugs.freedesktop.org/show_bug.cgi?id=77108
    
    see getopt(3):
    ""By default, getopt() permutes the contents of argv as it scans, so that
      eventually all the nonoptions are at the end.  Two other modes are also
      implemented.   If  the first character of optstring is '+' or the envi‐
      ronment variable POSIXLY_CORRECT is set, then option  processing  stops
      as soon as a nonoption argument is encountered.  If the first character
      of optstring is '-', then each nonoption argv-element is handled as  if
      it were the argument of an option with character code 1.  (This is used
      by programs that were written to expect options and other argv-elements
      in any order and that care about the ordering of the two.)  The special
      argument "--" forces an end of option-scanning regardless of the  scan‐
      ning mode.""
    
    prepend optstring with '+' to use POSIXLY_CORRECT mode
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 8483464..555cb48 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -1596,7 +1596,7 @@ int main(int argc, char *argv[]) {
 
     proplist = pa_proplist_new();
 
-    while ((c = getopt_long(argc, argv, "s:n:h", long_options, NULL)) != -1) {
+    while ((c = getopt_long(argc, argv, "+s:n:h", long_options, NULL)) != -1) {
         switch (c) {
             case 'h' :
                 help(bn);

commit 3ad4857070153d05a91c91c9c64a15c911b4b181
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Tue Apr 15 10:37:26 2014 +0200

    man: Fix typos in pulse-daemon.conf.5.xml.in
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 4aa5948..8bd076d 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -265,7 +265,7 @@ USA.
   <section name="Paths">
 
     <option>
-      <p><opt>dl-search-path=</opt> The path were to look for dynamic
+      <p><opt>dl-search-path=</opt> The path where to look for dynamic
       shared objects (DSOs/plugins). You may specify more than one
       path separated by colons. The default path depends on compile
       time settings. The <opt>--dl-search-path</opt> command line
@@ -326,7 +326,7 @@ USA.
     </option>
 
     <option>
-      <p><opt>log-time=</opt> With each logged messages log the
+      <p><opt>log-time=</opt> With each logged message log the
       relative time since startup. Defaults to <opt>no</opt>.</p>
     </option>