On Mon, Jun 26, 2017 at 08:29:48PM +0200, Ruediger Meier wrote:
> --- a/include/c.h
> +++ b/include/c.h
> @@ -315,8 +315,18 @@ static inline int xusleep(useconds_t usec)
> #define USAGE_COMMANDS _("\nCommands:\n")
> #define USAGE_COLUMNS _("\nAvailable output columns:\n")
> #define USAGE_SEPARATOR "\n"
> -#define USAGE_HELP _(" -h, --help display this help and exit\n")
> -#define USAGE_VERSION _(" -V, --version output version information and exit\n")
> +
> +#define USAGE_HELP_TXT _("display this help and exit")
> +#define USAGE_VERSION_TXT _("output version information and exit")
> +
> +#define PRINT_USAGE_HELP(marg_dsc) \
> + printf( \
> + "%-" #marg_dsc "s%s\n" \
> + "%-" #marg_dsc "s%s\n" \
> + , " -h, --help", USAGE_HELP_TXT \
> + , " -V, --version", USAGE_VERSION_TXT \
> + )
Would be possible to use lowercase for the macro name?
For example USAGE_HELP_TXT is fine, but for something like function I
would prefer
#define print_usage_help(marg_dsc)
and what about USAGE_SEPARATOR that we have always before --help?
Maybe we can add \n to the print_usage_help() too.
> --- a/login-utils/last.c
> +++ b/login-utils/last.c
> @@ -589,8 +589,7 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl)
> " notime|short|full|iso\n"), out);
>
> fputs(USAGE_SEPARATOR, out);
> - fputs(USAGE_HELP, out);
> - fputs(USAGE_VERSION, out);
> + PRINT_USAGE_HELP(22);
> fprintf(out, USAGE_MAN_TAIL("last(1)"));
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
