From 39003947436f6676096e1fec3d3f09c95024d0a6 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Fri, 28 Sep 2007 16:36:56 -0400 Subject: [PATCH] text-based mount.nfs: start using new mount option parsing facility Use the new mount option parsing functions to handle existing mount option string parsing needs in the text-based mount implementation. Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- utils/mount/stropts.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index bdc8f2c..537a924 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -317,20 +317,13 @@ int nfsmount_s(const char *spec, const char *node, int flags, if (!err) goto out; - extract_interesting_options(*extra_opts); - options = po_split(*extra_opts); if (!options) { nfs_error(_("%s: internal option parsing error"), progname); goto out; } - if (!child && addr_opt) { - nfs_error(_("%s: Illegal option: 'addr='"), progname); - goto out; - } - - if (!append_addr_opt(&saddr, extra_opts)) + if (!append_addr_option(&saddr, options)) goto out; if (po_join(options, extra_opts) == PO_FAILED) { @@ -386,23 +379,16 @@ int nfs4mount_s(const char *spec, const char *node, int flags, if (!err) goto out; - extract_interesting_options(*extra_opts); - options = po_split(*extra_opts); if (!options) { nfs_error(_("%s: internal option parsing error"), progname); goto out; } - if (addr_opt) { - nfs_error(_("%s: Illegal option: 'addr='"), progname); - goto out; - } - - if (!append_addr_opt(&saddr, extra_opts)) + if (!append_addr_option(&saddr, options)) goto out; - if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts)) + if (!append_clientaddr_option(&saddr, options)) goto out; if (po_join(options, extra_opts) == PO_FAILED) { -- 2.39.5