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 1qA1Xi-0001t2-8b for pgsql-hackers@arkaria.postgresql.org; Fri, 16 Jun 2023 04:58:38 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1qA1Xh-0004fh-0y for pgsql-hackers@arkaria.postgresql.org; Fri, 16 Jun 2023 04:58:37 +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 1qA1Xg-0004aM-Kw for pgsql-hackers@lists.postgresql.org; Fri, 16 Jun 2023 04:58:36 +0000 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1qA1Xd-002hsT-1L for pgsql-hackers@postgresql.org; Fri, 16 Jun 2023 04:58:36 +0000 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6668208bd4eso420467b3a.0 for ; Thu, 15 Jun 2023 21:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686891511; x=1689483511; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=EFoSj1OjG9ghjYuqGH0SzyO9y9PIOdd6LGnLR9ElPw4=; b=IH+XzCfrEyUqdV+BDesxsardQE1qGLGN5ypXxj9QKXNdYNwZI1+PhSL1zADZ+T3kdf Dlc5zYQ4Lt82dTFzKyZEscoZ6Z99yDdjslFjF9QXXLm2BzcNUfXcb3/aT0T3acI/NfEi 3Kqv7OGncK82v/0uPEtV7u0aarAMgxTIxo5+aYD4wuOfNazN1VsWid3M62rJ/WodAn2E dc1o87dA2N7TyrsdnvDjFqvJJf7hFwKCmHZL1FWQcRiO1/8/YEIpLPTxA3UxslLYv1JS 9XcYRaQqZwufJuDD+iHR9lEC6TMwFGzb4fs3cudPLtWli5hSCAVP3Nr+s2xEex1gy0B+ Ovzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686891511; x=1689483511; h=in-reply-to: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=EFoSj1OjG9ghjYuqGH0SzyO9y9PIOdd6LGnLR9ElPw4=; b=aQ87GdBNEXOyfAdp/xB8Wt1FVSalp/kvx4/rU8/W9nUMgDixwImqdDD+ns7+Hw7qr2 PaED49MEZGi1wNpTPEX+LBy9X8m33AiiFuSmXjsqv3FbYEbCaf5Ozsvjw1t4qvjyN8PP umsP7TTZhKxlMOxyElSYpKDtFeqfM8uFA17DcI47AXqx9gz0cO8x60kjuQwGwo0xIYIf 4djMpeSj+3ob34KIhglPZNAtgzU93+PCUKj4sMYWH7b8vkM6d4gd6eUYwTIfws6XK3ik G+REd2fHT8CDHSa9ULT4hYiQ0YknTtr9w1XvPID1djXsI0UiOWuHUloV+2pSdBJGOJ1r 09pA== X-Gm-Message-State: AC+VfDw97lAmGKeTGbvmACZyu4Zl+NURrq3H6UJthzTtlR97dpZmXe8P DMjLa1gb1w0S78YlIB8QwWo= X-Google-Smtp-Source: ACHHUZ7iqt5sCL+eGO3RFBXiqYgu1B8l/ZDmxhREHF2yw/2bCFbIsjKMo58O/CTiogoCXagcY6/90Q== X-Received: by 2002:a05:6a00:14ca:b0:64d:42f6:4c7b with SMTP id w10-20020a056a0014ca00b0064d42f64c7bmr1163325pfu.27.1686891511209; Thu, 15 Jun 2023 21:58:31 -0700 (PDT) Received: from nathanxps13 ([50.47.162.83]) by smtp.gmail.com with ESMTPSA id q23-20020a62ae17000000b0065007825f51sm8317478pff.79.2023.06.15.21.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 21:58:30 -0700 (PDT) Date: Thu, 15 Jun 2023 21:58:28 -0700 From: Nathan Bossart To: Michael Paquier Cc: Kyotaro Horiguchi , noah@leadboat.com, pgsql-hackers@postgresql.org Subject: Re: add non-option reordering to in-tree getopt_long Message-ID: <20230616045828.GA972663@nathanxps13> References: <20230614212816.GA492731@nathanxps13> <20230614221154.GA1656253@rfd.leadboat.com> <20230614224608.GA625054@nathanxps13> <20230615.143034.1555041904838122564.horikyota.ntt@gmail.com> <20230616000959.GA922959@nathanxps13> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="ZPt4rx8FFjLCG7dd" Content-Disposition: inline In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --ZPt4rx8FFjLCG7dd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 16, 2023 at 10:30:09AM +0900, Michael Paquier wrote: > On Thu, Jun 15, 2023 at 05:09:59PM -0700, Nathan Bossart wrote: >> I've attached a new version of the patch that omits the >> POSIXLY_CORRECT stuff. > > This looks OK at quick glance, though you may want to document at the > top of getopt_long() the reordering business with the non-options? I added a comment to this effect in v3. I also noticed that '-' wasn't properly handled as a non-option, so I've tried to fix that as well. -- Nathan Bossart Amazon Web Services: https://aws.amazon.com --ZPt4rx8FFjLCG7dd Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v3-0001-Teach-in-tree-getopt_long-to-move-non-options-to-.patch" From e31fa0ab5237d3ad35bdb44404fd5b5eeea3f5c6 Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Fri, 9 Jun 2023 15:51:58 -0700 Subject: [PATCH v3 1/1] Teach in-tree getopt_long() to move non-options to the end of argv. --- src/bin/scripts/t/040_createuser.pl | 10 ++++--- src/port/getopt_long.c | 45 +++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/bin/scripts/t/040_createuser.pl b/src/bin/scripts/t/040_createuser.pl index 9ca282181d..ba40ab11a3 100644 --- a/src/bin/scripts/t/040_createuser.pl +++ b/src/bin/scripts/t/040_createuser.pl @@ -42,9 +42,9 @@ $node->issues_sql_like( 'add a role as a member with admin option of the newly created role'); $node->issues_sql_like( [ - 'createuser', '-m', - 'regress_user3', '-m', - 'regress user #4', 'REGRESS_USER5' + 'createuser', 'REGRESS_USER5', + '-m', 'regress_user3', + '-m', 'regress user #4' ], qr/statement: CREATE ROLE "REGRESS_USER5" NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN NOREPLICATION NOBYPASSRLS ROLE regress_user3,"regress user #4";/, 'add a role as a member of the newly created role'); @@ -73,11 +73,13 @@ $node->issues_sql_like( qr/statement: CREATE ROLE regress_user11 NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN NOREPLICATION NOBYPASSRLS IN ROLE regress_user1;/, '--role'); $node->issues_sql_like( - [ 'createuser', '--member-of', 'regress_user1', 'regress_user12' ], + [ 'createuser', 'regress_user12', '--member-of', 'regress_user1' ], qr/statement: CREATE ROLE regress_user12 NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN NOREPLICATION NOBYPASSRLS IN ROLE regress_user1;/, '--member-of'); $node->command_fails([ 'createuser', 'regress_user1' ], 'fails if role already exists'); +$node->command_fails([ 'createuser', 'regress_user1', '-m', 'regress_user2', 'regress_user3' ], + 'fails for too many non-options'); done_testing(); diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index c989276988..da233728e1 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -50,8 +50,11 @@ * This implementation does not use optreset. Instead, we guarantee that * it can be restarted on a new argv array after a previous call returned -1, * if the caller resets optind to 1 before the first call of the new series. - * (Internally, this means we must be sure to reset "place" to EMSG before - * returning -1.) + * (Internally, this means we must be sure to reset "place" to EMSG and + * nonopt_start to -1 before returning -1.) + * + * Note that this routine reorders the pointers in argv (despite the const + * qualifier) so that all non-options will be at the end when -1 is returned. */ int getopt_long(int argc, char *const argv[], @@ -60,37 +63,55 @@ getopt_long(int argc, char *const argv[], { static char *place = EMSG; /* option letter processing */ char *oli; /* option letter list index */ + static int nonopt_start = -1; if (!*place) { /* update scanning pointer */ if (optind >= argc) { place = EMSG; + nonopt_start = -1; return -1; } +retry: place = argv[optind]; - if (place[0] != '-') + if (place[0] != '-' || place[1] == '\0') { - place = EMSG; - return -1; - } + char **args = (char **) argv; - place++; + /* + * If only non-options remain, return -1. Else, move the + * non-option to the end and try again. + */ + if (optind == nonopt_start) + { + place = EMSG; + nonopt_start = -1; + return -1; + } - if (!*place) - { - /* treat "-" as not being an option */ - place = EMSG; - return -1; + for (int i = optind; i < argc - 1; i++) + args[i] = args[i + 1]; + args[argc - 1] = place; + + if (nonopt_start == -1) + nonopt_start = argc - 1; + else + nonopt_start--; + + goto retry; } + place++; + if (place[0] == '-' && place[1] == '\0') { /* found "--", treat it as end of options */ ++optind; place = EMSG; + nonopt_start = -1; return -1; } -- 2.25.1 --ZPt4rx8FFjLCG7dd--