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/basename.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/basename.c')
| -rw-r--r-- | src/basename.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basename.c b/src/basename.c index 95215399..71f75582 100644 --- a/src/basename.c +++ b/src/basename.c @@ -1,5 +1,5 @@ /* basename -- strip directory and suffix from file names - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-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 @@ -73,7 +73,7 @@ Examples:\n\ %s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n\ "), program_name, program_name, program_name, program_name); - emit_ancillary_info (); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -185,5 +185,5 @@ main (int argc, char **argv) perform_basename (argv[optind], optind + 2 == argc ? argv[optind + 1] : NULL, use_nuls); - exit (EXIT_SUCCESS); + return EXIT_SUCCESS; } |