Extend -n/-N command line option syntax to accept <version>.<minorversion>
Only 4.1 is currently supported.
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
utils/nfsd/nfsd.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 3d88b72..ce88989 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -51,6 +51,7 @@ main(int argc, char **argv)
int count = 1, c, error, port, fd, found_one;
struct servent *ent;
struct hostent *hp;
+ char *p;
ent = getservbyname ("nfs", "udp");
if (ent != NULL)
@@ -81,8 +82,12 @@ main(int argc, char **argv)
}
break;
case 'n':
- switch((c = atoi(optarg))) {
+ switch((c = strtol(optarg, &p, 0))) {
case 4:
+ if (*p == '.') {
+ minorvers4 = atoi(p + 1);
+ break;
+ }
case 3:
case 2:
NFSCTL_VERSET(versbits, c);
@@ -93,10 +98,14 @@ main(int argc, char **argv)
}
break;
case 'N':
- switch((c = atoi(optarg))) {
- case 2:
- case 3:
+ switch((c = strtol(optarg, &p, 0))) {
case 4:
+ if (*p == '.') {
+ minorvers4 = -atoi(p + 1);
+ break;
+ }
+ case 3:
+ case 2:
NFSCTL_VERUNSET(versbits, c);
break;
default:
--
1.6.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
