Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1568fa7

Browse files
committed
Use single quotes in preference to double quotes for protecting pathnames.
Per recommendation from Peter. Neither choice is bulletproof, but thisis the existing style and it does help prevent unexpected environmentvariable substitution.
1 parente1ccaff commit1568fa7

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎src/Makefile.global.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ X = @EXEEXT@
263263

264264
ifneq (@PERL@,)
265265
# quoted to protect pathname with spaces
266-
PERL="@PERL@"
266+
PERL='@PERL@'
267267
else
268268
PERL=$(missing) perl
269269
endif
@@ -437,7 +437,7 @@ endif
437437
pg_regress_locale_flags =$(if$(ENCODING),--encoding=$(ENCODING))$(NOLOCALE)
438438

439439
pg_regress_check =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir)$(pg_regress_locale_flags)
440-
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir="$(PSQLDIR)"$(pg_regress_locale_flags)
440+
pg_regress_installcheck =$(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)'$(pg_regress_locale_flags)
441441

442442
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
443443

‎src/Makefile.shlib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ ifeq ($(PORTNAME), darwin)
130130
ifneq ($(SO_MAJOR_VERSION), 0)
131131
version_link= -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
132132
endif
133-
LINK.shared= $(COMPILER) -dynamiclib -install_name"$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)" $(version_link) $(exported_symbols_list) -multiply_defined suppress
133+
LINK.shared= $(COMPILER) -dynamiclib -install_name'$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
134134
shlib= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
135135
shlib_major= lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
136136
else

‎src/backend/Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,27 +164,27 @@ utils/probes.h: utils/probes.d
164164
# For headers generated during regular builds, we prefer a relative symlink.
165165

166166
$(top_builddir)/src/include/parser/gram.h: parser/gram.h
167-
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
168-
cd$(dir$@)&& rm -f$(notdir$@)&&\
167+
prereqdir=`cd'$(dir $<)'>/dev/null&& pwd`&&\
168+
cd'$(dir $@)'&& rm -f$(notdir$@)&&\
169169
$(LN_S)"$$prereqdir/$(notdir $<)".
170170

171171
$(top_builddir)/src/include/catalog/schemapg.h: catalog/schemapg.h
172-
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
173-
cd$(dir$@)&& rm -f$(notdir$@)&&\
172+
prereqdir=`cd'$(dir $<)'>/dev/null&& pwd`&&\
173+
cd'$(dir $@)'&& rm -f$(notdir$@)&&\
174174
$(LN_S)"$$prereqdir/$(notdir $<)".
175175

176176
$(top_builddir)/src/include/utils/errcodes.h: utils/errcodes.h
177-
cd$(dir$@)&& rm -f$(notdir$@)&&\
178-
$(LN_S) ../../../$(subdir)/utils/errcodes.h.
177+
cd'$(dir $@)'&& rm -f$(notdir$@)&&\
178+
$(LN_S)"../../../$(subdir)/utils/errcodes.h".
179179

180180
$(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h
181-
prereqdir=`cd$(dir $<)>/dev/null&& pwd`&&\
182-
cd$(dir$@)&& rm -f$(notdir$@)&&\
181+
prereqdir=`cd'$(dir $<)'>/dev/null&& pwd`&&\
182+
cd'$(dir $@)'&& rm -f$(notdir$@)&&\
183183
$(LN_S)"$$prereqdir/$(notdir $<)".
184184

185185
$(top_builddir)/src/include/utils/probes.h: utils/probes.h
186-
cd$(dir$@)&& rm -f$(notdir$@)&&\
187-
$(LN_S) ../../../$(subdir)/utils/probes.h.
186+
cd'$(dir $@)'&& rm -f$(notdir$@)&&\
187+
$(LN_S)"../../../$(subdir)/utils/probes.h".
188188

189189

190190
utils/probes.o: utils/probes.d$(SUBDIROBJS)

‎src/interfaces/ecpg/test/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ top_builddir = ../../../..
55
include$(top_builddir)/src/Makefile.global
66

77
overrideCPPFLAGS :=\
8-
-I$(top_builddir)/src/port\
9-
-I$(top_srcdir)/src/test/regress\
8+
'-I$(top_builddir)/src/port'\
9+
'-I$(top_srcdir)/src/test/regress'\
1010
'-DHOST_TUPLE="$(host_tuple)"'\
1111
'-DMAKEPROG="$(MAKE)"'\
1212
'-DSHELLPROG="$(SHELL)"'\
@@ -84,4 +84,4 @@ checktcp: all
8484
./pg_regress --dbname=regress1,connectdb --top-builddir=$(top_builddir) --temp-install=./tmp_check$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --create-role=connectuser,connectdb --host=localhost
8585

8686
installcheck: all
87-
./pg_regress --psqldir="$(PSQLDIR)" --dbname=regress1,connectdb --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb
87+
./pg_regress --psqldir='$(PSQLDIR)' --dbname=regress1,connectdb --top-builddir=$(top_builddir)$(pg_regress_locale_flags)$(THREAD) --schedule=$(srcdir)/ecpg_schedule --create-role=connectuser,connectdb

‎src/makefiles/Makefile.aix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ AROPT = crs
99
libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib
1010

1111
ifeq ($(host_os), aix3.2.5)
12-
rpath = -L$(rpathdir)
12+
rpath = -L'$(rpathdir)'
1313
else
14-
rpath = -Wl,-blibpath:$(rpathdir)$(libpath)
14+
rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
1515
endif
1616

1717
DLSUFFIX = .so

‎src/test/isolation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ maintainer-clean: distclean
7373
rm -f specparse.c specscanner.c
7474

7575
installcheck: all
76-
./pg_isolation_regress --psqldir="$(PSQLDIR)" --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
76+
./pg_isolation_regress --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule
7777

7878
# We can't support "make check" because isolationtester requires libpq, and
7979
# in fact (on typical platforms using shared libraries) requires libpq to

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp