label this version 1.7.0alpha

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index d04a217..6537717 100644 (file)
--- a/util.c
+++ b/util.c
@@ -82,9 +82,9 @@ char *map_ptr(struct map_struct *map,off_t offset,int len)
 
   if (lseek(map->fd,offset,SEEK_SET) != offset ||
       (nread=read(map->fd,map->p,len)) != len) {
-    fprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
-           (int)offset, len, nread, errno);
-    exit_cleanup(1);
+         fprintf(FERROR,"EOF in map_ptr! (offset=%d len=%d nread=%d errno=%d)\n",
+                 (int)offset, len, nread, errno);
+         exit_cleanup(1);
   }
 
   map->p_offset = offset;
@@ -119,7 +119,7 @@ int piped_child(char **command,int *f_in,int *f_out)
   }
 
 
-  pid = fork();
+  pid = do_fork();
   if (pid < 0) {
     fprintf(FERROR,"fork: %s\n",strerror(errno));
     exit_cleanup(1);
@@ -164,21 +164,10 @@ void out_of_memory(char *str)
 }
 
 
-#ifndef HAVE_STRDUP
- char *strdup(char *s)
-{
-  int l = strlen(s) + 1;
-  char *ret = (char *)malloc(l);
-  if (ret)
-    strcpy(ret,s);
-  return ret;
-}
-#endif
-
 
 int set_modtime(char *fname,time_t modtime)
 {
-#ifdef HAVE_UTIME_H
+#ifdef HAVE_UTIMBUF
   struct utimbuf tbuf;  
   tbuf.actime = time(NULL);
   tbuf.modtime = modtime;
@@ -353,3 +342,38 @@ int copy_file(char *source, char *dest, mode_t mode)
 
        return 0;
 }
+
+/* sleep for a while via select */
+void u_sleep(int usec)
+{
+       struct timeval tv;
+
+       tv.tv_sec = 0;
+       tv.tv_usec = usec;
+       select(0, NULL, NULL, NULL, &tv);
+}
+
+
+static pid_t all_pids[10];
+static int num_pids;
+
+/* fork and record the pid of the child */
+pid_t do_fork(void)
+{
+       pid_t newpid = fork();
+       
+       if (newpid) {
+               all_pids[num_pids++] = newpid;
+       }
+       return newpid;
+}
+
+/* kill all children */
+void kill_all(int sig)
+{
+       int i;
+       for (i=0;i<num_pids;i++) {
+               if (all_pids[i] != getpid())
+                       kill(all_pids[i], sig);
+       }
+}