From: Jim Meyering <jim@meyering.net>
Date: Sun, 7 May 2000 14:55:15 +0000 (+0000)
Subject: Include "closeout.h".
X-Git-Tag: SH-UTILS-2_0h~11
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c6bd79ad34d826c3f6b3963ea972d633fa98b34c;p=thirdparty%2Fcoreutils.git

Include "closeout.h".
(main): Call atexit with close_stdout.
---

diff --git a/src/logname.c b/src/logname.c
index 9633b2e2fa..a505791d57 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -68,6 +68,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);
 
@@ -91,7 +93,6 @@ main (int argc, char **argv)
   if (cp)
     {
       puts (cp);
-      close_stdout ();
       exit (0);
     }
   /* POSIX.2 prohibits using a fallback technique.  */
diff --git a/src/nice.c b/src/nice.c
index 3bca81e480..1fbcd9046b 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -1,5 +1,5 @@
 /* nice -- run a program with modified scheduling priority
-   Copyright (C) 1990-1999 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000 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
@@ -33,6 +33,7 @@
 #include "error.h"
 #include "long-options.h"
 #include "xstrtol.h"
+#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "nice"
@@ -91,6 +92,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/pathchk.c b/src/pathchk.c
index 97f2fb9d6c..74241588ad 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -1,5 +1,5 @@
 /* pathchk -- check whether pathnames are valid or portable
-   Copyright (C) 1991-1999 Free Software Foundation, Inc.
+   Copyright (C) 1991-2000 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
@@ -46,6 +46,7 @@
 #include "system.h"
 #include "error.h"
 #include "long-options.h"
+#include "closeout.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "pathchk"
@@ -139,6 +140,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);