From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Apr 2005 20:07:00 +0000 (+0000)
Subject: Include stdio-safer.h.
X-Git-Tag: CPPI-1_12~1034
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=329448f75ed82c1ff44ab28c05f16ef7ad17d4bc;p=thirdparty%2Fcoreutils.git

Include stdio-safer.h.
(input_desc): Remove unnecessary static initialization.
(set_input_file): Use STDIN_FILENO, not 0.
(create_output_file): Use fopen_safer.
---

diff --git a/src/csplit.c b/src/csplit.c
index acc83b11b7..e627bba1b8 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -31,8 +31,9 @@
 
 #include "error.h"
 #include "inttostr.h"
-#include "safe-read.h"
 #include "quote.h"
+#include "safe-read.h"
+#include "stdio-safer.h"
 #include "xstrtol.h"
 
 /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is
@@ -130,7 +131,7 @@ void usage (int status);
 char *program_name;
 
 /* Input file descriptor. */
-static int input_desc = 0;
+static int input_desc;
 
 /* Start of buffer list. */
 static struct buffer_record *head = NULL;
@@ -643,7 +644,7 @@ static void
 set_input_file (const char *name)
 {
   if (STREQ (name, "-"))
-    input_desc = 0;
+    input_desc = STDIN_FILENO;
   else
     {
       input_desc = open (name, O_RDONLY);
@@ -939,7 +940,7 @@ create_output_file (void)
 
   /* Create the output file in a critical section, to avoid races.  */
   sigprocmask (SIG_BLOCK, &caught_signals, &oldset);
-  output_stream = fopen (output_filename, "w");
+  output_stream = fopen_safer (output_filename, "w");
   fopen_ok = (output_stream != NULL);
   fopen_errno = errno;
   files_created += fopen_ok;