From: Andre Noll <maan@systemlinux.org>
Date: Mon, 26 Jan 2009 19:38:08 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.3.4~73
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=85663a14da08f4f8782d29a3b0c51de5cd0817b1;hp=70d421705c23f15188808f5435b03583bd613485

Merge commit 'fml/master'
---

diff --git a/audiod.c b/audiod.c
index dab3e3da..6477c547 100644
--- 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 bd09446c..d6abf13d 100644
--- 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 4988d6fe..132ea60e 100644
--- 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 499845d9..0a8f0818 100644
--- 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 f67a63ac..df10221f 100644
--- 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"