Skip to content

Commit a118323

Browse files
bmomjianbmomjian
committed
Use SYSTEMQUOTE as concatentation to strings, rather than %s printf
patterns, for clarity.
1 parent 124c22d commit a118323

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.559 2008/06/19 21:32:56 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.560 2008/06/26 01:35:45 momjian Exp $
4141
*
4242
* NOTES
4343
*
@@ -4184,7 +4184,7 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname)
41844184

41854185
fprintf(fp, "%s", fullprogname);
41864186
for (i = 1; i < argc; i++)
4187-
fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE);
4187+
fprintf(fp, " " SYSTEMQUOTE "%s" SYSTEMQUOTE, argv[i]);
41884188
fputs("\n", fp);
41894189

41904190
if (fclose(fp))

‎src/bin/initdb/initdb.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* Portions Copyright (c) 1994, Regents of the University of California
4343
* Portions taken from FreeBSD.
4444
*
45-
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.156 2008/06/02 03:48:00 tgl Exp $
45+
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.157 2008/06/26 01:35:45 momjian Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -1078,14 +1078,14 @@ test_config_settings(void)
10781078
test_max_fsm = FSM_FOR_BUFS(test_buffs);
10791079

10801080
snprintf(cmd, sizeof(cmd),
1081-
"%s\"%s\" --boot -x0 %s "
1081+
SYSTEMQUOTE "\"%s\" --boot -x0 %s "
10821082
"-c max_connections=%d "
10831083
"-c shared_buffers=%d "
10841084
"-c max_fsm_pages=%d "
1085-
"< \"%s\" > \"%s\" 2>&1%s",
1086-
SYSTEMQUOTE, backend_exec, boot_options,
1085+
"< \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
1086+
backend_exec, boot_options,
10871087
test_conns, test_buffs, test_max_fsm,
1088-
DEVNULL, DEVNULL, SYSTEMQUOTE);
1088+
DEVNULL, DEVNULL);
10891089
status = system(cmd);
10901090
if (status == 0)
10911091
{
@@ -1114,14 +1114,14 @@ test_config_settings(void)
11141114
test_max_fsm = FSM_FOR_BUFS(test_buffs);
11151115

11161116
snprintf(cmd, sizeof(cmd),
1117-
"%s\"%s\" --boot -x0 %s "
1117+
SYSTEMQUOTE "\"%s\" --boot -x0 %s "
11181118
"-c max_connections=%d "
11191119
"-c shared_buffers=%d "
11201120
"-c max_fsm_pages=%d "
1121-
"< \"%s\" > \"%s\" 2>&1%s",
1122-
SYSTEMQUOTE, backend_exec, boot_options,
1121+
"< \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE,
1122+
backend_exec, boot_options,
11231123
n_connections, test_buffs, test_max_fsm,
1124-
DEVNULL, DEVNULL, SYSTEMQUOTE);
1124+
DEVNULL, DEVNULL);
11251125
status = system(cmd);
11261126
if (status == 0)
11271127
break;

‎src/bin/pg_ctl/pg_ctl.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
66
*
7-
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.99 2008/06/26 01:12:20 momjian Exp $
7+
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.100 2008/06/26 01:35:45 momjian Exp $
88
*
99
*-------------------------------------------------------------------------
1010
*/
@@ -361,13 +361,12 @@ start_postmaster(void)
361361
* everything to a shell to process them.
362362
*/
363363
if (log_file != NULL)
364-
snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &%s",
365-
SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts,
366-
DEVNULL, log_file, SYSTEMQUOTE);
364+
snprintf(cmd, MAXPGPATH, SYSTEMQUOTE "\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &" SYSTEMQUOTE,
365+
postgres_path, pgdata_opt, post_opts,
366+
DEVNULL, log_file);
367367
else
368-
snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" 2>&1 &%s",
369-
SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts,
370-
DEVNULL, SYSTEMQUOTE);
368+
snprintf(cmd, MAXPGPATH, SYSTEMQUOTE "\"%s\" %s%s < \"%s\" 2>&1 &" SYSTEMQUOTE,
369+
postgres_path, pgdata_opt, post_opts, DEVNULL);
371370

372371
return system(cmd);
373372
#else /* WIN32 */
@@ -380,13 +379,11 @@ start_postmaster(void)
380379
PROCESS_INFORMATION pi;
381380

382381
if (log_file != NULL)
383-
snprintf(cmd, MAXPGPATH, "CMD /C %s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1%s",
384-
SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts,
385-
DEVNULL, log_file, SYSTEMQUOTE);
382+
snprintf(cmd, MAXPGPATH, "CMD /C " SYSTEMQUOTE "\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE,
383+
postgres_path, pgdata_opt, post_opts, DEVNULL, log_file);
386384
else
387-
snprintf(cmd, MAXPGPATH, "CMD /C %s\"%s\" %s%s < \"%s\" 2>&1%s",
388-
SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts,
389-
DEVNULL, SYSTEMQUOTE);
385+
snprintf(cmd, MAXPGPATH, "CMD /C " SYSTEMQUOTE "\"%s\" %s%s < \"%s\" 2>&1" SYSTEMQUOTE,
386+
postgres_path, pgdata_opt, post_opts, DEVNULL);
390387

391388
if (!CreateRestrictedProcess(cmd, &pi))
392389
return GetLastError();

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
*
9-
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.104 2008/04/13 03:49:22 tgl Exp $
9+
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.105 2008/06/26 01:35:45 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1248,18 +1248,18 @@ runPgDump(const char *dbname)
12481248
if (filename)
12491249
{
12501250
#ifndef WIN32
1251-
appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa '", SYSTEMQUOTE, pg_dump_bin,
1251+
appendPQExpBuffer(cmd, SYSTEMQUOTE"\"%s\" %s -Fa '", pg_dump_bin,
12521252
#else
1253-
appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa \"", SYSTEMQUOTE, pg_dump_bin,
1253+
appendPQExpBuffer(cmd, SYSTEMQUOTE"\"%s\" %s -Fa \"", pg_dump_bin,
12541254
#endif
12551255
pgdumpopts->data);
12561256
}
12571257
else
12581258
{
12591259
#ifndef WIN32
1260-
appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp '", SYSTEMQUOTE, pg_dump_bin,
1260+
appendPQExpBuffer(cmd, SYSTEMQUOTE "\"%s\" %s -Fp '", pg_dump_bin,
12611261
#else
1262-
appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp \"", SYSTEMQUOTE, pg_dump_bin,
1262+
appendPQExpBuffer(cmd, SYSTEMQUOTE "\"%s\" %s -Fp \"", pg_dump_bin,
12631263
#endif
12641264
pgdumpopts->data);
12651265
}

‎src/bin/psql/command.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2008, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.190 2008/06/11 10:48:17 heikki Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.191 2008/06/26 01:35:45 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "command.h"
@@ -1288,8 +1288,7 @@ editFile(const char *fname)
12881288
#ifndef WIN32
12891289
sprintf(sys, "exec %s '%s'", editorName, fname);
12901290
#else
1291-
sprintf(sys, "%s\"%s\" \"%s\"%s",
1292-
SYSTEMQUOTE, editorName, fname, SYSTEMQUOTE);
1291+
sprintf(sys, SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE, editorName, fname);
12931292
#endif
12941293
result = system(sys);
12951294
if (result == -1)
@@ -1790,9 +1789,8 @@ do_shell(const char *command)
17901789
/* See EDITOR handling comment for an explaination */
17911790
"exec %s", shellName);
17921791
#else
1793-
sprintf(sys,
17941792
/* See EDITOR handling comment for an explaination */
1795-
"%s\"%s\"%s", SYSTEMQUOTE, shellName, SYSTEMQUOTE);
1793+
sprintf(sys, SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName);
17961794
#endif
17971795
result = system(sys);
17981796
free(sys);

0 commit comments

Comments
 (0)