* [PATCH] consolidate command line escaping
@ 2006-01-30 9:04 Jan Beulich
2006-01-30 21:49 ` Sam Ravnborg
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2006-01-30 9:04 UTC (permalink / raw)
To: sam; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
From: Jan Beulich <jbeulich@novell.com>
While the recent change to also escape # symbols when storing C-file
compilation command lines was helpful, it should be in effect for all
command lines, as much as the dollar escaping should be in effect for
C-source compilation commands. Additionally, for better readability and
maintenance, consolidating all the escaping (single quotes, dollars,
and now sharps) was also desirable.
Signed-Off-By: Jan Beulich <jbeulich@novell.com>
[-- Attachment #2: linux-2.6.16-rc1-cmd-escape.patch --]
[-- Type: text/plain, Size: 4217 bytes --]
From: Jan Beulich <jbeulich@novell.com>
While the recent change to also escape # symbols when storing C-file
compilation command lines was helpful, it should be in effect for all
command lines, as much as the dollar escaping should be in effect for
C-source compilation commands. Additionally, for better readability and
maintenance, consolidating all the escaping (single quotes, dollars,
and now sharps) was also desirable.
Signed-Off-By: Jan Beulich <jbeulich@novell.com>
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/Kbuild.include 2.6.16-rc1-cmd-escape/scripts/Kbuild.include
--- /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/Kbuild.include 2006-01-27 15:10:56.000000000 +0100
+++ 2.6.16-rc1-cmd-escape/scripts/Kbuild.include 2006-01-27 09:49:15.000000000 +0100
@@ -51,8 +51,7 @@ endef
build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
# If quiet is set, only print short version of command
-cmd = @$(if $($(quiet)cmd_$(1)),\
- echo ' $(call escsq,$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
+cmd = @$(echo-cmd) $(cmd_$(1))
# Add $(obj)/ for paths that is not absolute
objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
@@ -75,24 +74,24 @@ endif
echo-cmd = $(if $($(quiet)cmd_$(1)), \
echo ' $(call escsq,$($(quiet)cmd_$(1)))';)
+make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
+
# function to only execute the passed command if necessary
# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
# note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
#
if_changed = $(if $(strip $? $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
@set -e; \
- $(echo-cmd) \
- $(cmd_$(1)); \
- echo 'cmd_$@ := $(subst $$,$$$$,$(call escsq,$(cmd_$(1))))' > $(@D)/.$(@F).cmd)
+ $(echo-cmd) $(cmd_$(1)); \
+ echo 'cmd_$@ := $(make-cmd)' > $(@D)/.$(@F).cmd)
# execute the command and also postprocess generated .d dependencies
# file
if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
$(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
@set -e; \
- $(echo-cmd) \
- $(cmd_$(1)); \
- scripts/basic/fixdep $(depfile) $@ '$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))' > $(@D)/.$(@F).tmp; \
+ $(echo-cmd) $(cmd_$(1)); \
+ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/Makefile.build 2.6.16-rc1-cmd-escape/scripts/Makefile.build
--- /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/Makefile.build 2006-01-27 15:10:56.000000000 +0100
+++ 2.6.16-rc1-cmd-escape/scripts/Makefile.build 2006-01-25 09:55:53.000000000 +0100
@@ -177,12 +177,10 @@ cmd_modversions = \
endif
define rule_cc_o_c
- $(if $($(quiet)cmd_checksrc),echo ' $($(quiet)cmd_checksrc)';) \
- $(cmd_checksrc) \
- $(if $($(quiet)cmd_cc_o_c),echo ' $(call escsq,$($(quiet)cmd_cc_o_c))';) \
- $(cmd_cc_o_c); \
+ $(call echo-cmd,checksrc) $(cmd_checksrc) \
+ $(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
$(cmd_modversions) \
- scripts/basic/fixdep $(depfile) $@ '$(call escsq,$(cmd_cc_o_c))' > $(@D)/.$(@F).tmp; \
+ scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
endef
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/basic/fixdep.c 2.6.16-rc1-cmd-escape/scripts/basic/fixdep.c
--- /home/jbeulich/tmp/linux-2.6.16-rc1/scripts/basic/fixdep.c 2006-01-27 15:10:56.000000000 +0100
+++ 2.6.16-rc1-cmd-escape/scripts/basic/fixdep.c 2006-01-27 09:50:59.000000000 +0100
@@ -132,20 +132,10 @@ void usage(void)
/*
* Print out the commandline prefixed with cmd_<target filename> :=
- * If commandline contains '#' escape with '\' so make to not see
- * the '#' as a start-of-comment symbol
- **/
+ */
void print_cmdline(void)
{
- char *p = cmdline;
-
- printf("cmd_%s := ", target);
- for (; *p; p++) {
- if (*p == '#')
- printf("\\");
- printf("%c", *p);
- }
- printf("\n\n");
+ printf("cmd_%s := %s\n\n", target, cmdline);
}
char * str_config = NULL;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] consolidate command line escaping
2006-01-30 9:04 [PATCH] consolidate command line escaping Jan Beulich
@ 2006-01-30 21:49 ` Sam Ravnborg
0 siblings, 0 replies; 3+ messages in thread
From: Sam Ravnborg @ 2006-01-30 21:49 UTC (permalink / raw)
To: Jan Beulich; +Cc: linux-kernel
On Mon, Jan 30, 2006 at 10:04:27AM +0100, Jan Beulich wrote:
> From: Jan Beulich <jbeulich@novell.com>
>
> While the recent change to also escape # symbols when storing C-file
> compilation command lines was helpful, it should be in effect for all
> command lines, as much as the dollar escaping should be in effect for
> C-source compilation commands. Additionally, for better readability and
> maintenance, consolidating all the escaping (single quotes, dollars,
> and now sharps) was also desirable.
Very nice paths - thanks!
I have applied it locally and will commit if it when testing a bit more.
> -cmd = @$(if $($(quiet)cmd_$(1)),\
> - echo ' $(call escsq,$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
> +cmd = @$(echo-cmd) $(cmd_$(1))
Here you replace
echo 'xxx' && cmd
with
echo 'xxx'; cmd
Since we assume echo will always succeed I see no difference in
behaviour, but I recall the '&&' was there for some specific reason.
Just wondering why it is so - I see no problems with it.
Sam
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] consolidate command line escaping
@ 2006-01-31 8:03 Jan Beulich
0 siblings, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2006-01-31 8:03 UTC (permalink / raw)
To: sam; +Cc: linux-kernel
>> -cmd = @$(if $($(quiet)cmd_$(1)),\
>> - echo ' $(call escsq,$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
>> +cmd = @$(echo-cmd) $(cmd_$(1))
>Here you replace
> echo 'xxx' && cmd
>with
> echo 'xxx'; cmd
>
>Since we assume echo will always succeed I see no difference in
>behaviour, but I recall the '&&' was there for some specific reason.
>Just wondering why it is so - I see no problems with it.
Since I didn't see a difference in behavior, and it permitted more re-use of existing constructs, I thought it'd be
reasonable to be replaced; I didn't know of anything that would require the &&.
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-01-31 8:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-30 9:04 [PATCH] consolidate command line escaping Jan Beulich
2006-01-30 21:49 ` Sam Ravnborg
2006-01-31 8:03 Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome