This commit is contained in:
2026-09-27 20:27:38 +02:00
parent 27c5c4a55b
commit 2f0a1f5087
9 changed files with 143 additions and 126 deletions
+11 -11
View File
@@ -9,7 +9,7 @@ static void cli_print_indentation(args_t args) {
}
}
bool cli_command(args_t *args, const char *command_name) {
bool cli_command(args_t *args, char const *command_name) {
if (args->help) {
cli_print_indentation(*args);
printf("[ cmd ] %s\n", command_name);
@@ -25,7 +25,7 @@ bool cli_command(args_t *args, const char *command_name) {
return false;
}
bool cli_bool(args_t args, const char *flag_name) {
bool cli_bool(args_t args, char const *flag_name) {
if (args.help) {
cli_print_indentation(args);
printf("[ flg ] %s\n", flag_name);
@@ -39,7 +39,7 @@ bool cli_bool(args_t args, const char *flag_name) {
return false;
}
bool cli_opt_str_func(args_t args, const char *flag_name, const char **output, const char *file, int line) {
bool cli_opt_str_func(args_t args, char const *flag_name, char const **output, char const *file, int line) {
if (args.help) {
cli_print_indentation(args);
printf("[ opt ] %s\n", flag_name);
@@ -56,7 +56,7 @@ bool cli_opt_str_func(args_t args, const char *flag_name, const char **output, c
break;
}
}
static const char *dummy = "";
static char const *dummy = "";
if (!is_flag_name_found) {
*output = dummy;
return false;
@@ -70,14 +70,14 @@ bool cli_opt_str_func(args_t args, const char *flag_name, const char **output, c
return true;
}
const char *cli_req_str_func(args_t args, const char *flag_name, const char *file, int line) {
char const *cli_req_str_func(args_t args, char const *flag_name, char const *file, int line) {
if (args.help) {
cli_print_indentation(args);
printf("[ req ] %s\n", flag_name);
return "";
}
const char *value;
char const *value;
if (cli_opt_str_func(args, flag_name, &value, file, line)) {
return value;
} else {
@@ -87,7 +87,7 @@ const char *cli_req_str_func(args_t args, const char *flag_name, const char *fil
return "";
}
bool cli_opt_int_func(args_t args, const char *flag_name, int *output, const char *file, int line) {
bool cli_opt_int_func(args_t args, char const *flag_name, int *output, char const *file, int line) {
if (args.help) {
cli_print_indentation(args);
printf("[ opt ] %s\n", flag_name);
@@ -95,7 +95,7 @@ bool cli_opt_int_func(args_t args, const char *flag_name, int *output, const cha
return false;
}
const char *text = "";
char const *text = "";
if (cli_opt_str_func(args, flag_name, &text, file, line)) {
if (
text[0] != '-' &&
@@ -112,7 +112,7 @@ bool cli_opt_int_func(args_t args, const char *flag_name, int *output, const cha
fprintf(stderr, "%s:%d: Invalid integer %s!\n", file, line, text);
exit(1);
}
for ( const char *c = &text[1]; (*c) != '\0'; c++ ) {
for ( char const *c = &text[1]; (*c) != '\0'; c++ ) {
if ((*c) < '0' || '9' < (*c)) {
fprintf(stderr, "%s:%d: Invalid integer %s!\n", file, line, text);
exit(1);
@@ -125,7 +125,7 @@ bool cli_opt_int_func(args_t args, const char *flag_name, int *output, const cha
return false;
}
int cli_req_int_func(args_t args, const char *flag_name, const char *file, int line) {
int cli_req_int_func(args_t args, char const *flag_name, char const *file, int line) {
if (args.help) {
cli_print_indentation(args);
printf("[ req ] %s\n", flag_name);
@@ -142,7 +142,7 @@ int cli_req_int_func(args_t args, const char *flag_name, const char *file, int l
return 0;
}
args_t cli_make_args(int argc, const char **argv) {
args_t cli_make_args(int argc, char const **argv) {
args_t args = (args_t) {
.count = argc-1,
.values = argv+1,