Date: Mon, 22 Apr 2002 16:58:45 -0700 From: Maxime Henrion <mux@freebsd.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sbin/mount mount.c Message-ID: <20020422235845.GF88736@elvis.mu.org> In-Reply-To: <200204222303.g3MN34o71093@freefall.freebsd.org> References: <200204222303.g3MN34o71093@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--/9DWx/yDrRhgMJTb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Maxime Henrion wrote:
> mux 2002/04/22 16:03:03 PDT
>
> Modified files:
> sbin/mount mount.c
> Log:
> Do our best to determine if the user is attempting an NFS mount when
> the filesystem type isn't given in the command line. In the case of
> an IPv6 address containing ':', one must use the '@' separator for it
> to be properly parsed (mount_nfs(8) still needs fixing at the moment
> though).
[...]
I missed the fact that the '@' separator is intended to be used as
path@server, whereas you use ':' as server:path, and so this commit
broke the '@' case.
Attached is a simple patch to fix it, I'm currently waiting for review
to commit it. This shouldn't hurt a lot since this syntax is deprecated
and you can still mount properly with mount_nfs.
Maxime
--/9DWx/yDrRhgMJTb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mount.diff"
--- mount.c.old Tue Apr 23 01:30:13 2002
+++ mount.c Tue Apr 23 01:27:46 2002
@@ -288,7 +288,11 @@
*/
if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL) ||
((ep = strchr(argv[0], ':')) != NULL)) {
- cp = argv[0];
+ if (*ep == '@') {
+ cp = ep + 1;
+ ep = cp + strlen(cp);
+ } else
+ cp = argv[0];
while (cp != ep) {
if (!isdigit(*cp) && !isalpha(*cp) &&
*cp != '.' && *cp != '-' && *cp != ':')
--/9DWx/yDrRhgMJTb--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020422235845.GF88736>