Remove arbitrary MAXPGPATH limit on command lengths in pg_ctl.

Replace fixed-length command buffers with psprintf() calls.  We didn't
have anything as convenient as psprintf() when this code was written,
but now that we do, there's little reason for the limitation to
stand.  Removing it eliminates some corner cases where (for example)
starting the postmaster with a whole lot of options fails.

Most individual file names that pg_ctl deals with are still restricted
to MAXPGPATH, but we've seldom had complaints about that limitation
so long as it only applies to one filename.

Back-patch to all supported branches.

Phil Krylov

Discussion: https://postgr.es/m/567e199c6b97ee19deee600311515b86@krylov.eu

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 4e02c4cea1a51f2eacb3ef12144f622b5470fb27..01a4c258823c2c19b3bb8fca08417ce186e801e9 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -449,7 +449,7 @@ free_readfile(char **optlines)
 static pgpid_t
 start_postmaster(void)
 {
-   char        cmd[MAXPGPATH];
+   char       *cmd;
 
 #ifndef WIN32
    pgpid_t     pm_pid;
@@ -480,12 +480,12 @@ start_postmaster(void)
     * has the same PID as the current child process.
     */
    if (log_file != NULL)
-       snprintf(cmd, MAXPGPATH, "exec \"%s\" %s%s < \"%s\" >> \"%s\" 2>&1",
-                exec_path, pgdata_opt, post_opts,
-                DEVNULL, log_file);
+       cmd = psprintf("exec \"%s\" %s%s < \"%s\" >> \"%s\" 2>&1",
+                      exec_path, pgdata_opt, post_opts,
+                      DEVNULL, log_file);
    else
-       snprintf(cmd, MAXPGPATH, "exec \"%s\" %s%s < \"%s\" 2>&1",
-                exec_path, pgdata_opt, post_opts, DEVNULL);
+       cmd = psprintf("exec \"%s\" %s%s < \"%s\" 2>&1",
+                      exec_path, pgdata_opt, post_opts, DEVNULL);
 
    (void) execl("/bin/sh", "/bin/sh", "-c", cmd, (char *) NULL);
 
@@ -506,11 +506,11 @@ start_postmaster(void)
    PROCESS_INFORMATION pi;
 
    if (log_file != NULL)
-       snprintf(cmd, MAXPGPATH, "CMD /C \"\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1\"",
-                exec_path, pgdata_opt, post_opts, DEVNULL, log_file);
+       cmd = psprintf("CMD /C \"\"%s\" %s%s < \"%s\" >> \"%s\" 2>&1\"",
+                      exec_path, pgdata_opt, post_opts, DEVNULL, log_file);
    else
-       snprintf(cmd, MAXPGPATH, "CMD /C \"\"%s\" %s%s < \"%s\" 2>&1\"",
-                exec_path, pgdata_opt, post_opts, DEVNULL);
+       cmd = psprintf("CMD /C \"\"%s\" %s%s < \"%s\" 2>&1\"",
+                      exec_path, pgdata_opt, post_opts, DEVNULL);
 
    if (!CreateRestrictedProcess(cmd, &pi, false))
    {
@@ -757,7 +757,7 @@ find_other_exec_or_die(const char *argv0, const char *target, const char *versio
 static void
 do_init(void)
 {
-   char        cmd[MAXPGPATH];
+   char       *cmd;
 
    if (exec_path == NULL)
        exec_path = find_other_exec_or_die(argv0, "initdb", "initdb (PostgreSQL) " PG_VERSION "\n");
@@ -769,11 +769,11 @@ do_init(void)
        post_opts = "";
 
    if (!silent_mode)
-       snprintf(cmd, MAXPGPATH, "\"%s\" %s%s",
-                exec_path, pgdata_opt, post_opts);
+       cmd = psprintf("\"%s\" %s%s",
+                      exec_path, pgdata_opt, post_opts);
    else
-       snprintf(cmd, MAXPGPATH, "\"%s\" %s%s > \"%s\"",
-                exec_path, pgdata_opt, post_opts, DEVNULL);
+       cmd = psprintf("\"%s\" %s%s > \"%s\"",
+                      exec_path, pgdata_opt, post_opts, DEVNULL);
 
    if (system(cmd) != 0)
    {
@@ -2006,9 +2006,9 @@ set_starttype(char *starttypeopt)
 static void
 adjust_data_dir(void)
 {
-   char        cmd[MAXPGPATH],
-               filename[MAXPGPATH],
-              *my_exec_path;
+   char        filename[MAXPGPATH];
+   char       *my_exec_path,
+              *cmd;
    FILE       *fd;
 
    /* do nothing if we're working without knowledge of data dir */
@@ -2038,10 +2038,10 @@ adjust_data_dir(void)
        my_exec_path = pg_strdup(exec_path);
 
    /* it's important for -C to be the first option, see main.c */
-   snprintf(cmd, MAXPGPATH, "\"%s\" -C data_directory %s%s",
-            my_exec_path,
-            pgdata_opt ? pgdata_opt : "",
-            post_opts ? post_opts : "");
+   cmd = psprintf("\"%s\" -C data_directory %s%s",
+                  my_exec_path,
+                  pgdata_opt ? pgdata_opt : "",
+                  post_opts ? post_opts : "");
 
    fd = popen(cmd, "r");
    if (fd == NULL || fgets(filename, sizeof(filename), fd) == NULL)