From 02b75108661d6f9cdc953ec8a4641d761cb26c18 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 11 Apr 2005 20:09:42 +0000 Subject: [PATCH] Include stdio-safer.h. (open_file): Use fopen_safer. (close_file): Don't assume fopen does not return stdin. --- src/pr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pr.c b/src/pr.c index aa3c40fcdd..869e4b8743 100644 --- 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) -- 2.47.3