/*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*/
void *check_writer_arg_or_die(const char *wa, int *writer_num)
{
- int i;
-
+ int i, ret, argc;
+ const char *cmdline;
+ char **argv;
+ void *conf;
+
+ if (!wa || !*wa) {
+ i = DEFAULT_WRITER;
+ cmdline = NULL;
+ goto check;
+ }
PARA_INFO_LOG("checking %s\n", wa);
FOR_EACH_WRITER(i) {
const char *name = writer_names[i];
size_t len = strlen(name);
char c;
+
if (strlen(wa) < len)
continue;
if (strncmp(name, wa, len))
continue;
c = wa[len];
- if (c && c != ' ')
- continue;
- *writer_num = i;
- return writers[i].parse_config_or_die(c? wa + len + 1 : "");
+ if (!c || c == ' ') {
+ cmdline = c? wa + len + 1 : NULL;
+ goto check;
+ }
}
PARA_EMERG_LOG("invalid writer %s\n", wa);
exit(EXIT_FAILURE);
+check:
+ ret = create_shifted_argv(cmdline, " \t", &argv);
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s: %s\n", wa, para_strerror(-ret));
+ exit(EXIT_FAILURE);
+ }
+ argc = ret;
+ argv[0] = make_message("%s_write", writer_names[i]);
+ *writer_num = i;
+ conf = writers[i].parse_config_or_die(argc, argv);
+ free_argv(argv);
+ return conf;
}
/**