diff options
author | Wayne Davison <wayned@samba.org> | 2008-08-01 18:04:24 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2008-08-01 18:04:24 -0700 |
commit | 0479eb76015913a40a2d0423bdd6cfeec4a3a3e3 (patch) | |
tree | 2c6da8b58efa71fef8713952e30ebb8a688745e1 /util.c | |
parent | 459abd75f51b498c2ae354a3256532f59b3abc77 (diff) | |
download | rsync-0479eb76015913a40a2d0423bdd6cfeec4a3a3e3.tar.gz |
Fixed a couple minor problems in util.c:
- Make sure that handle_partial_dir() never returns a truncated fname.
- Make robust_rename() return that it failed to do a cross-device
copy if the partial-dir could not be created.
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -436,7 +436,7 @@ int robust_rename(const char *from, const char *to, const char *partialptr, case EXDEV: if (partialptr) { if (!handle_partial_dir(partialptr,PDIR_CREATE)) - return -1; + return -2; to = partialptr; } if (copy_file(from, to, -1, mode, 0) != 0) @@ -1111,12 +1111,16 @@ int handle_partial_dir(const char *fname, int create) STRUCT_STAT st; int statret = do_lstat(dir, &st); if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (do_unlink(dir) < 0) + if (do_unlink(dir) < 0) { + *fn = '/'; return 0; + } statret = -1; } - if (statret < 0 && do_mkdir(dir, 0700) < 0) + if (statret < 0 && do_mkdir(dir, 0700) < 0) { + *fn = '/'; return 0; + } } else do_rmdir(dir); *fn = '/'; |