Eric Lee / smarc-fsl-linux-kernel

88
Download as
Browse Code »

Commit a3d1ee10d1bf4520af3d44c1aa6cd46956ec4fd7

Authored by Michael Witten
Committed by Arnaldo Carvalho de Melo
1 parent 0a54fb6360
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

perf tools: Makefile: Remove various and sundry cruft 

This commit squashes several commits that remove:

 unnecessary uname calls
 `sh -c'
 BUILT_INS and QUIET_BUILT_IN

    They have no effect, and the `fixup-builtins' and `check-builtins.sh'
    scripts don't even exist.

 RUNTIME_PREFIX

    It's currently never anything but unset, and it's apparently
    only meaningful when Microsoft Windows is the operating system
    (according to the source for git).

 TEST_PROGRAMS
 EXTRA_PROGRAMS
 unused SHELL_PATH_SQ portions
 unused test for V=2
 useless exports

    Only when `V' is undefined (that is, only when the value of `V'
    is empty) is `export V' performed, which just has the effect of
    placing the empty-valued variable `V' in the environment.

    The only other script to make use of `V' is `Documentation/Makefile',
    which only checks whether `V' is undefined (that is, whether the value
    of `V' is empty); hence, the `export V' has no effect whatsoever.

    Similarly, `export QUIET_GEN' is useless because it will only have
    a non-empty value when `V' has an empty-value, and when `V' has
    an empty-value, `QUIET_GEN' is always explicitly set in every
    script in which it is used.

    `DESTDIR' is only ever defined by the user via the environment
    or the command line, both of which are automatically exported
    to sub-make processes. Furthermore, no non-make sub-scripts
    make use of `DESTDIR' as an environment variable.

    No other scripts use `perfexec_instdir'.

 unused QUIET_SUBDIR{0,1}
 TAR and RPMBUILD
 PTHREAD_LIBS
 Maintainer's dist rules and commands
 distclean target
 Test suite coverage testing
 PRINT_DIR and NO_SUBDIR
 `configure' target
 NO_CURL
 @@PERF_VERSION@@ substitution

    Without the sed command, all of the rule's commands can be reduced
    to a single line that copies a file and sets the permissions properly
    in the process.

 `make test' echo line
 template_instdir
 PERF-BUILD-OPTIONS
 double-colon rules

    The use of double-colon rules seems misguided or vestigial git.

 Essentially hard-coded $(SCRIPTS) expansion

Signed-off-by: Michael Witten <mfwitten@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 3 changed files with 10 additions and 223 deletions Side-by-side Diff

tools/perf/.gitignore
Diff comments   View file @ a3d1ee1
1   -PERF-BUILD-OPTIONS
2 1 PERF-CFLAGS
3 2 PERF-GUI-VARS
4 3 PERF-VERSION-FILE
... ... @@ -3,7 +3,7 @@
3 3 endif
4 4  
5 5 # The default target of this Makefile is...
6   -all::
  6 +all:
7 7  
8 8 ifneq ($(OUTPUT),)
9 9 # check that the output directory actually exists
... ... @@ -11,8 +11,7 @@
11 11 $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
12 12 endif
13 13  
14   -# Define V=1 to have a more verbose compile.
15   -# Define V=2 to have an even more verbose compile.
  14 +# Define V to have a more verbose compile.
16 15 #
17 16 # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
18 17 #
... ... @@ -28,12 +27,7 @@
28 27 @$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)
29 28 -include $(OUTPUT)PERF-VERSION-FILE
30 29  
31   -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
32   -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
33   -uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
34   -uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
35   -uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
36   -uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
  30 +uname_M := $(shell uname -m 2>/dev/null || echo not)
