X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fsystem.c;h=5cb086f5de02ac45d46202b5f62d98d29e6cae1c;hb=f30c03c934e5ba865c966cb7add6542ec5f1a68f;hp=58069cd771de6b48fcbfa318ce48d1eec554ff15;hpb=b085ca30976ec26256344bd3532205d440e69309;p=chaz%2Ftar

diff --git a/src/system.c b/src/system.c
index 58069cd..5cb086f 100644
--- a/src/system.c
+++ b/src/system.c
@@ -20,6 +20,7 @@
 
 #include "common.h"
 #include "rmt.h"
+#include <signal.h>
 
 #if MSDOS
 
@@ -65,17 +66,26 @@ sys_spawn_shell ()
   spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
 }
 
-void
-sys_compare_uid_gid (struct stat *a, struct stat *b)
+/* stat() in djgpp's C library gives a constant number of 42 as the
+   uid and gid of a file.  So, comparing an FTP'ed archive just after
+   unpack would fail on MSDOS.  */
+
+bool
+sys_compare_uid (struct stat *a, struct stat *b)
 {
-  /* stat() in djgpp's C library gives a constant number of 42 as the
-     uid and gid of a file.  So, comparing an FTP'ed archive just after
-     unpack would fail on MSDOS.  */
+  return true;
+}
+
+bool
+sys_compare_gid (struct stat *a, struct stat *b)
+{
+  return true;
 }
 
 void
 sys_compare_links (struct stat *link_data, struct stat *stat_data)
 {
+  return true;
 }
 
 int
@@ -214,7 +224,7 @@ sys_spawn_shell ()
   child = xfork ();
   if (child == 0)
     {
-      execlp (shell, "-sh", "-i", 0);
+      execlp (shell, "-sh", "-i", (char *) 0);
       exec_fatal (shell);
     }
   else
@@ -229,24 +239,23 @@ sys_spawn_shell ()
     }
 }
 
-void
-sys_compare_uid_gid (struct stat *a, struct stat *b)
+bool
+sys_compare_uid (struct stat *a, struct stat *b)
 {
-  if (a->st_uid != b->st_uid)
-    report_difference (_("Uid differs"));
-  if (a->st_gid != b->st_gid)
-    report_difference (_("Gid differs"));
+  return a->st_uid == b->st_uid;
 }
 
-void
+bool
+sys_compare_gid (struct stat *a, struct stat *b)
+{
+  return a->st_gid == b->st_gid;
+}
+
+bool
 sys_compare_links (struct stat *link_data, struct stat *stat_data)
 {
-  if (stat_data->st_dev != link_data->st_dev
-      || stat_data->st_ino != link_data->st_ino)
-    {
-      report_difference (_("Not linked to %s"),
-			 quote (current_stat_info.link_name));
-    }
+  return stat_data->st_dev == link_data->st_dev
+         && stat_data->st_ino == link_data->st_ino;
 }
 
 int