miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformat

Browse Source
This commit is contained in:
Adrien Gallouët
2016-12-05 14:47:22 +00:00
parent 0645f0d4d0
commit 0d97df6b50
7 changed files with 272 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/option.c
View File

@@ -3,9 +3,10 @@
#include "option.h"
#include "str.h"
int option_str (void *data, int argc, char **argv)
int
option_str(void *data, int argc, char **argv)
{
if (argc<2 || str_empty(argv[1])) {
if (argc < 2 || str_empty(argv[1])) {
gt_print("option `%s' need a string argument\n", argv[0]);
return -1;
}
@@ -15,9 +16,10 @@ int option_str (void *data, int argc, char **argv)
return 1;
}
int option_long (void *data, int argc, char **argv)
int
option_long(void *data, int argc, char **argv)
{
if (argc<2 || str_empty(argv[1])) {
if (argc < 2 || str_empty(argv[1])) {
gt_print("option `%s' need an integer argument\n", argv[0]);
return -1;
}
@@ -26,7 +28,7 @@ int option_long (void *data, int argc, char **argv)
char *end;
long val = strtol(argv[1], &end, 0);
if (errno || argv[1]==end) {
if (errno || argv[1] == end) {
gt_print("argument `%s' is not a valid integer\n", argv[1]);
return -1;
}
@@ -36,9 +38,10 @@ int option_long (void *data, int argc, char **argv)
return 1;
}
int option_is_set (struct option *opts, const char *name)
int
option_is_set(struct option *opts, const char *name)
{
for (int k=0; opts[k].name; k++) {
for (int k = 0; opts[k].name; k++) {
if (!str_cmp(opts[k].name, name))
return opts[k].set;
}
@@ -46,20 +49,21 @@ int option_is_set (struct option *opts, const char *name)
return 0;
}
int option_option (void *data, int argc, char **argv)
int
option_option(void *data, int argc, char **argv)
{
if (!data)
return 0;
struct option *opts = (struct option *)data;
for (int k=0; opts[k].name; k++)
for (int k = 0; opts[k].name; k++)
opts[k].set = 0;
for (int i=1; i<argc; i++) {
for (int i = 1; i < argc; i++) {
int found = 0;
for (int k=0; opts[k].name; k++) {
for (int k = 0; opts[k].name; k++) {
if (str_cmp(opts[k].name, argv[i]))
continue;
@@ -68,9 +72,9 @@ int option_option (void *data, int argc, char **argv)
return -1;
}
int ret = opts[k].call(opts[k].data, argc-i, &argv[i]);
int ret = opts[k].call(opts[k].data, argc - i, &argv[i]);
if (ret<0)
if (ret < 0)
return -1;
opts[k].set = 1;
@@ -81,29 +85,30 @@ int option_option (void *data, int argc, char **argv)
}
if (!found)
return i-1;
return i - 1;
}
return argc;
}
static int option_usage (struct option *opts, int slen)
static int
option_usage(struct option *opts, int slen)
{
if (!opts)
return 0;
int len = 0;
for (int k=0; opts[k].name; k++) {
if (len>40) {
for (int k = 0; opts[k].name; k++) {
if (len > 40) {
gt_print("\n%*s", slen, "");
len = 0;
}
len += gt_print(" [%s", opts[k].name);
if (opts[k].call==option_option) {
len += option_usage((struct option *)opts[k].data, slen+len);
if (opts[k].call == option_option) {
len += option_usage((struct option *)opts[k].data, slen + len);
} else {
len += gt_print(" ARG");
}
@@ -114,21 +119,22 @@ static int option_usage (struct option *opts, int slen)
return len;
}
int option (struct option *opts, int argc, char **argv)
int
option(struct option *opts, int argc, char **argv)
{
int ret = option_option(opts, argc, argv);
if (ret==argc)
if (ret == argc)
return 0;
if (ret<0 || ret+1>=argc)
if (ret < 0 || ret + 1 >= argc)
return 1;
gt_print("option `%s' is unknown\n", argv[ret+1]);
gt_print("option `%s' is unknown\n", argv[ret + 1]);
int slen = gt_print("usage: %s", argv[0]);
if (slen>40) {
if (slen > 40) {
slen = 12;
gt_print("\n%*s", slen, "");
}