Attachment 594 Details for Bug 1582 – Fix problem with --dry-run (-n)

[patch] Fix problem with --dry-run (-n)

dry-run.patch (text/plain), 1.05 KB, created by Wayne Davison on 2004-08-05 11:21:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wayne Davison

Created: 2004-08-05 11:21:31 UTC

Size: 1.05 KB

patch

obsolete

>--- generator.c	3 Aug 2004 15:41:16 -0000	1.109
>+++ generator.c	5 Aug 2004 18:14:57 -0000
>@@ -273,8 +273,14 @@ static void recv_generator(char *fname, 
> 		return;
> 	}
> 
>-	statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
>-	stat_errno = errno;
>+	if (dry_run > 1) {
>+		statret = -1;
>+		stat_errno = ENOENT;
>+	} else {
>+		statret = link_stat(fname, &st,
>+				    keep_dirlinks && S_ISDIR(file->mode));
>+		stat_errno = errno;
>+	}
> 
> 	if (only_existing && statret == -1 && stat_errno == ENOENT) {
> 		/* we only want to update existing files */
>--- main.c	31 Jul 2004 16:14:27 -0000	1.215
>+++ main.c	5 Aug 2004 18:14:57 -0000
>@@ -379,9 +379,13 @@ static char *get_local_name(struct file_
> 	if (do_mkdir(name,0777 & ~orig_umask) != 0) {
> 		rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
> 		exit_cleanup(RERR_FILEIO);
>-	} else {
>-		if (verbose > 0)
>-			rprintf(FINFO,"created directory %s\n",name);
>+	}
>+	if (verbose > 0)
>+		rprintf(FINFO, "created directory %s\n", name);
>+
>+	if (dry_run) {
>+		dry_run++;
>+		return NULL;
> 	}
> 
> 	if (!push_dir(name)) {

Actions: View

Attachments on bug 1582: 594