diff options
| -rw-r--r-- | Makefile.custom | 8 | ||||
| -rw-r--r-- | libbb/recursive_action.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.custom b/Makefile.custom index 816bee5db..e976e739e 100644 --- a/Makefile.custom +++ b/Makefile.custom | |||
| @@ -46,17 +46,17 @@ check test: busybox | |||
| 46 | release: distclean | 46 | release: distclean |
| 47 | cd ..; \ | 47 | cd ..; \ |
| 48 | rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \ | 48 | rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \ |
| 49 | cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && \ | 49 | cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \ |
| 50 | find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \ | 50 | find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \ |
| 51 | -name .svn \ | 51 | -name .svn \ |
| 52 | -print \ | 52 | -print \ |
| 53 | -exec rm -r -f {} \; && \ | 53 | -exec rm -r -f {} \; ; \ |
| 54 | find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ | 54 | find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ |
| 55 | -name .\#* \ | 55 | -name .\#* \ |
| 56 | -print \ | 56 | -print \ |
| 57 | -exec rm -f {} \; && \ | 57 | -exec rm -f {} \; ; \ |
| 58 | tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \ | 58 | tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \ |
| 59 | busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/; | 59 | busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; } |
| 60 | 60 | ||
| 61 | .PHONY: checkhelp | 61 | .PHONY: checkhelp |
| 62 | checkhelp: | 62 | checkhelp: |
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 05ff5d84f..121a3dffd 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c | |||
| @@ -93,6 +93,10 @@ int recursive_action(const char *fileName, | |||
| 93 | 93 | ||
| 94 | dir = opendir(fileName); | 94 | dir = opendir(fileName); |
| 95 | if (!dir) { | 95 | if (!dir) { |
| 96 | /* findutils-4.1.20 reports this */ | ||
| 97 | /* (i.e. it doesn't silently return with exit code 1) */ | ||
| 98 | /* To trigger: "find -exec rm -rf {} \;" */ | ||
| 99 | bb_perror_msg("%s", fileName); | ||
| 96 | return FALSE; | 100 | return FALSE; |
| 97 | } | 101 | } |
| 98 | status = TRUE; | 102 | status = TRUE; |
