Include stdio-safer.h.

(open_file): Use fopen_safer.
(close_file): Don't assume fopen does not return stdin.

diff --git a/src/pr.c b/src/pr.c
index aa3c40fcddf0e4fa61a9230c942f0e16934bf90c..869e4b874351f70340adf18be4cdb57d9fd475f3 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -320,6 +320,7 @@
 #include "inttostr.h"
 #include "mbswidth.h"
 #include "posixver.h"
+#include "stdio-safer.h"
 #include "strftime.h"
 #include "xstrtol.h"
 
@@ -1513,7 +1514,7 @@ open_file (char *name, COLUMN *p)
   else
     {
       p->name = name;
-      p->fp = fopen (name, "r");
+      p->fp = fopen_safer (name, "r");
     }
   if (p->fp == NULL)
     {
@@ -1543,7 +1544,7 @@ close_file (COLUMN *p)
     return;
   if (ferror (p->fp))
     error (EXIT_FAILURE, errno, "%s", p->name);
-  if (p->fp != stdin && fclose (p->fp) == EOF)
+  if (fileno (p->fp) != STDIN_FILENO && fclose (p->fp) != 0)
     error (EXIT_FAILURE, errno, "%s", p->name);
 
   if (!parallel_files)