(start_header): Do not assume S_IFMT is defined.

[chaz/tar] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 4f035a7ad7dbf3159ca2b5b64170c412698ff623..c8b10b06a7b73f76bcc0a0b7a21f0ad847570fa8 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -307,13 +307,10 @@ is_regular_file (const char *name)
 {
   struct stat stbuf;
 
-  if (stat (name, &stbuf) < 0)
-    return 1;
-
-  if (S_ISREG (stbuf.st_mode))
-    return 1;
-
-  return 0;
+  if (stat (name, &stbuf) == 0)
+    return S_ISREG (stbuf.st_mode);
+  else
+    return errno == ENOENT;
 }
 
 static ssize_t
@@ -457,7 +454,7 @@ child_open_for_compress (void)
 
          if (size < BLOCKSIZE)
            size = BLOCKSIZE;
-         status = full_read (STDIN_FILENO, cursor, size);
+         status = safe_read (STDIN_FILENO, cursor, size);
          if (status <= 0)
            break;
        }
@@ -808,8 +805,7 @@ open_archive (enum access_mode access)
 
       if (backed_up_flag)
        undo_last_backup ();
-      FATAL_ERROR ((0, saved_errno, _("Cannot open %s"),
-                   archive_name_array[0]));
+      FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
     }
 
 #if !MSDOS
@@ -822,8 +818,9 @@ open_archive (enum access_mode access)
     dev_null_output =
       (strcmp (archive_name_array[0], dev_null) == 0
        || (! _isrmt (archive)
-          && stat (dev_null, &dev_null_stat) == 0
           && S_ISCHR (archive_stat.st_mode)
+          && stat (dev_null, &dev_null_stat) == 0
+          && S_ISCHR (dev_null_stat.st_mode)
           && archive_stat.st_rdev == dev_null_stat.st_rdev));
   }
 
@@ -1116,27 +1113,29 @@ flush_read (void)
        write_error (status);
     }
   if (multi_volume_option)
-    if (save_name)
-      {
-       char *cursor = save_name;
+    {
+      if (save_name)
+       {
+         char *cursor = save_name;
 
 #if MSDOS
-       if (cursor[1] == ':')
-         cursor += 2;
+         if (cursor[1] == ':')
+           cursor += 2;
 #endif
-       while (*cursor == '/')
-         cursor++;
+         while (*cursor == '/')
+           cursor++;
 
-       strcpy (real_s_name, cursor);
-       real_s_sizeleft = save_sizeleft;
-       real_s_totsize = save_totsize;
-      }
-    else
-      {
-       real_s_name[0] = '\0';
-       real_s_totsize = 0;
-       real_s_sizeleft = 0;
-      }
+         strcpy (real_s_name, cursor);
+         real_s_sizeleft = save_sizeleft;
+         real_s_totsize = save_totsize;
+       }
+      else
+       {
+         real_s_name[0] = '\0';
+         real_s_totsize = 0;
+         real_s_sizeleft = 0;
+       }
+    }
 
 error_loop:
   status = rmtread (archive, record_start->buffer, record_size);
@@ -1441,29 +1440,31 @@ close_archive (void)
        continue;
 
       if (child != -1)
-       if (WIFSIGNALED (wait_status)
+       {
+         if (WIFSIGNALED (wait_status)
 #if 0
-           && !WIFSTOPPED (wait_status)
+             && !WIFSTOPPED (wait_status)
 #endif
-           )
-         {
-           /* SIGPIPE is OK, everything else is a problem.  */
+             )
+           {
+             /* SIGPIPE is OK, everything else is a problem.  */
 
-           if (WTERMSIG (wait_status) != SIGPIPE)
-             ERROR ((0, 0, _("Child died with signal %d%s"),
-                     WTERMSIG (wait_status),
-                     WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
-         }
-       else
-         {
-           /* Child voluntarily terminated -- but why?  /bin/sh returns
-              SIGPIPE + 128 if its child, then do nothing.  */
+             if (WTERMSIG (wait_status) != SIGPIPE)
+               ERROR ((0, 0, _("Child died with signal %d%s"),
+                       WTERMSIG (wait_status),
+                       WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
+           }
+         else
+           {
+             /* Child voluntarily terminated -- but why?  /bin/sh returns
+                SIGPIPE + 128 if its child, then do nothing.  */
 
-           if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
-               && WEXITSTATUS (wait_status))
-             ERROR ((0, 0, _("Child returned status %d"),
-                     WEXITSTATUS (wait_status)));
-         }
+             if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
+                 && WEXITSTATUS (wait_status))
+               ERROR ((0, 0, _("Child returned status %d"),
+                       WEXITSTATUS (wait_status)));
+           }
+       }
     }
 #endif /* !MSDOS */