3 files changed, 12 insertions, 10 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index eb141dc79..ed3f33650 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -19,18 +19,21 @@ int bb_cat(char **argv)
 {
         static const char *const argv_dash[] = { "-", NULL };
 
-        FILE *f;
+        int fd;
         int retval = EXIT_SUCCESS;
 
         if (!*argv)
                 argv = (char**) &argv_dash;
 
         do {
-                f = fopen_or_warn_stdin(*argv);
-                if (f) {
+                fd = STDIN_FILENO;
+                if (!LONE_DASH(*argv))
+                        fd = open_or_warn(*argv, O_RDONLY);
+                if (fd >= 0) {
                         /* This is not an xfunc - never exits */
-                        off_t r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
-                        fclose_if_not_stdin(f);
+                        off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
+                        if (fd != STDIN_FILENO)
+                                close(fd);
                         if (r >= 0)
                                 continue;
                 }
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 1d35d524a..04c56ac9c 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -30,7 +30,7 @@ static int convert(char *fn)
                 /*
                    The file is then created with mode read/write and
                    permissions 0666 for glibc 2.0.6 and earlier or
-                   0600  for glibc  2.0.7 and  later.
+                   0600 for glibc 2.0.7 and later.
                  */
                 snprintf(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), "%sXXXXXX", fn);
                 /*
@@ -38,8 +38,8 @@ static int convert(char *fn)
                    hold the full path.  However if the output is truncated the
                    subsequent call to mkstemp would fail.
                  */
-                if ((i = mkstemp(&bb_common_bufsiz1[0])) == -1
-                        || chmod(bb_common_bufsiz1, 0600) == -1) {
+                i = mkstemp(&bb_common_bufsiz1[0]);
+                if (i == -1 || chmod(bb_common_bufsiz1, 0600) == -1) {
                         bb_perror_nomsg_and_die();
                 }
                 out = fdopen(i, "w+");
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 417e90b00..a3818d519 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -38,9 +38,8 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
 
         src_fd = STDIN_FILENO;
         if (NOT_LONE_DASH(filename)) {
-                src_fd = open(filename, O_RDONLY);
+                src_fd = open_or_warn(filename, O_RDONLY);
                 if (src_fd < 0) {
-                        bb_perror_msg("%s", filename);
                         return NULL;
                 }
         }