summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.custom8
-rw-r--r--libbb/recursive_action.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.custom b/Makefile.custom
index 816bee5..e976e73 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -46,17 +46,17 @@ check test: busybox
release: distclean
cd ..; \
rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
- cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && \
+ cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
-name .svn \
-print \
- -exec rm -r -f {} \; && \
+ -exec rm -r -f {} \; ; \
find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
-name .\#* \
-print \
- -exec rm -f {} \; && \
+ -exec rm -f {} \; ; \
tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \
- busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/;
+ busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; }
.PHONY: checkhelp
checkhelp:
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index 05ff5d8..121a3df 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -93,6 +93,10 @@ int recursive_action(const char *fileName,
dir = opendir(fileName);
if (!dir) {
+ /* findutils-4.1.20 reports this */
+ /* (i.e. it doesn't silently return with exit code 1) */
+ /* To trigger: "find -exec rm -rf {} \;" */
+ bb_perror_msg("%s", fileName);
return FALSE;
}
status = TRUE;