summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-05-11 07:21:33 +0000
committerJim Meyering <jim@meyering.net>2000-05-11 07:21:33 +0000
commit70e5178bdeaee9c81cbe752a25408c0b867757b8 (patch)
treec6b5543abcbf036ee28774b02b8eb5ab85e39505
parentc693c5940bb56c7c8a1a4521c2944a079c2ca8f6 (diff)
downloadcoreutils-70e5178bdeaee9c81cbe752a25408c0b867757b8.tar.xz
(usage): Don't call close_stdout directly, since that
didn't cover --version output. (main): Arrange to call close_stdout via atexit, instead.
-rw-r--r--src/sleep.c3
-rw-r--r--src/true.c3
-rw-r--r--src/yes.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/sleep.c b/src/sleep.c
index b00c9f771..c160413c0 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -81,7 +81,6 @@ point number.\n\
"),
program_name, program_name);
puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
- close_stdout ();
}
exit (status);
}
@@ -200,6 +199,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ atexit (close_stdout);
+
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
AUTHORS, usage);
diff --git a/src/true.c b/src/true.c
index d28bec34b..53c8f777f 100644
--- a/src/true.c
+++ b/src/true.c
@@ -26,7 +26,6 @@ These option names may not be abbreviated.\n\
")
, program_name, program_name);
puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
- close_stdout ();
exit (status);
}
@@ -38,6 +37,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ atexit (close_stdout);
+
/* Recognize --help or --version only if it's the only command-line
argument and if POSIXLY_CORRECT is not set. */
if (argc == 2 && getenv ("POSIXLY_CORRECT") == NULL)
diff --git a/src/yes.c b/src/yes.c
index 33ca609c0..59aa17b8e 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -54,7 +54,6 @@ Repeatedly output a line with all specified STRING(s), or `y'.\n\
--version output version information and exit\n"));
puts (_("\nReport bugs to <bug-sh-utils@gnu.org>."));
}
- close_stdout ();
exit (status);
}
@@ -66,6 +65,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ atexit (close_stdout);
+
/* Don't recognize --help or --version if POSIXLY_CORRECT is set. */
if (getenv ("POSIXLY_CORRECT") == NULL)
parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,