emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whitespace fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-12 23:02:43 +00:00
parent a8374a1916
commit 52ec4b98d5
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -960,7 +960,7 @@ clean: archclean $(clean-dirs)
$(call cmd,rmdirs) $(call cmd,rmdirs)
$(call cmd,rmfiles) $(call cmd,rmfiles)
@find . $(RCS_FIND_IGNORE) \ @find . $(RCS_FIND_IGNORE) \
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
-type f -print | xargs rm -f -type f -print | xargs rm -f
@ -984,9 +984,9 @@ PHONY += distclean
distclean: mrproper distclean: mrproper
@find $(srctree) $(RCS_FIND_IGNORE) \ @find $(srctree) $(RCS_FIND_IGNORE) \
\( -name '*.orig' -o -name '*.rej' -o -name '*~' \ \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-o -name '.*.rej' -o -name '*.tmp' -o -size 0 \ -o -name '.*.rej' -o -name '*.tmp' -o -size 0 \
-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-type f -print | xargs rm -f -type f -print | xargs rm -f
@ -1090,7 +1090,7 @@ clean: rm-dirs := $(MODVERDIR)
clean: $(clean-dirs) clean: $(clean-dirs)
$(call cmd,rmdirs) $(call cmd,rmdirs)
@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \ @find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
-type f -print | xargs rm -f -type f -print | xargs rm -f

2
archival/dpkg.c
View File

@ -1169,7 +1169,7 @@ static char **create_list(const char *filename)
file_list = NULL; file_list = NULL;
count = 0; count = 0;
while ((line = xmalloc_fgetline(list_stream)) != NULL) { while ((line = xmalloc_fgetline(list_stream)) != NULL) {
//TODO: zeroing xrealloc_vector? //TODO: zeroing xrealloc_vector?
file_list = xrealloc_vector(file_list, 2, count); file_list = xrealloc_vector(file_list, 2, count);
file_list[count++] = line; file_list[count++] = line;
file_list[count] = NULL; file_list[count] = NULL;

16
scripts/fix_ws.sh
View File

@ -27,13 +27,11 @@ find "$@" -type f \
# shell testsuite entries are not to be touched too # shell testsuite entries are not to be touched too
test "YES" = "${name/*.right/YES}" && continue test "YES" = "${name/*.right/YES}" && continue
if test "YES" = "${name/*.[ch]/YES}" \ if test "YES" = "${name/*.[chsS]/YES}" \
-o "YES" = "${name/*.sh/YES}" \ -o "YES" = "${name/*.sh/YES}" \
-o "YES" = "${name/*.txt/YES}" \ -o "YES" = "${name/*.txt/YES}" \
-o "YES" = "${name/*.html/YES}" \ -o "YES" = "${name/*.html/YES}" \
-o "YES" = "${name/*.htm/YES}" \ -o "YES" = "${name/*.htm/YES}" \
-o "YES" = "${name/*Makefile*/YES}" \
-o "YES" = "${name/*Kbuild*/YES}" \
-o "YES" = "${name/*Config.in*/YES}" \ -o "YES" = "${name/*Config.in*/YES}" \
; then ; then
# More aggressive whitespace fixes for known file types # More aggressive whitespace fixes for known file types
@ -46,6 +44,18 @@ find "$@" -type f \
-e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \
-e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \
| sed "$trailingws_" | sed "$trailingws_"
elif test "YES" = "${name/*Makefile*/YES}" \
-o "YES" = "${name/*Kbuild*/YES}" \
; then
# For Makefiles, never convert "1-7spaces+tab" into "tabtab"
echo "Makefile: $name" >&2
cat "$name" \
| sed -e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \
-e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \
| sed -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \
-e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \
-e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \
| sed "$trailingws_"
else else
# Only remove trailing WS for the rest # Only remove trailing WS for the rest
echo "Removing trailing whitespace: $name" >&2 echo "Removing trailing whitespace: $name" >&2