Changeset 1599 for trunk/kBuild/footer.kmk

Timestamp:

May 1, 2008, 11:55:11 PM (17 years ago)

Author:

bird

Message:

Explicitly terminate the argument list for RM, RMDIR, MKDIR and INSTALL.

File:

• trunk/kBuild/footer.kmk (modified) (14 diffs)

trunk/kBuild/footer.kmk

@@ -25 +25 @@
 #
 # As a special exception you are granted permission to include this file, via
-# the kmk include directive, as you wish without this in itself causing the 
-# resulting makefile, program or whatever to be covered by the GPL license. 
+# the kmk include directive, as you wish without this in itself causing the
+# resulting makefile, program or whatever to be covered by the GPL license.
 # This exception does not however invalidate any other reasons why the makefile,
 # program, whatever should not be covered the GPL.
@@ -1490 +1490 @@
         %$$(call MSG_FETCH_DL,$(target),$(source),$(out))
         @## @todo do fancy stuff like download continuation.
-        $$(QUIET)$$(RM) -f $(out)
+        $$(QUIET)$$(RM) -f -- $(out)
         $($(target)_$(srcname)_FETCH_CMDS_)
         $$(QUIET)$(if $(md5),$$(MD5SUM_EXT) -b -C $(md5) $(out))
@@ -1499 +1499 @@
 $(out).checked_$(md5)_$(size): $($(target)_$(srcname)_FETCH_DEPEND_) | $($(target)_$(srcname)_FETCH_DEPORD_)
         %$$(call MSG_FETCH_CHK,$(target),$(source),$(out))
-        $$(QUIET)$$(RM) -f $$@
+        $$(QUIET)$$(RM) -f -- $$@
         @# (re)fetch the file if it doesn't exist or if it doesn't matches the md5.
         @## @todo do fancy stuff like download continuation.
@@ -1521 +1521 @@
                 | $($(target)_$(srcname)_UNPACK_DEPORD_) $(archive).checked_$(md5)_$(size)
         %$$(call MSG_FETCH_UP,$(target),$(archive),$(inst))
-        $$(QUIET)$$(RM) -f $(out)
+        $$(QUIET)$$(RM) -f -- $(out)
         @# if the source archive doesn't exist fetch it (can have been deleted to save space).
         $$(QUIET)test -f $(archive) \
@@ -1725 +1725 @@
 $(out).lst: $(_TARGET_$(target)_UNPACKED) | $(call DIRDEP,$(inst))
         %$$(call MSG_FETCH_OK,$(target))
-        $$(QUIET)$$(RM) -f $$@ $$@.tmp
+        $$(QUIET)$$(RM) -f -- $$@ $$@.tmp
         $$(QUIET2)$$(APPEND) $$@.tmp '$(notdir $(out))'
         $$(QUIET)$(if $(_TARGET_$(target)_UNPACKED),$$(CAT_EXT) $(_TARGET_$(target)_UNPACKED) >> $$@.tmp)
-        $$(QUIET)$$(MV) -f $$@.tmp $$@
+        $$(QUIET)$$(MV) -f -- $$@.tmp $$@
 
 $(out)_unfetched:
         %$$(call MSG_UNFETCH,$(target))
-        $$(QUIET)$$(RM) -f $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
-        $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@) \
+        $$(QUIET)$$(RM) -f -- $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
+        $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@) \
                 $$(addprefix $(inst),$$(sort $$(dir $$(shell $$(CAT_EXT) $(out).lst 2> /dev/null))))
-        $$(QUIET)$$(RM) -f $(out).lst $(out)
-        $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@)
+        $$(QUIET)$$(RM) -f -- $(out).lst $(out)
+        $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@)
 
 $(out): $(comp-vars _TARGET_$(target)_DIGEST_PREV,_TARGET_$(target)_DIGEST,FORCE) | $(call DIRDEP,$(inst))
