Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qJnKO-0000kP-I6 for pgsql-hackers@arkaria.postgresql.org; Thu, 13 Jul 2023 03:49:16 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1qJnKN-0006CC-DN for pgsql-hackers@arkaria.postgresql.org; Thu, 13 Jul 2023 03:49:15 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qJnKN-0006C3-3O for pgsql-hackers@lists.postgresql.org; Thu, 13 Jul 2023 03:49:15 +0000 Received: from mail-yw1-x112d.google.com ([2607:f8b0:4864:20::112d]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1qJnKG-0009Pg-1Q for pgsql-hackers@postgresql.org; Thu, 13 Jul 2023 03:49:14 +0000 Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-57712d00cc1so1597657b3.3 for ; Wed, 12 Jul 2023 20:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689220146; x=1691812146; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=Ay53D/vgRphMKiYy4QU15mHnwPeLUoIlE6DC8z3qAXE=; b=ah4YBPGJAueA460s5sRWziptBXrvZdZszyFXdf7l905JSa578oduMtPFedEUfzZYPw TX+tw9hdiuX5pstmdJEmFdkI+DCr18eVnu31R5KvwDjyBih6ygqVhbGEzZ+fGr657jI+ kiTsFibE50oBRkGu+icqutxuA8muwQgLNjXN9Ti7+u7i2oo5ebuZGZ02AxKBMb/CTEbH QRw8mFFYHpdSqP3YKcXKUVab2a5pM2bqa+KjvGlRrbaqpH7K7iBweLrNtBuTsMk1JA5z 4YqJBqyjfzsiKlwsPpdWzbtfJkQu7kwaWaH3tIsKrRSE4A+fe8Jq3hrGqaxnRoXoe8cQ tgfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689220146; x=1691812146; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ay53D/vgRphMKiYy4QU15mHnwPeLUoIlE6DC8z3qAXE=; b=l2HpqBstoPCyofPNN8ZS14Q/J3F8Mfnte10+6A93WYXP7LcROMoqLQgK6SRW14ylGz kv37XpR+FoYCaWSQdIfjPo4OHV0/hN5n8XCCuZNlMMoNoURCFmfAY8lJZjlCCfVvti2+ 1Sg9EpC/8B3PpnQvbLeOHk1vAnaTKdyCD4H3yJbTzcFHZ9lUCDTN9y/DF+e2r1mAPaUE 583vwua2kNHhG8kyNsuvy+nH4teJ8Iwicw9tWEVAUG35fzXtGnrgO/Yw9yw2A+KLrnX1 r/DEzjOjQ7+zRvI3eCsviykj/5THrudfM0KYjcCoh+RRCdnvO74XWPbLV8NGzq9N8c3K ufag== X-Gm-Message-State: ABy/qLZkj9YZnvESg627uZfrDRA6HEDQP24JNoBDdu2yjkb/c1POv0/9 xohqdit+jCxCLPseMvW2mQY= X-Google-Smtp-Source: APBJJlHLWQcDP34gbiSBTvrFzOojbA03kiM/7SkeY9mPGhUnORrjANEpIdj5Heyj1pSW2iIh06DO0w== X-Received: by 2002:a0d:cec7:0:b0:55a:5ce4:aff2 with SMTP id q190-20020a0dcec7000000b0055a5ce4aff2mr620568ywd.39.1689220146240; Wed, 12 Jul 2023 20:49:06 -0700 (PDT) Received: from nathanxps13 ([50.47.162.83]) by smtp.gmail.com with ESMTPSA id q17-20020a170902bd9100b001b881a8251bsm4743638pls.106.2023.07.12.20.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jul 2023 20:49:05 -0700 (PDT) Date: Wed, 12 Jul 2023 20:49:03 -0700 From: Nathan Bossart To: Kyotaro Horiguchi Cc: michael@paquier.xyz, noah@leadboat.com, pgsql-hackers@postgresql.org Subject: Re: add non-option reordering to in-tree getopt_long Message-ID: <20230713034903.GA991765@nathanxps13> References: <20230710.165711.1906730109995973216.horikyota.ntt@gmail.com> <20230710181237.GD257945@nathanxps13> <20230710200658.GA362078@nathanxps13> <20230711.161609.1881651378858129172.horikyota.ntt@gmail.com> <20230711163232.GA616878@nathanxps13> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="J2SCkAp4GZ/dPZZf" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230711163232.GA616878@nathanxps13> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --J2SCkAp4GZ/dPZZf Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Tue, Jul 11, 2023 at 09:32:32AM -0700, Nathan Bossart wrote: > Sure. І did it this way in v7. After a couple more small edits, I've committed this. I looked through all uses of getopt_long() in PostgreSQL earlier today, and of the programs that accepted non-options, most accepted only one, some others accepted 2-3, and ecpg and pg_regress accepted any number. Given this analysis, I'm not too worried about the O(n^2) behavior that the patch introduces. You'd likely need to provide an enormous number of non-options for it to be noticeable, and I'm dubious such use-cases exist. During my analysis, I noticed that pg_ctl contains a workaround for the lack of argument reordering. I think this can now be removed. Patch attached. -- Nathan Bossart Amazon Web Services: https://aws.amazon.com --J2SCkAp4GZ/dPZZf Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v8-0002-Rely-on-getopt_long-argument-reordering-in-pg_ctl.patch" From 10931d7b83f3ef02f510385e1e595bc260b69a5c Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Wed, 12 Jul 2023 19:57:44 -0700 Subject: [PATCH v8 2/2] Rely on getopt_long() argument reordering in pg_ctl. --- src/bin/pg_ctl/pg_ctl.c | 268 +++++++++++++++++++--------------------- 1 file changed, 128 insertions(+), 140 deletions(-) diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 465948e707..807d7023a9 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -2260,163 +2260,151 @@ main(int argc, char **argv) if (env_wait != NULL) wait_seconds = atoi(env_wait); - /* - * 'Action' can be before or after args so loop over both. Some - * getopt_long() implementations will reorder argv[] to place all flags - * first (GNU?), but we don't rely on it. Our /port version doesn't do - * that. - */ - optind = 1; - /* process command-line options */ - while (optind < argc) + while ((c = getopt_long(argc, argv, "cD:e:l:m:N:o:p:P:sS:t:U:wW", + long_options, &option_index)) != -1) { - while ((c = getopt_long(argc, argv, "cD:e:l:m:N:o:p:P:sS:t:U:wW", - long_options, &option_index)) != -1) + switch (c) { - switch (c) - { - case 'D': - { - char *pgdata_D; - - pgdata_D = pg_strdup(optarg); - canonicalize_path(pgdata_D); - setenv("PGDATA", pgdata_D, 1); - - /* - * We could pass PGDATA just in an environment - * variable but we do -D too for clearer postmaster - * 'ps' display - */ - pgdata_opt = psprintf("-D \"%s\" ", pgdata_D); - free(pgdata_D); - break; - } - case 'e': - event_source = pg_strdup(optarg); - break; - case 'l': - log_file = pg_strdup(optarg); - break; - case 'm': - set_mode(optarg); - break; - case 'N': - register_servicename = pg_strdup(optarg); - break; - case 'o': - /* append option? */ - if (!post_opts) - post_opts = pg_strdup(optarg); - else - { - char *old_post_opts = post_opts; - - post_opts = psprintf("%s %s", old_post_opts, optarg); - free(old_post_opts); - } - break; - case 'p': - exec_path = pg_strdup(optarg); - break; - case 'P': - register_password = pg_strdup(optarg); - break; - case 's': - silent_mode = true; + case 'D': + { + char *pgdata_D; + + pgdata_D = pg_strdup(optarg); + canonicalize_path(pgdata_D); + setenv("PGDATA", pgdata_D, 1); + + /* + * We could pass PGDATA just in an environment variable + * but we do -D too for clearer postmaster 'ps' display + */ + pgdata_opt = psprintf("-D \"%s\" ", pgdata_D); + free(pgdata_D); break; - case 'S': + } + case 'e': + event_source = pg_strdup(optarg); + break; + case 'l': + log_file = pg_strdup(optarg); + break; + case 'm': + set_mode(optarg); + break; + case 'N': + register_servicename = pg_strdup(optarg); + break; + case 'o': + /* append option? */ + if (!post_opts) + post_opts = pg_strdup(optarg); + else + { + char *old_post_opts = post_opts; + + post_opts = psprintf("%s %s", old_post_opts, optarg); + free(old_post_opts); + } + break; + case 'p': + exec_path = pg_strdup(optarg); + break; + case 'P': + register_password = pg_strdup(optarg); + break; + case 's': + silent_mode = true; + break; + case 'S': #ifdef WIN32 - set_starttype(optarg); + set_starttype(optarg); #else - write_stderr(_("%s: -S option not supported on this platform\n"), - progname); - exit(1); + write_stderr(_("%s: -S option not supported on this platform\n"), + progname); + exit(1); #endif - break; - case 't': - wait_seconds = atoi(optarg); - wait_seconds_arg = true; - break; - case 'U': - if (strchr(optarg, '\\')) - register_username = pg_strdup(optarg); - else - /* Prepend .\ for local accounts */ - register_username = psprintf(".\\%s", optarg); - break; - case 'w': - do_wait = true; - break; - case 'W': - do_wait = false; - break; - case 'c': - allow_core_files = true; - break; - default: - /* getopt_long already issued a suitable error message */ - do_advice(); - exit(1); - } + break; + case 't': + wait_seconds = atoi(optarg); + wait_seconds_arg = true; + break; + case 'U': + if (strchr(optarg, '\\')) + register_username = pg_strdup(optarg); + else + /* Prepend .\ for local accounts */ + register_username = psprintf(".\\%s", optarg); + break; + case 'w': + do_wait = true; + break; + case 'W': + do_wait = false; + break; + case 'c': + allow_core_files = true; + break; + default: + /* getopt_long already issued a suitable error message */ + do_advice(); + exit(1); } + } - /* Process an action */ - if (optind < argc) + /* Process an action */ + if (optind < argc) + { + if (strcmp(argv[optind], "init") == 0 + || strcmp(argv[optind], "initdb") == 0) + ctl_command = INIT_COMMAND; + else if (strcmp(argv[optind], "start") == 0) + ctl_command = START_COMMAND; + else if (strcmp(argv[optind], "stop") == 0) + ctl_command = STOP_COMMAND; + else if (strcmp(argv[optind], "restart") == 0) + ctl_command = RESTART_COMMAND; + else if (strcmp(argv[optind], "reload") == 0) + ctl_command = RELOAD_COMMAND; + else if (strcmp(argv[optind], "status") == 0) + ctl_command = STATUS_COMMAND; + else if (strcmp(argv[optind], "promote") == 0) + ctl_command = PROMOTE_COMMAND; + else if (strcmp(argv[optind], "logrotate") == 0) + ctl_command = LOGROTATE_COMMAND; + else if (strcmp(argv[optind], "kill") == 0) { - if (ctl_command != NO_COMMAND) + if (argc - optind < 3) { - write_stderr(_("%s: too many command-line arguments (first is \"%s\")\n"), progname, argv[optind]); + write_stderr(_("%s: missing arguments for kill mode\n"), progname); do_advice(); exit(1); } - - if (strcmp(argv[optind], "init") == 0 - || strcmp(argv[optind], "initdb") == 0) - ctl_command = INIT_COMMAND; - else if (strcmp(argv[optind], "start") == 0) - ctl_command = START_COMMAND; - else if (strcmp(argv[optind], "stop") == 0) - ctl_command = STOP_COMMAND; - else if (strcmp(argv[optind], "restart") == 0) - ctl_command = RESTART_COMMAND; - else if (strcmp(argv[optind], "reload") == 0) - ctl_command = RELOAD_COMMAND; - else if (strcmp(argv[optind], "status") == 0) - ctl_command = STATUS_COMMAND; - else if (strcmp(argv[optind], "promote") == 0) - ctl_command = PROMOTE_COMMAND; - else if (strcmp(argv[optind], "logrotate") == 0) - ctl_command = LOGROTATE_COMMAND; - else if (strcmp(argv[optind], "kill") == 0) - { - if (argc - optind < 3) - { - write_stderr(_("%s: missing arguments for kill mode\n"), progname); - do_advice(); - exit(1); - } - ctl_command = KILL_COMMAND; - set_sig(argv[++optind]); - killproc = atol(argv[++optind]); - } + ctl_command = KILL_COMMAND; + set_sig(argv[++optind]); + killproc = atol(argv[++optind]); + } #ifdef WIN32 - else if (strcmp(argv[optind], "register") == 0) - ctl_command = REGISTER_COMMAND; - else if (strcmp(argv[optind], "unregister") == 0) - ctl_command = UNREGISTER_COMMAND; - else if (strcmp(argv[optind], "runservice") == 0) - ctl_command = RUN_AS_SERVICE_COMMAND; + else if (strcmp(argv[optind], "register") == 0) + ctl_command = REGISTER_COMMAND; + else if (strcmp(argv[optind], "unregister") == 0) + ctl_command = UNREGISTER_COMMAND; + else if (strcmp(argv[optind], "runservice") == 0) + ctl_command = RUN_AS_SERVICE_COMMAND; #endif - else - { - write_stderr(_("%s: unrecognized operation mode \"%s\"\n"), progname, argv[optind]); - do_advice(); - exit(1); - } - optind++; + else + { + write_stderr(_("%s: unrecognized operation mode \"%s\"\n"), progname, argv[optind]); + do_advice(); + exit(1); } + optind++; + } + + if (optind < argc) + { + write_stderr(_("%s: too many command-line arguments (first is \"%s\")\n"), progname, argv[optind]); + do_advice(); + exit(1); } if (ctl_command == NO_COMMAND) -- 2.25.1 --J2SCkAp4GZ/dPZZf--