From: Keith Busch <keith.busch@intel.com>
Date: Tue, 1 Mar 2016 16:20:41 +0000 (-0700)
Subject: Consistent code formatting
X-Git-Tag: v0.4~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=171c41df0494760727feca3ffd1899d49ff41d54;p=users%2Fsagi%2Fnvme-cli.git

Consistent code formatting

Used 'indent -linux' to quickly convert code style to linux conventions.

Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/src/argconfig.c b/src/argconfig.c
index aef2f07b..b1da4a75 100644
--- a/src/argconfig.c
+++ b/src/argconfig.c
@@ -40,790 +40,819 @@
 #include <stdarg.h>
 #include <inttypes.h>
 
-static argconfig_help_func *help_funcs[MAX_HELP_FUNC] = {NULL};
+static argconfig_help_func *help_funcs[MAX_HELP_FUNC] = { NULL };
 
 char END_DEFAULT[] = "__end_default__";
 
 static int print_word_wrapped(const char *s, int indent, int start)
 {
-    const int width = 76;
-    const char *c, *t;
-    int next_space = -1;
-    int last_line = indent;
-
-    for (c = s; *c != 0; c++) {
-        if (*c == ' ' || next_space < 0) {
-            next_space = 0;
-            for (t = c+1; *t != 0 && *t != ' '; t++)
-                next_space++;
-            if ( ((int)(c-s)+start+next_space) > (last_line-indent+width)) {
-		int i;
-                last_line = (int) (c-s) + start;
-
-                putchar('\n');
-                for (i = 0; i < indent; i++)
-                    putchar(' ');
-
-                start = indent;
-                continue;
-            }
-        }
-
-        putchar(*c);
-    }
-
-    return (int) (c - s) + start - last_line + indent;
+	const int width = 76;
+	const char *c, *t;
+	int next_space = -1;
+	int last_line = indent;
+
+	for (c = s; *c != 0; c++) {
+		if (*c == ' ' || next_space < 0) {
+			next_space = 0;
+			for (t = c + 1; *t != 0 && *t != ' '; t++)
+				next_space++;
+			if (((int)(c - s) + start + next_space) >
+			    (last_line - indent + width)) {
+				int i;
+				last_line = (int)(c - s) + start;
+
+				putchar('\n');
+				for (i = 0; i < indent; i++)
+					putchar(' ');
+
+				start = indent;
+				continue;
+			}
+		}
+
+		putchar(*c);
+	}
+
+	return (int)(c - s) + start - last_line + indent;
 }
 
 const char *append_usage_str = "";
 
 void argconfig_append_usage(const char *str)
 {
-    append_usage_str = str;
+	append_usage_str = str;
 }
 
 void argconfig_print_help(char *command, const char *program_desc,
-                          const struct argconfig_commandline_options *options)
+			  const struct argconfig_commandline_options *options)
 {
-    const struct argconfig_commandline_options *s;
-    const int bufsize = 0x10000;
-    char buf[bufsize];
-    char *buf_end = buf;
-    char *last_help = NULL;
-    int last_len = 0;
-    int last_opt = 0;
-    int meta_len = 0;
-    int opt_len = 0;
-    int next = 0;
-    int i;
-
-    printf("\033[1mUsage: nvme %s /dev/nvmeX [OPTIONS] %s\n\n\033[0m", command, append_usage_str);
-    print_word_wrapped(program_desc, 0, 0);
-    printf("\n\n\033[1mOptions:\033[0m\n");
-
-    for (s = options; (s->option != 0) && (s != NULL); s++) {
-	next++;
-
-	meta_len = strlen(s->meta);
-	opt_len = strlen(s->option);
-
-	if (opt_len < 2) {
-		buf_end = stpcpy(buf_end, " -");
-		buf_end = stpcpy(buf_end, s->option);
-
-		if (meta_len > 1) {
-			buf_end = stpcpy(buf_end, " ");
-			buf_end = stpcpy(buf_end, s->meta);
+	const struct argconfig_commandline_options *s;
+	const int bufsize = 0x10000;
+	char buf[bufsize];
+	char *buf_end = buf;
+	char *last_help = NULL;
+	int last_len = 0;
+	int last_opt = 0;
+	int meta_len = 0;
+	int opt_len = 0;
+	int next = 0;
+	int i;
+
+	printf("\033[1mUsage: nvme %s /dev/nvmeX [OPTIONS] %s\n\n\033[0m",
+	       command, append_usage_str);
+	print_word_wrapped(program_desc, 0, 0);
+	printf("\n\n\033[1mOptions:\033[0m\n");
+
+	for (s = options; (s->option != 0) && (s != NULL); s++) {
+		next++;
+
+		meta_len = strlen(s->meta);
+		opt_len = strlen(s->option);
+
+		if (opt_len < 2) {
+			buf_end = stpcpy(buf_end, " -");
+			buf_end = stpcpy(buf_end, s->option);
+
+			if (meta_len > 1) {
+				buf_end = stpcpy(buf_end, " ");
+				buf_end = stpcpy(buf_end, s->meta);
+			}
+		} else {
+			buf_end = stpcpy(buf_end, "  [ --");
+			buf_end = stpcpy(buf_end, s->option);
+
+			if (meta_len > 1) {
+				buf_end = stpcpy(buf_end, "=");
+				buf_end = stpcpy(buf_end, s->meta);
+			}
+
+			last_opt = strlen(s->option);
+			last_len = last_opt + (meta_len * 2);
 		}
-	} else {
-		buf_end = stpcpy(buf_end, "  [ --");
-		buf_end = stpcpy(buf_end, s->option);
 
-		if (meta_len > 1) {
-			buf_end = stpcpy(buf_end, "=");
-			buf_end = stpcpy(buf_end, s->meta);
-		}
+		if ((options[next].option == NULL) || (opt_len < 2)) {
+			if (last_len < 10)
+				buf_end = stpcpy(buf_end, " ]\t\t\t");
+			else if (last_len < 18)
+				buf_end = stpcpy(buf_end, " ]\t\t");
+			else
+				buf_end = stpcpy(buf_end, " ]\t");
+		} else
+			buf_end = stpcpy(buf_end, ",");
+
+		/* -b should only be for --raw-binary */
+		if (!strcmp("b", s->option))
+			buf_end = stpcpy(buf_end, "\t");
+
+		if (s->help == NULL) {
+			continue;
+		} else if ((options[next].help == NULL)
+			   && strcmp(s->help, last_help)) {
+			buf_end = stpcpy(buf_end, "--- ");
+			buf_end = stpcpy(buf_end, s->help);
+			buf_end = stpcpy(buf_end, "\n");
+		} else if ((last_help != NULL) && !strcmp(s->help, last_help)) {
+			buf_end = stpcpy(buf_end, "--- ");
+			buf_end = stpcpy(buf_end, s->help);
+			buf_end = stpcpy(buf_end, "\n");
+			last_help = (char *)s->help;
+		} else
+			last_help = (char *)s->help;
+	}
 
-		last_opt = strlen(s->option);
-		last_len = last_opt + (meta_len * 2);
+	for (i = 0; i < MAX_HELP_FUNC; i++) {
+		if (help_funcs[i] == NULL)
+			break;
+		putchar('\n');
+		help_funcs[i] ();
 	}
 
-	if ((options[next].option == NULL) || (opt_len < 2)) {
-		if (last_len < 10)
-			buf_end = stpcpy(buf_end, " ]\t\t\t");
-		else if (last_len < 18)
-			buf_end = stpcpy(buf_end, " ]\t\t");
-		else
-			buf_end = stpcpy(buf_end, " ]\t");
-	} else
-		buf_end = stpcpy(buf_end, ",");
-
-	/* -b should only be for --raw-binary */
-	if (!strcmp("b", s->option))
-		buf_end = stpcpy(buf_end, "\t");
-
-	if (s->help == NULL) {
-		continue;
-	} else if ((options[next].help == NULL) && strcmp(s->help, last_help)) {
-		buf_end = stpcpy(buf_end, "--- ");
-		buf_end = stpcpy(buf_end, s->help);
-		buf_end = stpcpy(buf_end, "\n");
-	} else if ((last_help != NULL) && !strcmp(s->help, last_help)) {
-		buf_end = stpcpy(buf_end, "--- ");
-		buf_end = stpcpy(buf_end, s->help);
-		buf_end = stpcpy(buf_end, "\n");
-		last_help = (char *)s->help;
-	} else
-		last_help = (char *)s->help;
-    }
-
-    for (i = 0; i < MAX_HELP_FUNC; i++) {
-        if (help_funcs[i] == NULL) break;
-        putchar('\n');
-        help_funcs[i]();
-    }
-
-    /* actually print the contraption we just built */
-    printf("%s\n", buf);
+	/* actually print the contraption we just built */
+	printf("%s\n", buf);
 }
 
 int argconfig_parse(int argc, char *argv[], const char *program_desc,
-                    const struct argconfig_commandline_options *options,
-                    const void *config_default, void *config_out,
-                    size_t config_size)
+		    const struct argconfig_commandline_options *options,
+		    const void *config_default, void *config_out,
+		    size_t config_size)
 {
-    char *short_opts;
-    char *endptr;
-    struct option *long_opts;
-    const struct argconfig_commandline_options *s;
-    int c, i;
-    int option_index = 0;
-    int short_index = 0;
-    int options_count = 0;
-    void *value_addr;
-
-    errno = 0;
-
-    memcpy(config_out, config_default, config_size);
-
-    for (s = options; s->option != 0; s++)
-        options_count++;
-
-    long_opts = malloc(sizeof(struct option) * (options_count + 2));
-    short_opts = malloc(sizeof(*short_opts) * (options_count*2 + 4));
-    short_opts[short_index++] = '-';
-
-    for (s = options; (s->option != 0) && (option_index < options_count); s++) {
-        if (strlen(s->option) == 1) {
-            short_opts[short_index++] = s->option[0];
-            if (s->argument_type == required_argument) {
-                short_opts[short_index++] = ':';
-            }
-        }
-
-	long_opts[option_index].name    = s->option;
-	long_opts[option_index].has_arg = s->argument_type;
-
-	if (s->argument_type == no_argument && s->default_value != NULL) {
-		value_addr = (void *) ((char *) s->default_value -
-				       (char *) config_default +
-				       (char *) config_out);
-
-		long_opts[option_index].flag    = value_addr;
-		long_opts[option_index].val     = 1;
-	} else {
-		long_opts[option_index].flag    = NULL;
-		long_opts[option_index].val     = 0;
+	char *short_opts;
+	char *endptr;
+	struct option *long_opts;
+	const struct argconfig_commandline_options *s;
+	int c, i;
+	int option_index = 0;
+	int short_index = 0;
+	int options_count = 0;
+	void *value_addr;
+
+	errno = 0;
+
+	memcpy(config_out, config_default, config_size);
+
+	for (s = options; s->option != 0; s++)
+		options_count++;
+
+	long_opts = malloc(sizeof(struct option) * (options_count + 2));
+	short_opts = malloc(sizeof(*short_opts) * (options_count * 2 + 4));
+	short_opts[short_index++] = '-';
+
+	for (s = options; (s->option != 0) && (option_index < options_count);
+	     s++) {
+		if (strlen(s->option) == 1) {
+			short_opts[short_index++] = s->option[0];
+			if (s->argument_type == required_argument) {
+				short_opts[short_index++] = ':';
+			}
+		}
+
+		long_opts[option_index].name = s->option;
+		long_opts[option_index].has_arg = s->argument_type;
+
+		if (s->argument_type == no_argument && s->default_value != NULL) {
+			value_addr = (void *)((char *)s->default_value -
+					      (char *)config_default +
+					      (char *)config_out);
+
+			long_opts[option_index].flag = value_addr;
+			long_opts[option_index].val = 1;
+		} else {
+			long_opts[option_index].flag = NULL;
+			long_opts[option_index].val = 0;
+		}
+
+		option_index++;
 	}
 
+	long_opts[option_index].name = "help";
+	long_opts[option_index].flag = NULL;
+	long_opts[option_index].val = 0;
 	option_index++;
-    }
-
-    long_opts[option_index].name = "help";
-    long_opts[option_index].flag = NULL;
-    long_opts[option_index].val = 0;
-    option_index++;
-
-    long_opts[option_index].name = NULL;
-    long_opts[option_index].flag = NULL;
-    long_opts[option_index].val  = 0;
-
-    short_opts[short_index++] = '?';
-    short_opts[short_index++] = 'h';
-    short_opts[short_index] = 0;
-
-    int non_opt_args = 0;
-
-    while ((c = getopt_long_only(argc, argv, short_opts, long_opts,
-                                 &option_index)) != -1)
-    {
-        if (c == '?' || c == 'h' || c == ':' || (c == 0 &&
-             (!strcmp(long_opts[option_index].name, "h") ||
-              !strcmp(long_opts[option_index].name, "help") ||
-              !strcmp(long_opts[option_index].name, "-help"))) )
-        {
-            argconfig_print_help(argv[0], program_desc, options);
-            goto exit;
-        } else if (c == 1) {
-            argv[1+non_opt_args] = optarg;
-            non_opt_args++;
-            continue;
-        } else if (c){
-            for (option_index = 0; options[option_index].option[0] != c ||
-                 options[option_index].option[1] != 0; option_index++);
-
-            if (long_opts[option_index].flag != NULL)
-                *long_opts[option_index].flag = 1;
-        }
-
-        s = &options[option_index];
-
-        while(s->default_value == NULL) s++;
-
-        value_addr = (void *) ((char *) s->default_value -
-                               (char *) config_default +
-                               (char *) config_out);
-
-        if (s->config_type == CFG_STRING) {
-            *((char **) value_addr) = optarg;
-        } else if (s->config_type == CFG_SIZE) {
-            *((size_t *) value_addr) = strtol(optarg, &endptr, 0);
-            if (errno || optarg == endptr) {
-                fprintf(stderr, "Expected integer argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-        } else if (s->config_type == CFG_INT) {
-            *((int *) value_addr) = strtol(optarg, &endptr, 0);
-            if (errno || optarg == endptr) {
-                fprintf(stderr, "Expected integer argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-        } else if (s->config_type == CFG_BOOL) {
-            int tmp = strtol(optarg, &endptr, 0);
-            if (errno || tmp < 0 || tmp > 1 || optarg == endptr) {
-                fprintf(stderr, "Expected 0 or 1 argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-            *((int *) value_addr) = tmp;
-        } else if (s->config_type == CFG_BYTE) {
-            uint8_t tmp = strtol(optarg, &endptr, 0);
-            if (errno || tmp < 0 || optarg == endptr) {
-                fprintf(stderr, "Expected positive argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-            *((uint8_t *) value_addr) = tmp;
-        } else if (s->config_type == CFG_SHORT) {
-            uint16_t tmp = strtol(optarg, &endptr, 0);
-            if (errno || tmp < 0 || optarg == endptr) {
-                fprintf(stderr, "Expected positive argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-            *((uint16_t *) value_addr) = tmp;
-        } else if (s->config_type == CFG_POSITIVE) {
-            uint32_t tmp = strtol(optarg, &endptr, 0);
-            if (errno || tmp < 0 || optarg == endptr) {
-                fprintf(stderr, "Expected positive argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-            *((uint32_t *) value_addr) = tmp;
-        } else if (s->config_type == CFG_INCREMENT) {
-            (*((int *) value_addr))++;
-        } else if (s->config_type == CFG_LONG) {
-            *((long *) value_addr) = strtol(optarg, &endptr, 0);
-            if (errno || optarg == endptr) {
-                fprintf(stderr, "Expected long integer argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-        } else if (s->config_type == CFG_LONG_SUFFIX) {
-            *((long *) value_addr) = suffix_binary_parse(optarg);
-            if (errno) {
-                fprintf(stderr, "Expected long suffixed integer argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-        } else if (s->config_type == CFG_DOUBLE) {
-            *((double *) value_addr) = strtod(optarg, &endptr);
-            if (errno || optarg == endptr) {
-                fprintf(stderr, "Expected float argument for '%s' but got '%s'!\n",
-                        long_opts[option_index].name, optarg);
-                goto exit;
-            }
-        } else if (s->config_type == CFG_SUBOPTS) {
-            char **opts = ((char **) value_addr);
-            int remaining_space = CFG_MAX_SUBOPTS;
-            int enddefault = 0;
-            while (0 && *opts != NULL) {
-                if (*opts == END_DEFAULT)
-                    enddefault = 1;
-                remaining_space--;
-                opts++;
-            }
-
-            if (!enddefault) {
-                *opts = END_DEFAULT;
-                remaining_space -= 2;
-                opts += 2;
-            }
-
-            int r = argconfig_parse_subopt_string(optarg, opts, remaining_space);
-            if (r == 2) {
-                fprintf(stderr, "Error Parsing Sub-Options: Too many options!\n");
-                goto exit;
-            } else if (r) {
-                fprintf(stderr, "Error Parsing Sub-Options\n");
-                goto exit;
-            }
-        } else if (s->config_type == CFG_FILE_A ||
-                   s->config_type == CFG_FILE_R ||
-                   s->config_type == CFG_FILE_W ||
-                   s->config_type == CFG_FILE_AP ||
-                   s->config_type == CFG_FILE_RP ||
-                   s->config_type == CFG_FILE_WP)
-        {
-            const char *fopts = "";
-            if (s->config_type == CFG_FILE_A)
-                fopts = "a";
-            else if (s->config_type == CFG_FILE_R)
-                fopts = "r";
-            else if (s->config_type == CFG_FILE_W)
-                fopts = "w";
-            else if (s->config_type == CFG_FILE_AP)
-                fopts = "a+";
-            else if (s->config_type == CFG_FILE_RP)
-                fopts = "r+";
-            else if (s->config_type == CFG_FILE_WP)
-                fopts = "w+";
-
-            FILE *f = fopen(optarg, fopts);
-            if (f == NULL) {
-                fprintf(stderr, "Unable to open %s file: %s\n", s->option,
-                        optarg);
-                goto exit;
-            }
-
-            *((FILE **) value_addr) = f;
-        }
-    }
-
-    free(short_opts);
-    free(long_opts);
-
-    for (i = optind; i < argc; i++) {
-        argv[non_opt_args + 1] = argv[i];
-        non_opt_args++;
-    }
-
-    return non_opt_args;
-
-exit:
-    free(short_opts);
-    free(long_opts);
-    exit(1);
+
+	long_opts[option_index].name = NULL;
+	long_opts[option_index].flag = NULL;
+	long_opts[option_index].val = 0;
+
+	short_opts[short_index++] = '?';
+	short_opts[short_index++] = 'h';
+	short_opts[short_index] = 0;
+
+	int non_opt_args = 0;
+
+	while ((c = getopt_long_only(argc, argv, short_opts, long_opts,
+				     &option_index)) != -1) {
+		if (c == '?' || c == 'h' || c == ':' || (c == 0 &&
+							 (!strcmp
+							  (long_opts
+							   [option_index].name,
+							   "h")
+							  ||
+							  !strcmp(long_opts
+								  [option_index].
+								  name, "help")
+							  ||
+							  !strcmp(long_opts
+								  [option_index].
+								  name,
+								  "-help")))) {
+			argconfig_print_help(argv[0], program_desc, options);
+			goto exit;
+		} else if (c == 1) {
+			argv[1 + non_opt_args] = optarg;
+			non_opt_args++;
+			continue;
+		} else if (c) {
+			for (option_index = 0;
+			     options[option_index].option[0] != c
+			     || options[option_index].option[1] != 0;
+			     option_index++) ;
+
+			if (long_opts[option_index].flag != NULL)
+				*long_opts[option_index].flag = 1;
+		}
+
+		s = &options[option_index];
+
+		while (s->default_value == NULL)
+			s++;
+
+		value_addr = (void *)((char *)s->default_value -
+				      (char *)config_default +
+				      (char *)config_out);
+
+		if (s->config_type == CFG_STRING) {
+			*((char **)value_addr) = optarg;
+		} else if (s->config_type == CFG_SIZE) {
+			*((size_t *) value_addr) = strtol(optarg, &endptr, 0);
+			if (errno || optarg == endptr) {
+				fprintf(stderr,
+					"Expected integer argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+		} else if (s->config_type == CFG_INT) {
+			*((int *)value_addr) = strtol(optarg, &endptr, 0);
+			if (errno || optarg == endptr) {
+				fprintf(stderr,
+					"Expected integer argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+		} else if (s->config_type == CFG_BOOL) {
+			int tmp = strtol(optarg, &endptr, 0);
+			if (errno || tmp < 0 || tmp > 1 || optarg == endptr) {
+				fprintf(stderr,
+					"Expected 0 or 1 argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+			*((int *)value_addr) = tmp;
+		} else if (s->config_type == CFG_BYTE) {
+			uint8_t tmp = strtol(optarg, &endptr, 0);
+			if (errno || tmp < 0 || optarg == endptr) {
+				fprintf(stderr,
+					"Expected positive argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+			*((uint8_t *) value_addr) = tmp;
+		} else if (s->config_type == CFG_SHORT) {
+			uint16_t tmp = strtol(optarg, &endptr, 0);
+			if (errno || tmp < 0 || optarg == endptr) {
+				fprintf(stderr,
+					"Expected positive argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+			*((uint16_t *) value_addr) = tmp;
+		} else if (s->config_type == CFG_POSITIVE) {
+			uint32_t tmp = strtol(optarg, &endptr, 0);
+			if (errno || tmp < 0 || optarg == endptr) {
+				fprintf(stderr,
+					"Expected positive argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+			*((uint32_t *) value_addr) = tmp;
+		} else if (s->config_type == CFG_INCREMENT) {
+			(*((int *)value_addr))++;
+		} else if (s->config_type == CFG_LONG) {
+			*((long *)value_addr) = strtol(optarg, &endptr, 0);
+			if (errno || optarg == endptr) {
+				fprintf(stderr,
+					"Expected long integer argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+		} else if (s->config_type == CFG_LONG_SUFFIX) {
+			*((long *)value_addr) = suffix_binary_parse(optarg);
+			if (errno) {
+				fprintf(stderr,
+					"Expected long suffixed integer argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+		} else if (s->config_type == CFG_DOUBLE) {
+			*((double *)value_addr) = strtod(optarg, &endptr);
+			if (errno || optarg == endptr) {
+				fprintf(stderr,
+					"Expected float argument for '%s' but got '%s'!\n",
+					long_opts[option_index].name, optarg);
+				goto exit;
+			}
+		} else if (s->config_type == CFG_SUBOPTS) {
+			char **opts = ((char **)value_addr);
+			int remaining_space = CFG_MAX_SUBOPTS;
+			int enddefault = 0;
+			while (0 && *opts != NULL) {
+				if (*opts == END_DEFAULT)
+					enddefault = 1;
+				remaining_space--;
+				opts++;
+			}
+
+			if (!enddefault) {
+				*opts = END_DEFAULT;
+				remaining_space -= 2;
+				opts += 2;
+			}
+
+			int r =
+			    argconfig_parse_subopt_string(optarg, opts,
+							  remaining_space);
+			if (r == 2) {
+				fprintf(stderr,
+					"Error Parsing Sub-Options: Too many options!\n");
+				goto exit;
+			} else if (r) {
+				fprintf(stderr, "Error Parsing Sub-Options\n");
+				goto exit;
+			}
+		} else if (s->config_type == CFG_FILE_A ||
+			   s->config_type == CFG_FILE_R ||
+			   s->config_type == CFG_FILE_W ||
+			   s->config_type == CFG_FILE_AP ||
+			   s->config_type == CFG_FILE_RP ||
+			   s->config_type == CFG_FILE_WP) {
+			const char *fopts = "";
+			if (s->config_type == CFG_FILE_A)
+				fopts = "a";
+			else if (s->config_type == CFG_FILE_R)
+				fopts = "r";
+			else if (s->config_type == CFG_FILE_W)
+				fopts = "w";
+			else if (s->config_type == CFG_FILE_AP)
+				fopts = "a+";
+			else if (s->config_type == CFG_FILE_RP)
+				fopts = "r+";
+			else if (s->config_type == CFG_FILE_WP)
+				fopts = "w+";
+
+			FILE *f = fopen(optarg, fopts);
+			if (f == NULL) {
+				fprintf(stderr, "Unable to open %s file: %s\n",
+					s->option, optarg);
+				goto exit;
+			}
+
+			*((FILE **) value_addr) = f;
+		}
+	}
+
+	free(short_opts);
+	free(long_opts);
+
+	for (i = optind; i < argc; i++) {
+		argv[non_opt_args + 1] = argv[i];
+		non_opt_args++;
+	}
+
+	return non_opt_args;
+
+ exit:
+	free(short_opts);
+	free(long_opts);
+	exit(1);
 }
 
 int argconfig_parse_subopt_string(char *string, char **options,
-                                   size_t max_options)
+				  size_t max_options)
 {
-    char **o = options;
-    char *tmp;
-
-    if (!strlen(string) || string == NULL) {
-        *(o++) = NULL;
-        *(o++) = NULL;
-        return 0;
-    }
-
-    tmp = calloc(strlen(string)+2, 1);
-    strcpy(tmp, string);
+	char **o = options;
+	char *tmp;
 
-    size_t toklen;
-    toklen = strcspn(tmp, "=");
+	if (!strlen(string) || string == NULL) {
+		*(o++) = NULL;
+		*(o++) = NULL;
+		return 0;
+	}
 
-    if (!toklen) {
-    	free(tmp);
-	return 1;
-    }
+	tmp = calloc(strlen(string) + 2, 1);
+	strcpy(tmp, string);
 
-    *(o++) = tmp;
-    tmp[toklen] = 0;
-    tmp += toklen + 1;
+	size_t toklen;
+	toklen = strcspn(tmp, "=");
 
+	if (!toklen) {
+		free(tmp);
+		return 1;
+	}
 
-    while (1) {
-        if (*tmp == '"' || *tmp == '\'' || *tmp == '[' || *tmp == '(' ||
-            *tmp == '{') {
+	*(o++) = tmp;
+	tmp[toklen] = 0;
+	tmp += toklen + 1;
 
-            tmp++;
-            toklen = strcspn(tmp, "\"'])}");
+	while (1) {
+		if (*tmp == '"' || *tmp == '\'' || *tmp == '[' || *tmp == '(' ||
+		    *tmp == '{') {
 
-            if (!toklen)
-		    return 1;
+			tmp++;
+			toklen = strcspn(tmp, "\"'])}");
 
-            *(o++) = tmp;
-            tmp[toklen] = 0;
-            tmp += toklen + 1;
+			if (!toklen)
+				return 1;
 
-            toklen = strcspn(tmp, ";:,");
-            tmp[toklen] = 0;
-            tmp += toklen + 1;
-        } else {
-            toklen = strcspn(tmp, ";:,");
+			*(o++) = tmp;
+			tmp[toklen] = 0;
+			tmp += toklen + 1;
 
-            if (!toklen)
-		    return 1;
+			toklen = strcspn(tmp, ";:,");
+			tmp[toklen] = 0;
+			tmp += toklen + 1;
+		} else {
+			toklen = strcspn(tmp, ";:,");
 
-            *(o++) = tmp;
-            tmp[toklen] = 0;
-            tmp += toklen + 1;
-        }
+			if (!toklen)
+				return 1;
 
+			*(o++) = tmp;
+			tmp[toklen] = 0;
+			tmp += toklen + 1;
+		}
 
-        toklen = strcspn(tmp, "=");
+		toklen = strcspn(tmp, "=");
 
-        if (!toklen)
-		break;
+		if (!toklen)
+			break;
 
-        *(o++) = tmp;
-        tmp[toklen] = 0;
-        tmp += toklen + 1;
+		*(o++) = tmp;
+		tmp[toklen] = 0;
+		tmp += toklen + 1;
 
-        if ((o - options) > (max_options-2))
-            return 2;
-    }
+		if ((o - options) > (max_options - 2))
+			return 2;
+	}
 
-    *(o++) = NULL;
-    *(o++) = NULL;
+	*(o++) = NULL;
+	*(o++) = NULL;
 
 	return 0;
 }
 
-
 unsigned argconfig_parse_comma_sep_array(char *string, int *val,
-		unsigned max_length)
+					 unsigned max_length)
 {
-  unsigned ret = 0;
-  char *tmp;
-  char *p;
-
-  if (!strlen(string) || string == NULL)
-	  return 0;
-
-  tmp = strtok(string, ",");
-  if (!tmp)
-      return 0;
-
+	unsigned ret = 0;
+	char *tmp;
+	char *p;
 
-  val[ret] = strtol(tmp, &p, 0);
+	if (!strlen(string) || string == NULL)
+		return 0;
 
-  if (*p != 0)
-	  exit(1);
+	tmp = strtok(string, ",");
+	if (!tmp)
+		return 0;
 
-  ret++;
+	val[ret] = strtol(tmp, &p, 0);
 
-  while(1) {
-	  tmp = strtok(NULL, ",");
+	if (*p != 0)
+		exit(1);
 
-	  if (tmp == NULL)
-		return ret;
+	ret++;
 
+	while (1) {
+		tmp = strtok(NULL, ",");
 
-	  if (ret >= max_length)
-		  exit(1);
+		if (tmp == NULL)
+			return ret;
 
+		if (ret >= max_length)
+			exit(1);
 
-	  val[ret] = strtol(tmp, &p, 0);
+		val[ret] = strtol(tmp, &p, 0);
 
-	  if (*p != 0)
-		  exit(1);
+		if (*p != 0)
+			exit(1);
 
-	  ret++;
-    }
+		ret++;
+	}
 
 }
 
-unsigned argconfig_parse_comma_sep_array_long(char *string, unsigned long long *val,
-				      unsigned max_length)
+unsigned argconfig_parse_comma_sep_array_long(char *string,
+					      unsigned long long *val,
+					      unsigned max_length)
 {
-  unsigned ret = 0;
-  char *tmp;
-  char *p;
-
-  if (!strlen(string) || string == NULL)
-	  return 0;
-
-  tmp = strtok(string, ",");
-  if (tmp==NULL)
-	  return 0;
-
-  val[ret] = strtoll(tmp, &p, 0);
-  if (*p != 0)
-	  exit(1);
-  ret++;
-  while(1) {
-	  tmp = strtok(NULL, ",");
-
-	  if (tmp == NULL)
-		return ret;
-
-	  if (ret >= max_length)
-		  exit(1);
-
-	  val[ret] = strtoll(tmp, &p, 0);
-	  if (*p != 0)
-		  exit(1);
-	  ret++;
-    }
+	unsigned ret = 0;
+	char *tmp;
+	char *p;
+
+	if (!strlen(string) || string == NULL)
+		return 0;
+
+	tmp = strtok(string, ",");
+	if (tmp == NULL)
+		return 0;
+
+	val[ret] = strtoll(tmp, &p, 0);
+	if (*p != 0)
+		exit(1);
+	ret++;
+	while (1) {
+		tmp = strtok(NULL, ",");
+
+		if (tmp == NULL)
+			return ret;
+
+		if (ret >= max_length)
+			exit(1);
+
+		val[ret] = strtoll(tmp, &p, 0);
+		if (*p != 0)
+			exit(1);
+		ret++;
+	}
 }
 
-void argconfig_register_help_func(argconfig_help_func *f) {
-    int i;
-    for (i = 0; i < MAX_HELP_FUNC; i++) {
-        if (help_funcs[i] == NULL) {
-            help_funcs[i] = f;
-            help_funcs[i+1] = NULL;
-            break;
-        }
-    }
+void argconfig_register_help_func(argconfig_help_func * f)
+{
+	int i;
+	for (i = 0; i < MAX_HELP_FUNC; i++) {
+		if (help_funcs[i] == NULL) {
+			help_funcs[i] = f;
+			help_funcs[i + 1] = NULL;
+			break;
+		}
+	}
 }
 
-void argconfig_print_subopt_help(const struct argconfig_sub_options * options,
-                                 int indent)
+void argconfig_print_subopt_help(const struct argconfig_sub_options *options,
+				 int indent)
 {
-    const struct argconfig_sub_options *s;
-    const int bufsize = 120;
-    char buf[bufsize];
-    int  last_line, nodefault;
-
-    buf[0] = ' ';
-    buf[1] = ' ';
-    buf[2] = 0;
-
-    for (s = options; s->option != 0; s++) {
-        if (s->option[0] == '=') {
-            const char *c = s->option;
-            while (*c == '=') c++;
-            printf("\n%*s%s", indent, "", c);
-            continue;
-        }
-
-        strcpy(buf, s->option);
-        strcpy(buf, "=");
-        strcpy(buf, s->meta);
-
-        if (s->help == NULL) {
-            strcpy(buf, ", ");
-            continue;
-        }
-
-        printf("%*s%-*s", indent, "", 30-indent, buf);
-        if (strlen(buf) > 29-indent)
-            printf("%-31s", "\n");
-
-        last_line = print_word_wrapped(s->help, 30-indent, 30-indent);
-
-        nodefault = 0;
-        if (s->config_type == CFG_STRING) {
-            sprintf(&buf[3], " - default: '%s'", *((char **) s->default_value));
-            nodefault = strlen(*((char **) s->default_value)) == 0;
-        } else if (s->config_type == CFG_INT || s->config_type == CFG_BOOL){
-            sprintf(&buf[3], " - default: %d", *((int *) s->default_value));
-        } else if (s->config_type == CFG_LONG){
-            sprintf(&buf[3], " - default: %ld", *((long *) s->default_value));
-        } else if (s->config_type == CFG_LONG_SUFFIX){
-            long long val = *((long *) s->default_value);
-            const char *s = suffix_binary_get(&val);
-            sprintf(&buf[3], " - default: %lld%s", val, s);
-        } else if (s->config_type == CFG_SIZE){
-            sprintf(&buf[3], " - default: %zd", *((size_t *) s->default_value));
-        } else if (s->config_type == CFG_DOUBLE){
-            sprintf(&buf[3], " - default: %.2f", *((double *) s->default_value));
-        } else {
-            sprintf(&buf[3], " ");
-        }
-
-        if (!nodefault && s->config_type != CFG_NONE)
-            print_word_wrapped(&buf[3], 30, last_line);
-
-        putchar('\n');
-
-        buf[2] = 0;
-    }
+	const struct argconfig_sub_options *s;
+	const int bufsize = 120;
+	char buf[bufsize];
+	int last_line, nodefault;
+
+	buf[0] = ' ';
+	buf[1] = ' ';
+	buf[2] = 0;
+
+	for (s = options; s->option != 0; s++) {
+		if (s->option[0] == '=') {
+			const char *c = s->option;
+			while (*c == '=')
+				c++;
+			printf("\n%*s%s", indent, "", c);
+			continue;
+		}
+
+		strcpy(buf, s->option);
+		strcpy(buf, "=");
+		strcpy(buf, s->meta);
+
+		if (s->help == NULL) {
+			strcpy(buf, ", ");
+			continue;
+		}
+
+		printf("%*s%-*s", indent, "", 30 - indent, buf);
+		if (strlen(buf) > 29 - indent)
+			printf("%-31s", "\n");
+
+		last_line =
+		    print_word_wrapped(s->help, 30 - indent, 30 - indent);
+
+		nodefault = 0;
+		if (s->config_type == CFG_STRING) {
+			sprintf(&buf[3], " - default: '%s'",
+				*((char **)s->default_value));
+			nodefault = strlen(*((char **)s->default_value)) == 0;
+		} else if (s->config_type == CFG_INT
+			   || s->config_type == CFG_BOOL) {
+			sprintf(&buf[3], " - default: %d",
+				*((int *)s->default_value));
+		} else if (s->config_type == CFG_LONG) {
+			sprintf(&buf[3], " - default: %ld",
+				*((long *)s->default_value));
+		} else if (s->config_type == CFG_LONG_SUFFIX) {
+			long long val = *((long *)s->default_value);
+			const char *s = suffix_binary_get(&val);
+			sprintf(&buf[3], " - default: %lld%s", val, s);
+		} else if (s->config_type == CFG_SIZE) {
+			sprintf(&buf[3], " - default: %zd",
+				*((size_t *) s->default_value));
+		} else if (s->config_type == CFG_DOUBLE) {
+			sprintf(&buf[3], " - default: %.2f",
+				*((double *)s->default_value));
+		} else {
+			sprintf(&buf[3], " ");
+		}
+
+		if (!nodefault && s->config_type != CFG_NONE)
+			print_word_wrapped(&buf[3], 30, last_line);
+
+		putchar('\n');
+
+		buf[2] = 0;
+	}
 }
 
-void argconfig_parse_subopt(char * const opts[], const char *module,
-                            const struct argconfig_sub_options *options,
-                            const void *config_default, void *config_out,
-                            size_t config_size)
+void argconfig_parse_subopt(char *const opts[], const char *module,
+			    const struct argconfig_sub_options *options,
+			    const void *config_default, void *config_out,
+			    size_t config_size)
 {
-    int enddefault = 0;
-    int tmp;
-    const struct argconfig_sub_options *s;
-    char * const *o;
-
-    errno = 0;
-    memcpy(config_out, config_default, config_size);
-
-    for (o = opts; o != NULL && *o != NULL; o += 2) {
-        if (*o == END_DEFAULT) {
-            enddefault = 1;
-            continue;
-        }
-
-        for (s = options; s->option != NULL; s++)
-            if (strcmp(o[0], s->option) == 0)
-                break;
-
-        if (s->option == NULL && enddefault) {
-            fprintf(stderr, "%s: Invalid sub-option '%s'.\n", module, o[0]);
-	    exit(1);
-        } else if (s->option == NULL) {
-            continue;
-        }
-
-        void *value_addr = (void *) ((char *) s->default_value -
-                                     (char *) config_default +
-                                     (char *) config_out);
-
-        if (s->config_type == CFG_STRING) {
-            *((char **) value_addr) = o[1];
-        } else if (s->config_type == CFG_INT) {
-            *((int *) value_addr) = (int) strtol(o[1], NULL, 0);
-        } else if (s->config_type == CFG_SIZE) {
-            *((size_t *) value_addr) = (size_t) strtol(o[1], NULL, 0);
-        } else if (s->config_type == CFG_LONG) {
-            *((long *) value_addr) = strtol(o[1], NULL, 0);
-        } else if (s->config_type == CFG_LONG_SUFFIX) {
-            *((long *) value_addr) = suffix_binary_parse(o[1]);
-        } else if (s->config_type == CFG_DOUBLE) {
-            *((double *) value_addr) = strtod(o[1], NULL);
-        } else if (s->config_type == CFG_BOOL) {
-            tmp = strtol(o[1], NULL, 0);
-
-            if (tmp < 0 || tmp > 1)
-		    errno = 1;
-
-            *((int *) value_addr) = (int) tmp;
-        } else if (s->config_type == CFG_POSITIVE) {
-            tmp = strtol(o[1], NULL, 0);
-
-            if (tmp < 0)
-		    errno = 1;
-
-            *((int *) value_addr) = (int) tmp;
-        } else if (s->config_type == CFG_FILE_A ||
-                   s->config_type == CFG_FILE_R ||
-                   s->config_type == CFG_FILE_W ||
-                   s->config_type == CFG_FILE_AP ||
-                   s->config_type == CFG_FILE_RP ||
-                   s->config_type == CFG_FILE_WP)
-        {
-            const char *fopts = "";
-            if (s->config_type == CFG_FILE_A)
-                fopts = "a";
-            else if (s->config_type == CFG_FILE_R)
-                fopts = "r";
-            else if (s->config_type == CFG_FILE_W)
-                fopts = "w";
-            else if (s->config_type == CFG_FILE_AP)
-                fopts = "a+";
-            else if (s->config_type == CFG_FILE_RP)
-                fopts = "r+";
-            else if (s->config_type == CFG_FILE_WP)
-                fopts = "w+";
-
-            FILE *f = fopen(o[1], fopts);
-
-            if (f == NULL) {
-                fprintf(stderr, "Unable to open %s file: %s\n", s->option,
-                        o[1]);
-                exit(1);
-            }
-
-            *((FILE **) value_addr) = f;
-        }
-
-
-        if (errno) {
-            fprintf(stderr, "%s: Invalid value '%s' for option '%s'.\n", module,
-                    o[1], o[0]);
-	    exit(1);
-        }
-    }
+	int enddefault = 0;
+	int tmp;
+	const struct argconfig_sub_options *s;
+	char *const *o;
+
+	errno = 0;
+	memcpy(config_out, config_default, config_size);
+
+	for (o = opts; o != NULL && *o != NULL; o += 2) {
+		if (*o == END_DEFAULT) {
+			enddefault = 1;
+			continue;
+		}
+
+		for (s = options; s->option != NULL; s++)
+			if (strcmp(o[0], s->option) == 0)
+				break;
+
+		if (s->option == NULL && enddefault) {
+			fprintf(stderr, "%s: Invalid sub-option '%s'.\n",
+				module, o[0]);
+			exit(1);
+		} else if (s->option == NULL) {
+			continue;
+		}
+
+		void *value_addr = (void *)((char *)s->default_value -
+					    (char *)config_default +
+					    (char *)config_out);
+
+		if (s->config_type == CFG_STRING) {
+			*((char **)value_addr) = o[1];
+		} else if (s->config_type == CFG_INT) {
+			*((int *)value_addr) = (int)strtol(o[1], NULL, 0);
+		} else if (s->config_type == CFG_SIZE) {
+			*((size_t *) value_addr) =
+			    (size_t) strtol(o[1], NULL, 0);
+		} else if (s->config_type == CFG_LONG) {
+			*((long *)value_addr) = strtol(o[1], NULL, 0);
+		} else if (s->config_type == CFG_LONG_SUFFIX) {
+			*((long *)value_addr) = suffix_binary_parse(o[1]);
+		} else if (s->config_type == CFG_DOUBLE) {
+			*((double *)value_addr) = strtod(o[1], NULL);
+		} else if (s->config_type == CFG_BOOL) {
+			tmp = strtol(o[1], NULL, 0);
+
+			if (tmp < 0 || tmp > 1)
+				errno = 1;
+
+			*((int *)value_addr) = (int)tmp;
+		} else if (s->config_type == CFG_POSITIVE) {
+			tmp = strtol(o[1], NULL, 0);
+
+			if (tmp < 0)
+				errno = 1;
+
+			*((int *)value_addr) = (int)tmp;
+		} else if (s->config_type == CFG_FILE_A ||
+			   s->config_type == CFG_FILE_R ||
+			   s->config_type == CFG_FILE_W ||
+			   s->config_type == CFG_FILE_AP ||
+			   s->config_type == CFG_FILE_RP ||
+			   s->config_type == CFG_FILE_WP) {
+			const char *fopts = "";
+			if (s->config_type == CFG_FILE_A)
+				fopts = "a";
+			else if (s->config_type == CFG_FILE_R)
+				fopts = "r";
+			else if (s->config_type == CFG_FILE_W)
+				fopts = "w";
+			else if (s->config_type == CFG_FILE_AP)
+				fopts = "a+";
+			else if (s->config_type == CFG_FILE_RP)
+				fopts = "r+";
+			else if (s->config_type == CFG_FILE_WP)
+				fopts = "w+";
+
+			FILE *f = fopen(o[1], fopts);
+
+			if (f == NULL) {
+				fprintf(stderr, "Unable to open %s file: %s\n",
+					s->option, o[1]);
+				exit(1);
+			}
+
+			*((FILE **) value_addr) = f;
+		}
+
+		if (errno) {
+			fprintf(stderr,
+				"%s: Invalid value '%s' for option '%s'.\n",
+				module, o[1], o[0]);
+			exit(1);
+		}
+	}
 }
 
 int argconfig_set_subopt(const char *opt,
-                         const struct argconfig_sub_options *options,
-                         const void *config_default, void *config_out, va_list argp)
+			 const struct argconfig_sub_options *options,
+			 const void *config_default, void *config_out,
+			 va_list argp)
 {
-    const struct argconfig_sub_options *s;
-    for (s = options; s->option != NULL; s++)
-        if (strcmp(opt, s->option) == 0)
-            break;
-
-    if (s->option == NULL)
-        return 1;
-
-    void *value_addr = (void *) ((char *) s->default_value -
-                                 (char *) config_default +
-                                 (char *) config_out);
-
-    if (s->config_type == CFG_STRING) {
-        *((char **) value_addr) = va_arg(argp, char *);
-    } else if (s->config_type == CFG_INT ||
-               s->config_type == CFG_BOOL ||
-               s->config_type == CFG_POSITIVE)
-    {
-        *((int *) value_addr) = va_arg(argp, int);
-    } else if (s->config_type == CFG_SIZE) {
-        *((size_t *) value_addr) = va_arg(argp, size_t);
-    } else if (s->config_type == CFG_LONG) {
-        *((long *) value_addr) = va_arg(argp, long);
-    } else if (s->config_type == CFG_LONG_SUFFIX) {
-        *((long *) value_addr) = va_arg(argp, long);
-    } else if (s->config_type == CFG_DOUBLE) {
-        *((double *) value_addr) = va_arg(argp, double);
-    } else if (s->config_type == CFG_FILE_A ||
-               s->config_type == CFG_FILE_R ||
-               s->config_type == CFG_FILE_W ||
-               s->config_type == CFG_FILE_AP ||
-               s->config_type == CFG_FILE_RP ||
-               s->config_type == CFG_FILE_WP)
-    {
-
-        *((FILE **) value_addr) = va_arg(argp, FILE *);
-    }
-
-    return 0;
-}
+	const struct argconfig_sub_options *s;
+	for (s = options; s->option != NULL; s++)
+		if (strcmp(opt, s->option) == 0)
+			break;
+
+	if (s->option == NULL)
+		return 1;
+
+	void *value_addr = (void *)((char *)s->default_value -
+				    (char *)config_default +
+				    (char *)config_out);
+
+	if (s->config_type == CFG_STRING) {
+		*((char **)value_addr) = va_arg(argp, char *);
+	} else if (s->config_type == CFG_INT ||
+		   s->config_type == CFG_BOOL ||
+		   s->config_type == CFG_POSITIVE) {
+		*((int *)value_addr) = va_arg(argp, int);
+	} else if (s->config_type == CFG_SIZE) {
+		*((size_t *) value_addr) = va_arg(argp, size_t);
+	} else if (s->config_type == CFG_LONG) {
+		*((long *)value_addr) = va_arg(argp, long);
+	} else if (s->config_type == CFG_LONG_SUFFIX) {
+		*((long *)value_addr) = va_arg(argp, long);
+	} else if (s->config_type == CFG_DOUBLE) {
+		*((double *)value_addr) = va_arg(argp, double);
+	} else if (s->config_type == CFG_FILE_A ||
+		   s->config_type == CFG_FILE_R ||
+		   s->config_type == CFG_FILE_W ||
+		   s->config_type == CFG_FILE_AP ||
+		   s->config_type == CFG_FILE_RP ||
+		   s->config_type == CFG_FILE_WP) {
+
+		*((FILE **) value_addr) = va_arg(argp, FILE *);
+	}
 
+	return 0;
+}
 
 int argconfig_get_subopt(const char *opt,
-                         const struct argconfig_sub_options *options,
-                         const void *config_default, void *config_out, va_list argp)
+			 const struct argconfig_sub_options *options,
+			 const void *config_default, void *config_out,
+			 va_list argp)
 {
-    const struct argconfig_sub_options *s;
-    for (s = options; s->option != NULL; s++)
-        if (strcmp(opt, s->option) == 0)
-            break;
-
-    if (s->option == NULL)
-        return 1;
-
-    void *value_addr = (void *) ((char *) s->default_value -
-                                 (char *) config_default +
-                                 (char *) config_out);
-
-    if (s->config_type == CFG_STRING) {
-        *va_arg(argp, char **) = *((char **) value_addr);
-    } else if (s->config_type == CFG_INT ||
-               s->config_type == CFG_BOOL ||
-               s->config_type == CFG_POSITIVE)
-    {
-        *va_arg(argp, int *) = *((int *) value_addr);
-    } else if (s->config_type == CFG_SIZE) {
-        *va_arg(argp, size_t *) = *((size_t *) value_addr);
-    } else if (s->config_type == CFG_LONG) {
-        *va_arg(argp, long *) = *((long *) value_addr);
-    } else if (s->config_type == CFG_LONG_SUFFIX) {
-        *va_arg(argp, long *) = *((long *) value_addr);
-    } else if (s->config_type == CFG_DOUBLE) {
-        *va_arg(argp, double *) = *((double *) value_addr);
-    } else if (s->config_type == CFG_FILE_A ||
-               s->config_type == CFG_FILE_R ||
-               s->config_type == CFG_FILE_W ||
-               s->config_type == CFG_FILE_AP ||
-               s->config_type == CFG_FILE_RP ||
-               s->config_type == CFG_FILE_WP)
-    {
-        *va_arg(argp, FILE **) = *((FILE **) value_addr);
-    }
-
-    return 0;
+	const struct argconfig_sub_options *s;
+	for (s = options; s->option != NULL; s++)
+		if (strcmp(opt, s->option) == 0)
+			break;
+
+	if (s->option == NULL)
+		return 1;
+
+	void *value_addr = (void *)((char *)s->default_value -
+				    (char *)config_default +
+				    (char *)config_out);
+
+	if (s->config_type == CFG_STRING) {
+		*va_arg(argp, char **) = *((char **)value_addr);
+	} else if (s->config_type == CFG_INT ||
+		   s->config_type == CFG_BOOL ||
+		   s->config_type == CFG_POSITIVE) {
+		*va_arg(argp, int *) = *((int *)value_addr);
+	} else if (s->config_type == CFG_SIZE) {
+		*va_arg(argp, size_t *) = *((size_t *) value_addr);
+	} else if (s->config_type == CFG_LONG) {
+		*va_arg(argp, long *) = *((long *)value_addr);
+	} else if (s->config_type == CFG_LONG_SUFFIX) {
+		*va_arg(argp, long *) = *((long *)value_addr);
+	} else if (s->config_type == CFG_DOUBLE) {
+		*va_arg(argp, double *) = *((double *)value_addr);
+	} else if (s->config_type == CFG_FILE_A ||
+		   s->config_type == CFG_FILE_R ||
+		   s->config_type == CFG_FILE_W ||
+		   s->config_type == CFG_FILE_AP ||
+		   s->config_type == CFG_FILE_RP ||
+		   s->config_type == CFG_FILE_WP) {
+		*va_arg(argp, FILE **) = *((FILE **) value_addr);
+	}
+
+	return 0;
 }
diff --git a/src/argconfig.h b/src/argconfig.h
index a6af2fd9..20d1835d 100644
--- a/src/argconfig.h
+++ b/src/argconfig.h
@@ -39,24 +39,24 @@
 
 enum argconfig_types {
 	CFG_NONE,
-        CFG_STRING,
-        CFG_INT,
-        CFG_SIZE,
-        CFG_LONG,
-        CFG_LONG_SUFFIX,
-        CFG_DOUBLE,
-        CFG_BOOL,
-        CFG_BYTE,
-        CFG_SHORT,
-        CFG_POSITIVE,
-        CFG_INCREMENT,
-        CFG_SUBOPTS,
-        CFG_FILE_A,
-        CFG_FILE_W,
-        CFG_FILE_R,
-        CFG_FILE_AP,
-        CFG_FILE_WP,
-        CFG_FILE_RP,
+	CFG_STRING,
+	CFG_INT,
+	CFG_SIZE,
+	CFG_LONG,
+	CFG_LONG_SUFFIX,
+	CFG_DOUBLE,
+	CFG_BOOL,
+	CFG_BYTE,
+	CFG_SHORT,
+	CFG_POSITIVE,
+	CFG_INCREMENT,
+	CFG_SUBOPTS,
+	CFG_FILE_A,
+	CFG_FILE_W,
+	CFG_FILE_R,
+	CFG_FILE_AP,
+	CFG_FILE_WP,
+	CFG_FILE_RP,
 };
 
 //Deprecated
@@ -67,64 +67,63 @@ enum argconfig_types {
 #define DEFAULT_DOUBLE CFG_DOUBLE
 
 struct argconfig_commandline_options {
-    const char *option;
-    const char *meta;
-    enum argconfig_types config_type;
-    const void *default_value;
-    int        argument_type;
-    const char *help;
+	const char *option;
+	const char *meta;
+	enum argconfig_types config_type;
+	const void *default_value;
+	int argument_type;
+	const char *help;
 };
 
 #define CFG_MAX_SUBOPTS 500
 #define MAX_HELP_FUNC 20
 
 struct argconfig_sub_options {
-    const char *option;
-    const char *meta;
-    enum argconfig_types config_type;
-    const void *default_value;
-    const char *help;
+	const char *option;
+	const char *meta;
+	enum argconfig_types config_type;
+	const void *default_value;
+	const char *help;
 };
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-
 typedef void argconfig_help_func();
 void argconfig_append_usage(const char *str);
 void argconfig_print_help(char *command, const char *program_desc,
-			  const struct argconfig_commandline_options *options);
+			  const struct argconfig_commandline_options
+			  *options);
 int argconfig_parse(int argc, char *argv[], const char *program_desc,
-                    const struct argconfig_commandline_options *options,
-		    const void *config_default, void *config_out, size_t config_size);
-int argconfig_parse_subopt_string (char *string, char **options,
-                                size_t max_options);
-unsigned argconfig_parse_comma_sep_array(char *string,int *ret,
-				      unsigned max_length);
-unsigned argconfig_parse_comma_sep_array_long(char *string, unsigned long long *ret,
-				      unsigned max_length);
+		    const struct argconfig_commandline_options *options,
+		    const void *config_default, void *config_out,
+		    size_t config_size);
+int argconfig_parse_subopt_string(char *string, char **options,
+				  size_t max_options);
+unsigned argconfig_parse_comma_sep_array(char *string, int *ret,
+					 unsigned max_length);
+unsigned argconfig_parse_comma_sep_array_long(char *string,
+					      unsigned long long *ret,
+					      unsigned max_length);
 void argconfig_register_help_func(argconfig_help_func * f);
 
-void argconfig_print_subopt_help(const struct argconfig_sub_options * options,
-                              int indent);
+void argconfig_print_subopt_help(const struct argconfig_sub_options
+				 *options, int indent);
 
-void argconfig_parse_subopt(char * const opts[], const char *module,
-			   const struct argconfig_sub_options *options,
-                           const void *config_default, void *config_out,
-                           size_t config_size);
+void argconfig_parse_subopt(char *const opts[], const char *module,
+			    const struct argconfig_sub_options *options,
+			    const void *config_default,
+			    void *config_out, size_t config_size);
 
 int argconfig_set_subopt(const char *opt,
-                         const struct argconfig_sub_options *options,
-                         const void *config_default, void *config_out, va_list arg);
+			 const struct argconfig_sub_options *options,
+			 const void *config_default, void *config_out,
+			 va_list arg);
 int argconfig_get_subopt(const char *opt,
-                         const struct argconfig_sub_options *options,
-                         const void *config_default, void *config_out, va_list arg);
-
+			 const struct argconfig_sub_options *options,
+			 const void *config_default, void *config_out,
+			 va_list arg);
 #ifdef __cplusplus
 }
 #endif
-
-
 #endif
diff --git a/src/suffix.c b/src/suffix.c
index 1e116fdb..6f2a956a 100644
--- a/src/suffix.c
+++ b/src/suffix.c
@@ -36,93 +36,96 @@
 #include <errno.h>
 
 static struct si_suffix {
-    double magnitude;
-    const char *suffix;
+	double magnitude;
+	const char *suffix;
 } si_suffixes[] = {
-    {1e15,  "P"},
-    {1e12,  "T"},
-    {1e9,   "G"},
-    {1e6,   "M"},
-    {1e3,   "k"},
-    {1e0,   ""},
-    {1e-3,  "m"},
-    {1e-6,  "u"},
-    {1e-9,  "n"},
-    {1e-12, "p"},
-    {1e-15, "f"},
-    {0}
+	{1e15, "P"},
+	{1e12, "T"},
+	{1e9, "G"},
+	{1e6, "M"},
+	{1e3, "k"},
+	{1e0, ""},
+	{1e-3, "m"},
+	{1e-6, "u"},
+	{1e-9, "n"},
+	{1e-12, "p"},
+	{1e-15, "f"},
+	{0}
 };
 
 const char *suffix_si_get(double *value)
 {
-    struct si_suffix *s;
+	struct si_suffix *s;
 
-    for (s = si_suffixes; s->magnitude != 0; s++) {
-        if (*value >= s->magnitude) {
-            *value /= s->magnitude;
-            return s->suffix;
-        }
-    }
+	for (s = si_suffixes; s->magnitude != 0; s++) {
+		if (*value >= s->magnitude) {
+			*value /= s->magnitude;
+			return s->suffix;
+		}
+	}
 
-    return "";
+	return "";
 }
 
 static struct binary_suffix {
-    int shift;
-    const char *suffix;
+	int shift;
+	const char *suffix;
 } binary_suffixes[] = {
-    {50, "Pi"},
-    {40, "Ti"},
-    {30, "Gi"},
-    {20, "Mi"},
-    {10, "Ki"},
-    {0,  ""},
+	{50, "Pi"},
+	{40, "Ti"},
+	{30, "Gi"},
+	{20, "Mi"},
+	{10, "Ki"},
+	{0, ""}
 };
 
-const char *suffix_binary_get(long long *value) {
-    struct binary_suffix *s;
+const char *suffix_binary_get(long long *value)
+{
+	struct binary_suffix *s;
 
-    for (s = binary_suffixes; s->shift != 0; s++) {
-        if (llabs(*value) >= (1LL << s->shift)) {
-            *value = (*value + (1 << (s->shift - 1))) /  (1 << s->shift);
-            return s->suffix;
-        }
-    }
+	for (s = binary_suffixes; s->shift != 0; s++) {
+		if (llabs(*value) >= (1LL << s->shift)) {
+			*value =
+			    (*value + (1 << (s->shift - 1))) / (1 << s->shift);
+			return s->suffix;
+		}
+	}
 
-    return "";
+	return "";
 }
 
-const char *suffix_dbinary_get(double *value) {
-    struct binary_suffix *s;
+const char *suffix_dbinary_get(double *value)
+{
+	struct binary_suffix *s;
 
-    for (s = binary_suffixes; s->shift != 0; s++) {
-        if (llabs(*value) >= (1LL << s->shift)) {
-            *value = *value /  (1 << s->shift);
-            return s->suffix;
-        }
-    }
+	for (s = binary_suffixes; s->shift != 0; s++) {
+		if (llabs(*value) >= (1LL << s->shift)) {
+			*value = *value / (1 << s->shift);
+			return s->suffix;
+		}
+	}
 
-    return "";
+	return "";
 }
 
 long long suffix_binary_parse(const char *value)
 {
-    char *suffix;
-    errno = 0;
-    long long ret = strtol(value, &suffix, 0);
-    if (errno)
-        return 0;
-
-    struct binary_suffix *s;
-    for (s = binary_suffixes; s->shift != 0; s++) {
-        if (tolower(suffix[0]) == tolower(s->suffix[0])) {
-            ret <<= s->shift;
-            return ret;
-        }
-    }
-
-    if (suffix[0] != '\0')
-                errno = EINVAL;
-
-    return ret;
+	char *suffix;
+	errno = 0;
+	long long ret = strtol(value, &suffix, 0);
+	if (errno)
+		return 0;
+
+	struct binary_suffix *s;
+	for (s = binary_suffixes; s->shift != 0; s++) {
+		if (tolower(suffix[0]) == tolower(s->suffix[0])) {
+			ret <<= s->shift;
+			return ret;
+		}
+	}
+
+	if (suffix[0] != '\0')
+		errno = EINVAL;
+
+	return ret;
 }