From 5bafda3026f713e2e72b95a029bf12839d04e3cb Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 24 Nov 2006 08:41:23 +0000 Subject: [PATCH] Fixed failing hunks. --- detect-renamed.diff | 2 +- flags.diff | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/detect-renamed.diff b/detect-renamed.diff index 89ffe14..c190b33 100644 --- a/detect-renamed.diff +++ b/detect-renamed.diff @@ -386,7 +386,7 @@ TODO: f_name(fp, delbuf); - if (delete_delay_fp) + if (delete_delay_fp && !(flags & DEL_NO_DELETIONS)) - fprintf(delete_delay_fp, "%o %s%c", fp->mode, delbuf, '\0'); + fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); - } diff --git a/flags.diff b/flags.diff index 720f72e..0f16462 100644 --- a/flags.diff +++ b/flags.diff @@ -8,6 +8,8 @@ To use this patch, run these commands for a successful build: ./configure make +TODO: fix --delete-delay to work with --flags option. + --- old/configure.in +++ new/configure.in @@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd @@ -169,7 +171,7 @@ To use this patch, run these commands for a successful build: f_name(fp, delbuf); - if (delete_delay_fp) + if (delete_delay_fp) /* XXX need to output fileflags value here too */ - fprintf(delete_delay_fp, "%o %s%c", fp->mode, delbuf, '\0'); + fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0'); else - delete_item(delbuf, fp->mode, NULL, DEL_RECURSE); + delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE); -- 2.34.1