if we get EWOULDBLOCK on a write then reduce the amount of data we are

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index beb3d37..3832145 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -267,65 +267,68 @@ static struct sum_struct *receive_sums(int f)
 static int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                     int report)
 {
-  int updated = 0;
-  STRUCT_STAT st2;
-  extern int am_daemon;
+       int updated = 0;
+       STRUCT_STAT st2;
+       extern int am_daemon;
 
-  if (dry_run) return 0;
+       if (dry_run) return 0;
 
-  if (!st) {
-    if (link_stat(fname,&st2) != 0) {
-      rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
-      return 0;
-    }
-    st = &st2;
-  }
+       if (!st) {
+               if (link_stat(fname,&st2) != 0) {
+                       rprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
+                       return 0;
+               }
+               st = &st2;
+       }
 
-  if (preserve_times && !S_ISLNK(st->st_mode) &&
-      st->st_mtime != file->modtime) {
-    updated = 1;
-    if (set_modtime(fname,file->modtime) != 0) {
-      rprintf(FERROR,"failed to set times on %s : %s\n",
-             fname,strerror(errno));
-      return 0;
-    }
-  }
+       if (preserve_times && !S_ISLNK(st->st_mode) &&
+           st->st_mtime != file->modtime) {
+               updated = 1;
+               if (set_modtime(fname,file->modtime) != 0) {
+                       rprintf(FERROR,"failed to set times on %s : %s\n",
+                               fname,strerror(errno));
+                       return 0;
+               }
+       }
+
+       if ((am_root || !am_daemon) &&
+           ((am_root && preserve_uid && st->st_uid != file->uid) || 
+            (preserve_gid && st->st_gid != file->gid))) {
+               if (do_lchown(fname,
+                             (am_root&&preserve_uid)?file->uid:-1,
+                             preserve_gid?file->gid:-1) != 0) {
+                       if (preserve_uid && st->st_uid != file->uid)
+                               updated = 1;
+                       if (verbose>1 || preserve_uid) {
+                               rprintf(FERROR,"chown %s : %s\n",
+                                       fname,strerror(errno));
+                               return 0;
+                       }
+               } else {
+                       updated = 1;
+               }
+       }
 
 #ifdef HAVE_CHMOD
-  if (preserve_perms && !S_ISLNK(st->st_mode) &&
-      st->st_mode != file->mode) {
-    updated = 1;
-    if (do_chmod(fname,file->mode) != 0) {
-      rprintf(FERROR,"failed to set permissions on %s : %s\n",
-             fname,strerror(errno));
-      return 0;
-    }
-  }
+       if (preserve_perms && !S_ISLNK(st->st_mode) &&
+           (st->st_mode != file->mode || 
+            (updated && (file->mode & ~ACCESSPERMS)))) {
+               updated = 1;
+               if (do_chmod(fname,file->mode) != 0) {
+                       rprintf(FERROR,"failed to set permissions on %s : %s\n",
+                               fname,strerror(errno));
+                       return 0;
+               }
+       }
 #endif
-
-  if ((am_root || !am_daemon) &&
-      ((am_root && preserve_uid && st->st_uid != file->uid) || 
-       (preserve_gid && st->st_gid != file->gid))) {
-         if (do_lchown(fname,
-                       (am_root&&preserve_uid)?file->uid:-1,
-                       preserve_gid?file->gid:-1) != 0) {
-                 if (preserve_uid && st->st_uid != file->uid)
-                         updated = 1;
-                 if (verbose>1 || preserve_uid)
-                         rprintf(FERROR,"chown %s : %s\n",
-                                 fname,strerror(errno));
-                 return updated;
-         }
-         updated = 1;
-  }
     
-  if (verbose > 1 && report) {
-         if (updated)
-                 rprintf(FINFO,"%s\n",fname);
-         else
-                 rprintf(FINFO,"%s is uptodate\n",fname);
-  }
-  return updated;
+       if (verbose > 1 && report) {
+               if (updated)
+                       rprintf(FINFO,"%s\n",fname);
+               else
+                       rprintf(FINFO,"%s is uptodate\n",fname);
+       }
+       return updated;
 }
 
 
@@ -884,10 +887,18 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
                        continue;
                }
 
-               fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+               /* we initially set the perms without the
+                  setuid/setgid bits to ensure that there is no race
+                  condition. They are then correctly updated after
+                  the lchown. Thanks to snabb@epipe.fi for pointing
+                  this out */
+               fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
+                             file->mode & ACCESSPERMS);
+
                if (fd2 == -1 && relative_paths && errno == ENOENT && 
                    create_directory_path(fnametmp) == 0) {
-                       fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+                       fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
+                                     file->mode & ACCESSPERMS);
                }
                if (fd2 == -1) {
                        rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));