-        $$(QUIET)$$(RM) -f $$@
+        $$(QUIET)$$(RM) -f -- $$@
         %$$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(wildcard $(out).lst)\
                 ,$$(call MSG_REFETCH,$(target)),$$(call MSG_FETCH,$(target))),$$(call MSG_UNFETCH,$(target)))
         $$(QUIET)$$(if $$(wildcard $(out).lst      ),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out)_unfetched)
-        $$(QUIET)$$(if  $$(_TARGET_$(target)_DIGEST),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out).lst,$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@))
+        $$(QUIET)$$(if  $$(_TARGET_$(target)_DIGEST),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out).lst,$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@))
         $$(QUIET2)$$(if $$(_TARGET_$(target)_DIGEST),$$(APPEND) $$@ "_TARGET_$(target)_DIGEST_PREV := $(_TARGET_$(target)_DIGEST)")
 
@@ -1868 +1868 @@
         %$$(call MSG_COMPILE,$(target),$(source),$$@,$(type))
 ifdef TOOL_$(tool)_COMPILE_$(type)_DONT_PURGE_OUTPUT
-        $$(QUIET)$$(RM) -f $(dep) $(obj) $($(target)_$(source)_OUTPUT_) $($(target)_OUTPUT_MAYBE_)
+        $$(QUIET)$$(RM) -f -- $(dep) $(obj) $($(target)_$(source)_OUTPUT_) $($(target)_OUTPUT_MAYBE_)
 endif
 endif
@@ -1914 +1914 @@
                 $($(target)_DEPORD_)
         %$$(call MSG_LINK,$(target),$$@,$(tool_do))
-        $$(QUIET)$$(RM) -f $(dep) $(out) $($(target)_OUTPUT_) $($(target)_OUTPUT_MAYBE_)
+        $$(QUIET)$$(RM) -f -- $(dep) $(out) $($(target)_OUTPUT_) $($(target)_OUTPUT_MAYBE_)
 
 $(cmds)
@@ -1937 +1937 @@
 $(INSTARGET_$(target)) : $(out) | $(call DIRDEP,$(dir $(INSTARGET_$(target))))
         %$$(call MSG_INST_TRG,$(target),$(out),$$@)
-        $$(QUIET)$$(INSTALL) $$(if $(mode),-m $(mode)) $(out) $$@
+        $$(QUIET)$$(INSTALL) $$(if $(mode),-m $(mode)) -- $(out) $$@
 
 ifdef KBUILD_DO_AUTO_INSTALL
@@ -2851 +2851 @@
                 $(if $(gid),-g $(gid))\
                 $(if $(mode),-m $(mode))\
-                $(flags)\
+                $(flags) -- \
                 $(srcsrc) $(insdst)
 endif
@@ -2867 +2867 @@
 $(insdst) : | $(call DIRDEP,$(dir $(insdst)))
         %$$(call MSG_INST_SYM,$(insdst),$(symdst))
-        $$(QUIET)$$(RM) -f $$@
+        $$(QUIET)$$(RM) -f -- $$@
         $$(QUIET)$$(LN_SYMLINK) $(symdst) $(insdst)
 endef
@@ -2917 +2917 @@
                 $(if $(gid),-g $(gid))\
                 $(if $(mode),-m $(mode))\
-                $(flags)\
+                $(flags) -- \
                 $(insdst)
 
@@ -3054 +3054 @@
 $(directory):
         %$$(call MSG_MKDIR,$$@)
-        $$(QUIET)$$(MKDIR) -p $$@
+        $$(QUIET)$$(MKDIR) -p -- $$@
 endef
 
@@ -3083 +3083 @@
 do-clean:
         %$(call MSG_CLEAN)
-        $(QUIET)$(RM) -f $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)
-        $(QUIET)$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $(rsort $(dir $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)))
+        $(QUIET)$(RM) -f -- $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)
+        $(QUIET)$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $(rsort $(dir $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)))
 
 
@@ -3232 +3232 @@
 # @todo make this a non-default pass!
 uninstall:
-        $(RM) -f $(_INSTALLS_FILES)
+        $(RM) -f -- $(_INSTALLS_FILES)
 
 install: pass_installs