37 31  
38 32 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
39 33 -e s/arm.*/arm/ -e s/sa110/arm/ \
... ... @@ -52,8 +46,6 @@
52 46 ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S
53 47 endif
54 48  
55   -# CFLAGS and LDFLAGS are for the users to override from the command line.
56   -
57 49 #
58 50 # Include saner warnings here, which can catch bugs:
59 51 #
60 52  
61 53  
... ... @@ -131,22 +123,13 @@
131 123 AR = $(CROSS_COMPILE)ar
132 124 RM = rm -f
133 125 MKDIR = mkdir
134   -TAR = tar
135 126 FIND = find
136 127 INSTALL = install
137   -RPMBUILD = rpmbuild
138   -PTHREAD_LIBS = -lpthread
139 128  
140 129 # sparse is architecture-neutral, which means that we need to tell it
141 130 # explicitly what architecture to check for. Fix this up for yours..
142 131 SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
143 132  
144   -ifeq ($(V), 2)
145   - QUIET_STDERR = ">/dev/null"
146   -else
147   - QUIET_STDERR = ">/dev/null 2>&1"
148   -endif
149   -
150 133 -include feature-tests.mak
151 134  
152 135 ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -fstack-protector-all),y)
153 136  
... ... @@ -171,12 +154,10 @@
171 154  
172 155 # Guard against environment variables
173 156 BUILTIN_OBJS =
174   -BUILT_INS =
175 157 LIB_H =
176 158 LIB_OBJS =
177 159 PYRF_OBJS =
178 160 SCRIPT_SH =
179   -TEST_PROGRAMS =
180 161  
181 162 SCRIPT_SH += perf-archive.sh
182 163  
... ... @@ -192,12 +173,6 @@
192 173  
193 174 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
194 175  
195   -# Empty...
196   -EXTRA_PROGRAMS =
197   -
198   -# ... and all the rest that could be moved out of bindir to perfexecdir
199   -PROGRAMS += $(EXTRA_PROGRAMS)
200   -
201 176 #
202 177 # Single 'perf' binary right now:
203 178 #
... ... @@ -205,10 +180,6 @@
205 180  
206 181 LANG_BINDINGS =
207 182  
208   -# List built-in command $C whose implementation cmd_$C() is not in
209   -# builtin-$C.o but is linked in as part of some other command.
210   -#
211   -
212 183 # what 'all' will build and 'install' will install, in perfexecdir
213 184 ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
214 185  
215 186  
216 187  
... ... @@ -565,33 +536,13 @@
565 536 endif
566 537 endif
567 538  
568   -ifdef RUNTIME_PREFIX
569   - COMPAT_CFLAGS += -DRUNTIME_PREFIX
570   -endif
571   -
572   -QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
573   -QUIET_SUBDIR1 =
574   -
575   -ifneq ($(findstring $(MAKEFLAGS),w),w)
576   -PRINT_DIR = --no-print-directory
577   -else # "make -w"
578   -NO_SUBDIR = :
579   -endif
580   -
581 539 ifneq ($(findstring $(MAKEFLAGS),s),s)
582 540 ifndef V
583 541 QUIET_CC = @echo ' ' CC $@;
584 542 QUIET_AR = @echo ' ' AR $@;
585 543 QUIET_LINK = @echo ' ' LINK $@;
586 544 QUIET_MKDIR = @echo ' ' MKDIR $@;
587   - QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
588 545 QUIET_GEN = @echo ' ' GEN $@;
589   - QUIET_SUBDIR0 = +@subdir=
590   - QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
591   - $(MAKE) $(PRINT_DIR) -C $$subdir
592   - export V
593   - export QUIET_GEN
594   - export QUIET_BUILT_IN
595 546 endif
596 547 endif
597 548  
598 549  
599 550  
... ... @@ -621,17 +572,15 @@
621 572 ALL_CFLAGS += $(ARCH_CFLAGS)
622 573 ALL_LDFLAGS += $(BASIC_LDFLAGS)
623 574  
624   -export TAR INSTALL DESTDIR SHELL_PATH
  575 +export INSTALL SHELL_PATH
625 576  
626 577  
627 578 ### Build rules
628 579  
629 580 SHELL = $(SHELL_PATH)
630 581  
631   -all:: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(BUILT_INS) $(OTHER_PROGRAMS) $(OUTPUT)PERF-BUILD-OPTIONS
  582 +all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
