Use fopen wrapper.

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 8d639d6ad88c7c184baa021591dd091251e1c9b2..22051dabf63c7809d6b66f3a8b91887d5e627578 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -68,8 +68,7 @@ extern int rpm2cpio_main(int argc, char **argv)
        if (argc == 1) {
                rpmfile = stdin;
        } else {
-               rpmfile = fopen(argv[1], "r");
-               if (!rpmfile) perror_msg_and_die("Can't open rpm file");
+               rpmfile = xfopen(argv[1], "r");
                /* set the buffer size */
                setvbuf(rpmfile, NULL, _IOFBF, 0x8000);
        }

diff --git a/editors/sed.c b/editors/sed.c
index 428b516ad4c00e6e967f3f59c0e6b0a1771a899b..3afa64e8fabb5781acdb7c6b18791cb8c30f54e4 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -804,7 +804,7 @@ static void process_file(FILE *file)
 
 extern int sed_main(int argc, char **argv)
 {
-       int opt;
+       int opt, status = EXIT_SUCCESS;
 
 #ifdef CONFIG_FEATURE_CLEAN_UP
        /* destroy command strings on exit */
@@ -851,15 +851,13 @@ extern int sed_main(int argc, char **argv)
                int i;
                FILE *file;
                for (i = optind; i < argc; i++) {
-                       file = fopen(argv[i], "r");
-                       if (file == NULL) {
-                               perror_msg("%s", argv[i]);
-                       } else {
+                       if (file = wfopen(argv[i], "r")) {
                                process_file(file);
                                fclose(file);
-                       }
+                       } else
+                               status = EXIT_FAILURE;
                }
        }
        
-       return 0;
+       return status;
 }

diff --git a/shell/ash.c b/shell/ash.c
index feee31dee4b19f946f3bcdd74ebb7f195485258f..f218a88d51a3877d76f662a944ad33e7ba0f1579 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11815,10 +11815,8 @@ opentrace() {
 #else
        strcpy(s, "./trace");
 #endif /* not_this_way */
-       if ((tracefile = fopen(s, "a")) == NULL) {
-               fprintf(stderr, "Can't open %s\n", s);
+       if ((tracefile = wfopen(s, "a")) == NULL)
                return;
-       }
 #ifdef O_APPEND
        if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0)
                fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND);
@@ -12648,7 +12646,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.34 2001/10/31 11:05:49 andersen Exp $
+ * $Id: ash.c,v 1.35 2001/11/12 16:44:55 kraai Exp $
  */
 static int timescmd (int argc, char **argv)
 {