Merge commit 'fml/master'

diff --git a/audiod.c b/audiod.c
index dab3e3dad7dfffa3ee5733355489b04f1762a6fa..6477c5474b60d83d557bce7239a5ac31451491de 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1126,10 +1126,10 @@ int main(int argc, char *argv[])
        valid_fd_012();
        audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);
-       drop_privileges_or_die(conf.user_arg, conf.group_arg);
-       parse_config_or_die();
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);
+       parse_config_or_die();
        daemon_set_flag(DF_LOG_TIME);
        daemon_set_flag(DF_LOG_HOSTNAME);
        daemon_set_flag(DF_LOG_LL);

diff --git a/color.c b/color.c
index bd09446c17ef9a7654b65960e165c85c14d7097b..d6abf13d717281705bde7671715095cf8da1666e 100644 (file)
--- a/color.c
+++ b/color.c
@@ -68,11 +68,11 @@ int color_parse(const char *value, char *dst)
                const char *word = ptr;
                int val, len = 0;
 
-               while (word[len] && !isspace(word[len]))
+               while (word[len] && !para_isspace(word[len]))
                        len++;
 
                ptr = word + len;
-               while (*ptr && isspace(*ptr))
+               while (*ptr && para_isspace(*ptr))
                        ptr++;
 
                val = parse_color(word, len);

diff --git a/ggo/makefile b/ggo/makefile
index 4988d6fef5635aae574af3e283c3eab31a1026f9..132ea60ee83ee99ef3f4edb9923aa95c963553ba 100644 (file)
--- a/ggo/makefile
+++ b/ggo/makefile
@@ -66,4 +66,4 @@ $(ggo_dir)/write.ggo: $(ggo_dir)/loglevel.m4
 $(ggo_dir)/client.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/config_file.m4
 
 $(ggo_dir)/%.ggo: $(ggo_dir)/%.m4 $(ggo_dir)/header.m4
-       (cd $(ggo_dir) && m4 $(<F)) > $@
+       cd $(ggo_dir); m4 $(<F) > $(@F)

diff --git a/gui.c b/gui.c
index 499845d9dadcdb6802b6ac49ab470d969729314c..0a8f081839b97f6b0aaaac7ce3cc9e3d2bc049d1 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1182,7 +1182,7 @@ static void com_ll_incr(void)
 {
        if (loglevel >= LL_EMERG) {
                print_in_bar(COLOR_ERRMSG,
-                       "loglevel already at miminal verbosity\n");
+                       "loglevel already at minimal verbosity\n");
                return;
        }
        loglevel++;

diff --git a/osx_write.c b/osx_write.c
index f67a63ac1cae42eea3e7a4776e3b3353aadfedcb..df10221feee218a8f8c5ebe012de724b9228b624 100644 (file)
--- a/osx_write.c
+++ b/osx_write.c
@@ -19,6 +19,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "osx_write.cmdline.h"
 #include "error.h"