From: Christian Brauner <brauner@kernel.org>
To: fstests@vger.kernel.org, Eryu Guan <guan@eryu.me>,
Christoph Hellwig <hch@lst.de>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Subject: [PATCH v4 2/8] idmapped-mounts: switch to getopt_long_only()
Date: Sat, 14 Aug 2021 12:47:59 +0200 [thread overview]
Message-ID: <20210814104805.1124023-3-brauner@kernel.org> (raw)
In-Reply-To: <20210814104805.1124023-1-brauner@kernel.org>
From: Christian Brauner <christian.brauner@ubuntu.com>
We're not using the shortopts anywhere anyway and shouldn't encourage
using shortopts. It's much more descriptive to see:
$here/src/idmapped-mounts/idmapped-mounts \
--test-btrfs \
--device "$TEST_DEV" \
--mountpoint "$TEST_DIR" \
--scratch-device "$SCRATCH_DEV" \
--scratch-mountpoint "$SCRATCH_MNT"
--fstype "$FSTYP"
in a test than it is to see:
$here/src/idmapped-mounts/idmapped-mounts \
-b
-d "$TEST_DEV" \
-m "$TEST_DIR" \
-s "$SCRATCH_DEV" \
-a "$SCRATCH_MNT" \
-f "$FSTYP"
In the second case one has to go consult the source code to make sure
that the correct option is passed. In the first case one can just see it
directly.
Cc: fstests@vger.kernel.org
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
/* v2 */
patch not present
/* v3 */
- Christoph Hellwig <hch@lst.de>:
- Split into separate patch.
/* v4 */
- Christoph Hellwig <hch@lst.de>:
- Pass empty string for optstring argument in getopt_long_only().
---
src/idmapped-mounts/idmapped-mounts.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/idmapped-mounts/idmapped-mounts.c b/src/idmapped-mounts/idmapped-mounts.c
index 69dcc027..0e6698bd 100644
--- a/src/idmapped-mounts/idmapped-mounts.c
+++ b/src/idmapped-mounts/idmapped-mounts.c
@@ -8717,8 +8717,11 @@ static void usage(void)
fprintf(stderr, " Run idmapped mount tests\n\n");
fprintf(stderr, "Arguments:\n");
- fprintf(stderr, "-d --device Device used in the tests\n");
- fprintf(stderr, "-m --mountpoint Mountpoint of device\n");
+ fprintf(stderr, "--device Device used in the tests\n");
+ fprintf(stderr, "--fstype Filesystem type used in the tests\n");
+ fprintf(stderr, "--help Print help\n");
+ fprintf(stderr, "--mountpoint Mountpoint of device\n");
+ fprintf(stderr, "--supported Test whether idmapped mounts are supported on this filesystem\n");
_exit(EXIT_SUCCESS);
}
@@ -8826,7 +8829,7 @@ int main(int argc, char *argv[])
int index = 0;
bool supported = false;
- while ((ret = getopt_long(argc, argv, "", longopts, &index)) != -1) {
+ while ((ret = getopt_long_only(argc, argv, "", longopts, &index)) != -1) {
switch (ret) {
case 'd':
t_device = optarg;
--
2.30.2
next prev parent reply other threads:[~2021-08-14 10:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-14 10:47 [PATCH v4 0/8] Extend idmapped mount testsuite Christian Brauner
2021-08-14 10:47 ` [PATCH v4 1/8] idmapped-mounts: use die() helper Christian Brauner
2021-08-14 10:47 ` Christian Brauner [this message]
2021-08-15 8:22 ` [PATCH v4 2/8] idmapped-mounts: switch to getopt_long_only() Christoph Hellwig
2021-08-14 10:48 ` [PATCH v4 3/8] idmapped-mounts: introduce an explicit command line switch for testsuite Christian Brauner
2021-08-14 10:48 ` [PATCH v4 4/8] generic/640: add fscaps regression test Christian Brauner
2021-08-14 10:48 ` [PATCH v4 5/8] idmapped-mounts: refactor helpers Christian Brauner
2021-08-14 10:48 ` [PATCH v4 6/8] idmapped-mounts: add nested userns creation helpers Christian Brauner
2021-08-14 10:48 ` [PATCH v4 7/8] generic/641: add nested user namespace tests Christian Brauner
2021-08-14 10:48 ` [PATCH v4 8/8] btrfs/244: introduce btrfs specific idmapped mounts tests Christian Brauner
2021-08-15 16:46 ` [PATCH v4 0/8] Extend idmapped mount testsuite Christian Brauner
2021-08-17 3:11 ` Eryu Guan
2021-08-17 12:31 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210814104805.1124023-3-brauner@kernel.org \
--to=brauner@kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=hch@lst.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.