* - "-- option1 option2 ..."
* - "option1 option2 ..."
*/
-void clean_args_no_options_relaxed(int argc, char *argv[], const char * const *usagestr)
+void clean_args_no_options_relaxed(int argc, char *argv[])
{
if (argc <= 1)
return;
unsigned int flags, FILE *outf)
{
int pad = 4;
+ const char *prefix = "usage: ";
+ const char *pad_listing = " ";
if (!usagestr || !*usagestr)
return -1;
- fprintf(outf, "%s%s", (flags & USAGE_LISTING) ? " " : "usage: ",
- *usagestr++);
+ if (flags & USAGE_LISTING)
+ prefix = pad_listing;
+
+ fputs(prefix, outf);
+ if (strchr(*usagestr, '\n') == NULL) {
+ fputs(*usagestr, outf);
+ } else {
+ const char *c = *usagestr;
+ const char *nprefix = " ";
+
+ if (flags & USAGE_LISTING)
+ nprefix = pad_listing;
+
+ for (c = *usagestr; *c; c++) {
+ fputc(*c, outf);
+ if (*c == '\n')
+ fputs(nprefix, outf);
+ }
+ }
+ usagestr++;
/* a short one-line description (mandatory) */
if ((flags & USAGE_SHORT) == 0)
usage_command_usagestr(cmd->usagestr, cmd->token, full, err);
}
+__attribute__((noreturn))
void usage(const char * const *usagestr)
{
usage_command_usagestr(usagestr, NULL, 1, 1);
fprintf(outf, "%s\n", grp->infostr);
}
+__attribute__((noreturn))
void help_unknown_token(const char *arg, const struct cmd_group *grp)
{
fprintf(stderr, "%s: unknown token '%s'\n", get_argv0_buf(), arg);
exit(1);
}
+__attribute__((noreturn))
void help_ambiguous_token(const char *arg, const struct cmd_group *grp)
{
const struct cmd_struct *cmd = grp->commands;
usage_command_group(grp, full, 0);
}
-int prefixcmp(const char *str, const char *prefix)
-{
- for (; ; str++, prefix++)
- if (!*prefix)
- return 0;
- else if (*str != *prefix)
- return (unsigned char)*prefix - (unsigned char)*str;
-}
-