diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-07-04 17:17:09 +0300 |
| commit | cc78bdc31749e9754120ae5a9d4849f4832b40a4 (patch) | |
| tree | 4f9e3f2064e56651ed8d41ae9d8ce8b08fc5241b /src/tsort.c | |
| parent | 8425beb209e6fedf50bcdd934ced14dfa0d7b596 (diff) | |
| parent | 71cd8e3a743046573744123777061b64881bf372 (diff) | |
| download | coreutils-cc78bdc31749e9754120ae5a9d4849f4832b40a4.tar.gz | |
Merge tag 'upstream/8.24'
Upstream version 8.24
Conflicts:
INSTALL
Makefile.in
aclocal.m4
build-aux/config.guess
build-aux/config.rpath
build-aux/config.sub
build-aux/depcomp
build-aux/missing
build-aux/test-driver
build-aux/texinfo.tex
doc/coreutils.info
doc/stamp-vti
doc/version.texi
gnulib-tests/Makefile.in
po/Makefile.in.in
Diffstat (limited to 'src/tsort.c')
| -rw-r--r-- | src/tsort.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/tsort.c b/src/tsort.c index 661c7173..d4be03d4 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -1,5 +1,5 @@ /* tsort - topological sort. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,12 +82,16 @@ usage (int status) printf (_("\ Usage: %s [OPTION] [FILE]\n\ Write totally ordered list consistent with the partial ordering in FILE.\n\ -With no FILE, or when FILE is -, read standard input.\n\ -\n\ "), program_name); + + emit_stdin_note (); + + fputs (_("\ +\n\ +"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); @@ -557,5 +561,5 @@ main (int argc, char **argv) ok = tsort (optind == argc ? "-" : argv[optind]); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } |