From ed99fb86b04d8a4e33d37c7ef4a50e7560a034d5 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 26 Jun 2008 01:35:45 +0000 Subject: [PATCH] Use SYSTEMQUOTE as concatentation to strings, rather than %s printf patterns, for clarity. --- src/backend/postmaster/postmaster.c | 2 +- src/bin/initdb/initdb.c | 16 ++++++++-------- src/bin/pg_ctl/pg_ctl.c | 21 +++++++++------------ src/bin/pg_dump/pg_dumpall.c | 8 ++++---- src/bin/psql/command.c | 6 ++---- 5 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 4426a07dd9..eeaba2e226 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -4184,7 +4184,7 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname) fprintf(fp, "%s", fullprogname); for (i = 1; i < argc; i++) - fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE); + fprintf(fp, " " SYSTEMQUOTE "%s" SYSTEMQUOTE, argv[i]); fputs("\n", fp); if (fclose(fp)) diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index aff81b452e..cb5d8dd234 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -1078,14 +1078,14 @@ test_config_settings(void) test_max_fsm = FSM_FOR_BUFS(test_buffs); snprintf(cmd, sizeof(cmd), - "%s\"%s\" --boot -x0 %s " + SYSTEMQUOTE "\"%s\" --boot -x0 %s " "-c max_connections=%d " "-c shared_buffers=%d " "-c max_fsm_pages=%d " - "< \"%s\" > \"%s\" 2>&1%s", - SYSTEMQUOTE, backend_exec, boot_options, + "< \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, + backend_exec, boot_options, test_conns, test_buffs, test_max_fsm, - DEVNULL, DEVNULL, SYSTEMQUOTE); + DEVNULL, DEVNULL); status = system(cmd); if (status == 0) { @@ -1114,14 +1114,14 @@ test_config_settings(void) test_max_fsm = FSM_FOR_BUFS(test_buffs); snprintf(cmd, sizeof(cmd), - "%s\"%s\" --boot -x0 %s " + SYSTEMQUOTE "\"%s\" --boot -x0 %s " "-c max_connections=%d " "-c shared_buffers=%d " "-c max_fsm_pages=%d " - "< \"%s\" > \"%s\" 2>&1%s", - SYSTEMQUOTE, backend_exec, boot_options, + "< \"%s\" > \"%s\" 2>&1" SYSTEMQUOTE, + backend_exec, boot_options, n_connections, test_buffs, test_max_fsm, - DEVNULL, DEVNULL, SYSTEMQUOTE); + DEVNULL, DEVNULL); status = system(cmd); if (status == 0) break; diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 5c96372af8..424c47b10f 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -361,13 +361,12 @@ start_postmaster(void) * everything to a shell to process them. */ if (log_file != NULL) - snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &%s", - SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts, - DEVNULL, log_file, SYSTEMQUOTE); + snprintf(cmd, MAXPGPATH, SYSTEMQUOTE "\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1 &" SYSTEMQUOTE, + postgres_path, pgdata_opt, post_opts, + DEVNULL, log_file); else - snprintf(cmd, MAXPGPATH, "%s\"%s\" %s%s < \"%s\" 2>&1 &%s", - SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts, - DEVNULL, SYSTEMQUOTE); + snprintf(cmd, MAXPGPATH, SYSTEMQUOTE "\"%s\" %s%s < \"%s\" 2>&1 &" SYSTEMQUOTE, + postgres_path, pgdata_opt, post_opts, DEVNULL); return system(cmd); #else /* WIN32 */ @@ -380,13 +379,11 @@ start_postmaster(void) PROCESS_INFORMATION pi; if (log_file != NULL) - snprintf(cmd, MAXPGPATH, "CMD /C %s\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1%s", - SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts, - DEVNULL, log_file, SYSTEMQUOTE); + snprintf(cmd, MAXPGPATH, "CMD /C " SYSTEMQUOTE "\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1" SYSTEMQUOTE, + postgres_path, pgdata_opt, post_opts, DEVNULL, log_file); else - snprintf(cmd, MAXPGPATH, "CMD /C %s\"%s\" %s%s < \"%s\" 2>&1%s", - SYSTEMQUOTE, postgres_path, pgdata_opt, post_opts, - DEVNULL, SYSTEMQUOTE); + snprintf(cmd, MAXPGPATH, "CMD /C " SYSTEMQUOTE "\"%s\" %s%s < \"%s\" 2>&1" SYSTEMQUOTE, + postgres_path, pgdata_opt, post_opts, DEVNULL); if (!CreateRestrictedProcess(cmd, &pi)) return GetLastError(); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index beacebd077..93597a7059 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -1248,18 +1248,18 @@ runPgDump(const char *dbname) if (filename) { #ifndef WIN32 - appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa '", SYSTEMQUOTE, pg_dump_bin, + appendPQExpBuffer(cmd, SYSTEMQUOTE"\"%s\" %s -Fa '", pg_dump_bin, #else - appendPQExpBuffer(cmd, "%s\"%s\" %s -Fa \"", SYSTEMQUOTE, pg_dump_bin, + appendPQExpBuffer(cmd, SYSTEMQUOTE"\"%s\" %s -Fa \"", pg_dump_bin, #endif pgdumpopts->data); } else { #ifndef WIN32 - appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp '", SYSTEMQUOTE, pg_dump_bin, + appendPQExpBuffer(cmd, SYSTEMQUOTE "\"%s\" %s -Fp '", pg_dump_bin, #else - appendPQExpBuffer(cmd, "%s\"%s\" %s -Fp \"", SYSTEMQUOTE, pg_dump_bin, + appendPQExpBuffer(cmd, SYSTEMQUOTE "\"%s\" %s -Fp \"", pg_dump_bin, #endif pgdumpopts->data); } diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index dfd0f942e9..559791593e 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -1288,8 +1288,7 @@ editFile(const char *fname) #ifndef WIN32 sprintf(sys, "exec %s '%s'", editorName, fname); #else - sprintf(sys, "%s\"%s\" \"%s\"%s", - SYSTEMQUOTE, editorName, fname, SYSTEMQUOTE); + sprintf(sys, SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE, editorName, fname); #endif result = system(sys); if (result == -1) @@ -1790,9 +1789,8 @@ do_shell(const char *command) /* See EDITOR handling comment for an explaination */ "exec %s", shellName); #else - sprintf(sys, /* See EDITOR handling comment for an explaination */ - "%s\"%s\"%s", SYSTEMQUOTE, shellName, SYSTEMQUOTE); + sprintf(sys, SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName); #endif result = system(sys); free(sys); -- 2.39.5