Hi Wayne,
Thanks for the rapid fix.
That looks like it mostly fixed it. I was getting 100's and 100's of mkdir warnings. Now I only get a single warning. The directory was a CVS directory but I doubt that matters. Maybe there is another case you missed?
cheers Stuart
On Tue, May 04, 2004 at 01:41:04PM +1200, Stuart Inglis wrote:
mkdir -p a/b/c then later on tries to create: mkdir -p a/b
Thanks for the clarification. I dug into this and I found that some of the code paths try to call make_bak_dir() without first getting an ENOENT error. This can cause the code to try to create a directory that already exists. The attached patch should fix this for you.
..wayne..
------------------------------------------------------------------------
--- backup.c 13 Mar 2004 20:18:03 -0000 1.28
+++ backup.c 4 May 2004 03:06:52 -0000
@@ -169,8 +169,9 @@ static int keep_backup(char *fname)
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
- make_bak_dir(backup_dir_buf);
- if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) != 0) {
+ if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0
+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
+ || do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0)) {
rprintf(FERROR, "mknod %s failed: %s\n",
full_fname(backup_dir_buf), strerror(errno));
} else if (verbose > 2) {
@@ -186,10 +187,14 @@ static int keep_backup(char *fname)
if (!kept && S_ISDIR(file->mode)) {
/* make an empty directory */
- make_bak_dir(backup_dir_buf);
- do_mkdir(backup_dir_buf, file->mode);
- ret_code = do_rmdir(fname);
+ if (do_mkdir(backup_dir_buf, file->mode) < 0
+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
+ || do_mkdir(backup_dir_buf, file->mode) < 0)) {
+ rprintf(FINFO, "mkdir %s failed: %s\n",
+ full_fname(backup_dir_buf), strerror(errno));
+ }
+ ret_code = do_rmdir(fname);
if (verbose > 2) {
rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
full_fname(fname), ret_code);
@@ -207,8 +212,9 @@ static int keep_backup(char *fname)
}
kept = 1;
}
- make_bak_dir(backup_dir_buf);
- if (do_symlink(file->u.link, backup_dir_buf) != 0) {
+ if (do_symlink(file->u.link, backup_dir_buf) < 0
+ && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
+ || do_symlink(file->u.link, backup_dir_buf) < 0)) {
rprintf(FERROR, "link %s -> %s : %s\n",
full_fname(backup_dir_buf), file->u.link, strerror(errno));
}
-- Stuart Inglis, Ph.D. Managing Director Reel Two Ltd
Phone: +64 7 857 0700 Cell: +64 21 314 159
-- To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
