From 0461b869d0800656bf41722c1a68800e728e45e5 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 10 Nov 2006 20:41:43 +0000 Subject: [PATCH] Fixed some patch fuzz. --- flags.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flags.diff b/flags.diff index 8f45daf..cea538a 100644 --- a/flags.diff +++ b/flags.diff @@ -179,16 +179,16 @@ To use this patch, run these commands for a successful build: } } -@@ -978,7 +994,7 @@ static void recv_generator(char *fname, +@@ -977,7 +993,7 @@ static void recv_generator(char *fname, + * we need to delete it. If it doesn't exist, then * (perhaps recursively) create it. */ - int sr; if (statret == 0 && !S_ISDIR(st.st_mode)) { - if (delete_item(fname, st.st_mode, del_opts) < 0) + if (delete_item(fname, st.st_mode, FILEFLAGS(st.st_flags), del_opts) < 0) return; statret = -1; } -@@ -1069,7 +1085,7 @@ static void recv_generator(char *fname, +@@ -1071,7 +1087,7 @@ static void recv_generator(char *fname, } /* Not the right symlink (or not a symlink), so * delete it. */ @@ -197,7 +197,7 @@ To use this patch, run these commands for a successful build: return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1132,7 +1148,7 @@ static void recv_generator(char *fname, +@@ -1134,7 +1150,7 @@ static void recv_generator(char *fname, goto return_with_success; return; } @@ -206,7 +206,7 @@ To use this patch, run these commands for a successful build: return; } else if (basis_dir[0] != NULL) { int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st, -@@ -1218,7 +1234,7 @@ static void recv_generator(char *fname, +@@ -1220,7 +1236,7 @@ static void recv_generator(char *fname, fnamecmp_type = FNAMECMP_FNAME; if (statret == 0 && !S_ISREG(st.st_mode)) { -- 2.34.1