Attachment 12289 Details for Bug 12036 – proposed patch

[patch] proposed patch

12036.patch (text/plain), 1.02 KB, created by Chris Kuehl on 2016-07-25 22:54:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Kuehl

Created: 2016-07-25 22:54:40 UTC

Size: 1.02 KB

patch

obsolete

>diff --git a/generator.c b/generator.c
>index ddf44a0..53dc6b1 100644
>--- a/generator.c
>+++ b/generator.c
>@@ -871,26 +871,26 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
> 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
> 		if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
> 			continue;
>-		switch (match_level) {
>-		case 0:
>+
>+		if (match_level < 1) {
> 			best_match = j;
> 			match_level = 1;
>-			/* FALL THROUGH */
>-		case 1:
>-			if (!unchanged_file(cmpbuf, file, &sxp->st))
>-				continue;
>+		}
>+
>+		if (!unchanged_file(cmpbuf, file, &sxp->st))
>+			continue;
>+
>+		if (match_level < 2) {
> 			best_match = j;
> 			match_level = 2;
>-			/* FALL THROUGH */
>-		case 2:
>-			if (!unchanged_attrs(cmpbuf, file, sxp)) {
>-				free_stat_x(sxp);
>-				continue;
>-			}
>-			best_match = j;
>-			match_level = 3;
>-			break;
> 		}
>+		if (!unchanged_attrs(cmpbuf, file, sxp)) {
>+			free_stat_x(sxp);
>+			continue;
>+		}
>+
>+		best_match = j;
>+		match_level = 3;
> 		break;
> 	} while (basis_dir[++j] != NULL);
>

Actions: View

Attachments on bug 12036: 12288 | 12289