zfs: use getopt_long for mount.zfs.
This commit is contained in:
parent
389109c3db
commit
0203a5aa0f
|
@ -0,0 +1,25 @@
|
||||||
|
mount.zfs is called by convention (and util-linux) with arguments last, i.e.
|
||||||
|
% mount.zfs <dataset> <mountpoint> -o <options>
|
||||||
|
Use getopt_long so musl will permute arguments.
|
||||||
|
|
||||||
|
Passing 0 as long_opts is unspecified, but safe for glibc and musl getopt_long.
|
||||||
|
|
||||||
|
--- a/cmd/mount_zfs/mount_zfs.c 2016-01-14 13:55:43.352951688 +0100
|
||||||
|
+++ b/cmd/mount_zfs/mount_zfs.c 2016-01-14 13:53:35.685221569 +0100
|
||||||
|
@@ -33,6 +33,7 @@
|
||||||
|
#include <libzfs.h>
|
||||||
|
#include <locale.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
+#include <getopt.h>
|
||||||
|
|
||||||
|
#define ZS_COMMENT 0x00000000 /* comment */
|
||||||
|
#define ZS_ZFSUTIL 0x00000001 /* caller is zfs(8) */
|
||||||
|
@@ -390,7 +391,7 @@
|
||||||
|
opterr = 0;
|
||||||
|
|
||||||
|
/* check options */
|
||||||
|
- while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
|
||||||
|
+ while ((c = getopt_long(argc, argv, "sfnvo:h?", 0, 0)) != -1) {
|
||||||
|
switch (c) {
|
||||||
|
case 's':
|
||||||
|
sloppy = 1;
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'zfs'
|
# Template file for 'zfs'
|
||||||
pkgname=zfs
|
pkgname=zfs
|
||||||
version=0.6.5.4
|
version=0.6.5.4
|
||||||
revision=3
|
revision=4
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
|
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
|
|
Loading…
Reference in New Issue