632 583  
633   -all::
634   -
635 584 please_set_SHELL_PATH_to_a_more_modern_shell:
636 585 @$$(:)
637 586  
638 587  
639 588  
640 589  
... ... @@ -661,37 +610,17 @@
661 610 '-DPERF_MAN_PATH="$(mandir_SQ)"' \
662 611 '-DPERF_INFO_PATH="$(infodir_SQ)"' $<
663 612  
664   -$(BUILT_INS): $(OUTPUT)perf$X
665   - $(QUIET_BUILT_IN)$(RM) $@ && \
666   - ln perf$X $@ 2>/dev/null || \
667   - ln -s perf$X $@ 2>/dev/null || \
668   - cp perf$X $@
669   -
670 613 $(OUTPUT)common-cmds.h: util/generate-cmdlist.sh command-list.txt
671 614  
672 615 $(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt)
673 616 $(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@
674 617  
675   -$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
676   - $(QUIET_GEN)$(RM) $(OUTPUT)$@ $(OUTPUT)$@+ && \
677   - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
678   - -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
679   - -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \
680   - -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
681   - $@.sh > $(OUTPUT)$@+ && \
682   - chmod +x $(OUTPUT)$@+ && \
683   - mv $(OUTPUT)$@+ $(OUTPUT)$@
  618 +$(SCRIPTS) : % : %.sh
  619 + $(QUIET_GEN)$(INSTALL) '$@.sh' '$(OUTPUT)$@'
684 620  
685   -configure: configure.ac
686   - $(QUIET_GEN)$(RM) $@ $<+ && \
687   - sed -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \
688   - $< > $<+ && \
689   - autoconf -o $@ $<+ && \
690   - $(RM) $<+
691   -
692 621 # These can record PERF_VERSION
693 622 $(OUTPUT)perf.o perf.spec \
694   - $(patsubst %.sh,%,$(SCRIPT_SH)) \
  623 + $(SCRIPTS) \
695 624 : $(OUTPUT)PERF-VERSION-FILE
696 625  
697 626 $(OUTPUT)%.o: %.c $(OUTPUT)PERF-CFLAGS
698 627  
... ... @@ -826,23 +755,8 @@
826 755 echo "$$FLAGS" >$(OUTPUT)PERF-CFLAGS; \
827 756 fi
828 757  
829   -# We need to apply sq twice, once to protect from the shell
830   -# that runs $(OUTPUT)PERF-BUILD-OPTIONS, and then again to protect it
831   -# and the first level quoting from the shell that runs "echo".
832   -$(OUTPUT)PERF-BUILD-OPTIONS: .FORCE-PERF-BUILD-OPTIONS
833   - @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
834   - @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
835   - @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
836   -
837 758 ### Testing rules
838 759  
839   -#
840   -# None right now:
841   -#
842   -# TEST_PROGRAMS += test-something$X
843   -
844   -all:: $(TEST_PROGRAMS)
845   -
846 760 # GNU make supports exporting all variables by "export" without parameters.
847 761 # However, the environment gets quite big, and some programs have problems
848 762 # with that.
849 763  
850 764  
851 765  
... ... @@ -855,29 +769,17 @@
855 769 sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; \
856 770 done; \
857 771 else \
858   - echo 2>&1 "Did you mean 'make test'?"; \
859 772 exit 1; \
860 773 fi
861 774  
862   -remove-dashes:
863   - ./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
864   -
865 775 ### Installation rules
866 776  
867   -ifneq ($(filter /%,$(firstword $(template_dir))),)
868   -template_instdir = $(template_dir)
869   -else
870   -template_instdir = $(prefix)/$(template_dir)
871   -endif
872   -export template_instdir
873   -
874 777 ifneq ($(filter /%,$(firstword $(perfexecdir))),)
875 778 perfexec_instdir = $(perfexecdir)
876 779 else
877 780 perfexec_instdir = $(prefix)/$(perfexecdir)
878 781 endif
879 782 perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
880   -export perfexec_instdir
881 783  
882 784 install: all
883 785 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
... ... @@ -894,14 +796,6 @@
894 796 $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
895 797 $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
896 798  
897   -ifdef BUILT_INS
898   - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
899   - $(INSTALL) $(BUILT_INS) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
900   -ifneq (,$X)
901   - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) $(OUTPUT)perf$X)), $(RM) '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/$p';)
902   -endif
903   -endif
904   -
905 799 install-doc:
906 800 $(MAKE) -C Documentation install
907 801  
908 802  
909 803  
910 804  
911 805  
912 806  
... ... @@ -926,105 +820,18 @@
926 820 quick-install-html:
927 821 $(MAKE) -C Documentation quick-install-html
928 822  
929   -
930   -### Maintainer's dist rules
931   -#
932   -# None right now
933   -#
934   -#
935   -# perf.spec: perf.spec.in
936   -# sed -e 's/@@VERSION@@/$(PERF_VERSION)/g' < $< > $@+
937   -# mv $@+ $@
938   -#
939   -# PERF_TARNAME=perf-$(PERF_VERSION)
940   -# dist: perf.spec perf-archive$(X) configure
941   -# ./perf-archive --format=tar \
942   -# --prefix=$(PERF_TARNAME)/ HEAD^{tree} > $(PERF_TARNAME).tar
943   -# @mkdir -p $(PERF_TARNAME)
944   -# @cp perf.spec configure $(PERF_TARNAME)
945   -# @echo $(PERF_VERSION) > $(PERF_TARNAME)/version
946   -# $(TAR) rf $(PERF_TARNAME).tar \
947   -# $(PERF_TARNAME)/perf.spec \
948   -# $(PERF_TARNAME)/configure \
949   -# $(PERF_TARNAME)/version
950   -# @$(RM) -r $(PERF_TARNAME)
951   -# gzip -f -9 $(PERF_TARNAME).tar
952   -#
953   -# htmldocs = perf-htmldocs-$(PERF_VERSION)
954   -# manpages = perf-manpages-$(PERF_VERSION)
955   -# dist-doc:
956   -# $(RM) -r .doc-tmp-dir
957   -# mkdir .doc-tmp-dir
958   -# $(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
959   -# cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
960   -# gzip -n -9 -f $(htmldocs).tar
961   -# :
962   -# $(RM) -r .doc-tmp-dir
963   -# mkdir -p .doc-tmp-dir/man1 .doc-tmp-dir/man5 .doc-tmp-dir/man7
964   -# $(MAKE) -C Documentation DESTDIR=./ \
965   -# man1dir=../.doc-tmp-dir/man1 \
966   -# man5dir=../.doc-tmp-dir/man5 \
967   -# man7dir=../.doc-tmp-dir/man7 \
968   -# install
969   -# cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
970   -# gzip -n -9 -f $(manpages).tar
971   -# $(RM) -r .doc-tmp-dir
972   -#
973   -# rpm: dist
974   -# $(RPMBUILD) -ta $(PERF_TARNAME).tar.gz
975   -
976 823 ### Cleaning rules
977 824  
978   -distclean: clean
979   -# $(RM) configure
980   -
981 825 clean:
982 826 $(RM) $(OUTPUT){*.o,*/*.o,*/*/*.o,*/*/*/*.o,$(LIB_FILE),perf-archive}
983   - $(RM) $(ALL_PROGRAMS) $(BUILT_INS) perf
984   - $(RM) $(TEST_PROGRAMS)
  827 + $(RM) $(ALL_PROGRAMS) perf
985 828 $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*
986   - $(RM) -r $(PERF_TARNAME) .doc-tmp-dir
987   - $(RM) $(PERF_TARNAME).tar.gz perf-core_$(PERF_VERSION)-*.tar.gz
988   - $(RM) $(htmldocs).tar.gz $(manpages).tar.gz
989 829 $(MAKE) -C Documentation/ clean
990   - $(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)PERF-BUILD-OPTIONS
  830 + $(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS
991 831 @python util/setup.py clean --build-lib='$(OUTPUT)python' \
992 832 --build-temp='$(OUTPUT)python/temp'
993 833  
994 834 .PHONY: all install clean strip
995 835 .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
996 836 .PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope .FORCE-PERF-CFLAGS
997   -.PHONY: .FORCE-PERF-BUILD-OPTIONS
998   -
999   -### Make sure built-ins do not have dups and listed in perf.c
1000   -#
1001   -check-builtins::
1002   - ./check-builtins.sh
1003   -
1004   -### Test suite coverage testing
1005   -#
1006   -# None right now
1007   -#
1008   -# .PHONY: coverage coverage-clean coverage-build coverage-report
1009   -#
1010   -# coverage:
1011   -# $(MAKE) coverage-build
1012   -# $(MAKE) coverage-report
1013   -#
1014   -# coverage-clean:
1015   -# rm -f *.gcda *.gcno
1016   -#
1017   -# COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
1018   -# COVERAGE_LDFLAGS = $(CFLAGS) -O0 -lgcov
1019   -#
1020   -# coverage-build: coverage-clean
1021   -# $(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
1022   -# $(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
1023   -# -j1 test
1024   -#
1025   -# coverage-report:
1026   -# gcov -b *.c */*.c
1027   -# grep '^function.*called 0 ' *.c.gcov */*.c.gcov \
1028   -# | sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
1029   -# | tee coverage-untested-functions
tools/perf/util/exec_cmd.c
Diff comments   View file @ a3d1ee1
... ... @@ -11,30 +11,11 @@
11 11  
12 12 const char *system_path(const char *path)
13 13 {
14   -#ifdef RUNTIME_PREFIX
15   - static const char *prefix;
16   -#else
17 14 static const char *prefix = PREFIX;
18   -#endif
19 15 struct strbuf d = STRBUF_INIT;
20 16  
21 17 if (is_absolute_path(path))
22 18 return path;
23   -
24   -#ifdef RUNTIME_PREFIX
25   - assert(argv0_path);
26   - assert(is_absolute_path(argv0_path));
27   -
28   - if (!prefix &&
29   - !(prefix = strip_path_suffix(argv0_path, PERF_EXEC_PATH)) &&
30   - !(prefix = strip_path_suffix(argv0_path, BINDIR)) &&
31   - !(prefix = strip_path_suffix(argv0_path, "perf"))) {
32   - prefix = PREFIX;
33   - fprintf(stderr, "RUNTIME_PREFIX requested, "
34   - "but prefix computation failed. "
35   - "Using static fallback '%s'.\n", prefix);
36   - }
37   -#endif
38 19  
39 20 strbuf_addf(&d, "%s/%s", prefix, path);
40 21 path = strbuf_detach(&d, NULL);