#include <common/error.h>
#include <common/string-utils/string-utils.h>
-#define WHILE_PARSING_ARG_N_ARG_FMT "While parsing argument #%d (`%s`): "
-
/*
* Given argpar error status `status` and error `error`, return a formatted
* error message describing the error.
* `context_fmt`, if non-NULL, is formatted using `args` and prepended to the
* error message.
*
+ * Add `argc_offset` the the argument index mentioned in the error message.
+ *
* The returned string must be freed by the caller.
*/
-static ATTR_FORMAT_PRINTF(3, 0)
-char *format_arg_error_v(const struct argpar_error *error,
+static ATTR_FORMAT_PRINTF(4, 0)
+char *format_arg_error_v(const struct argpar_error *error, int argc_offset,
const char **argv, const char *context_fmt, va_list args)
{
char *str = NULL;
{
case ARGPAR_ERROR_TYPE_MISSING_OPT_ARG:
{
- int orig_index = argpar_error_orig_index(error);
+ const int orig_index = argpar_error_orig_index(error);
const char *arg = argv[orig_index];
ret = strutils_appendf(&str,
WHILE_PARSING_ARG_N_ARG_FMT "Missing required argument for option `%s`",
- orig_index + 1, arg, arg);
+ orig_index + 1 + argc_offset, argv[orig_index], arg);
if (ret < 0) {
goto end;
}
if (is_short) {
ret = strutils_appendf(&str,
WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `-%c`",
- orig_index + 1, arg, descr->short_name);
+ orig_index + 1 + argc_offset, arg, descr->short_name);
} else {
ret = strutils_appendf(&str,
WHILE_PARSING_ARG_N_ARG_FMT "Unexpected argument for option `--%s`",
- orig_index + 1, arg, descr->long_name);
+ orig_index + 1 + argc_offset, arg, descr->long_name);
}
if (ret < 0) {
}
case ARGPAR_ERROR_TYPE_UNKNOWN_OPT:
{
+ int orig_index = argpar_error_orig_index(error);
const char *unknown_opt = argpar_error_unknown_opt_name(error);
ret = strutils_appendf(&str,
- "Unknown option `%s`", unknown_opt);
+ WHILE_PARSING_ARG_N_ARG_FMT "Unknown option `%s`",
+ orig_index + 1 + argc_offset, argv[orig_index], unknown_opt);
if (ret < 0) {
goto end;
}
enum parse_next_item_status parse_next_item(struct argpar_iter *iter,
- const struct argpar_item **item, const char **argv,
- bool unknown_opt_is_error, const char *context_fmt, ...)
+ const struct argpar_item **item, int argc_offset,
+ const char **argv, bool unknown_opt_is_error,
+ const struct argpar_error **error_out,
+ const char *context_fmt, ...)
{
enum argpar_iter_next_status status;
const struct argpar_error *error = NULL;
switch (status) {
case ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY:
ERR("Failed to get next argpar item.");
- ret = PARSE_NEXT_ITEM_STATUS_ERROR;
+ ret = PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY;
break;
case ARGPAR_ITER_NEXT_STATUS_ERROR:
{
}
va_start(args, context_fmt);
- err_str = format_arg_error_v(error, argv, context_fmt, args);
+ err_str = format_arg_error_v(error, argc_offset, argv,
+ context_fmt, args);
va_end(args);
if (err_str) {
abort();
}
+ if (error_out) {
+ argpar_error_destroy(*error_out);
+ *error_out = error;
+ error = NULL;
+ }
+
argpar_error_destroy(error);
return ret;