thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'usage-part2' of https://github.com/rudimeier/util-linux

Browse source 
* 'usage-part2' of https://github.com/rudimeier/util-linux:
  misc: cosmetics, remove argument from usage(FILE*)
  misc: cosmetics, remove argument from usage(int)
  misc: never use usage(stderr)
  misc: never use usage(ERROR)
  misc: cleanup and fix --unknownopt issues
  flock, getopt: write --help to stdout and return 0
  tools: add checkusage.sh
This commit is contained in:
Karel Zak 2017-06-26 15:58:37 +02:00
commit 47ccf06b47
112 changed files with 883 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

7
term-utils/script.c
View file

@ -154,8 +154,9 @@ static inline time_t script_time(time_t *t)
# define script_time(x) time(x)
#endif
static void __attribute__((__noreturn__)) usage(FILE *out)
static void __attribute__((__noreturn__)) usage(void)
{
FILE *out = stdout;
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options] [file]\n"), program_invocation_short_name);
@ -174,7 +175,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
" -h, --help display this help and exit\n\n"), out);
fprintf(out, USAGE_MAN_TAIL("script(1)"));
exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
exit(EXIT_SUCCESS);
}
static void die_if_link(const struct script_control *ctl)
@ -752,7 +753,7 @@ int main(int argc, char **argv)
exit(EXIT_SUCCESS);
break;
case 'h':
usage(stdout);
usage();
break;
default:
errtryhelp(EXIT_FAILURE);