diff options
| author | Jared Yanovich <jaredy@cvs.openbsd.org> | 2005-04-08 20:09:39 +0000 |
|---|---|---|
| committer | Jared Yanovich <jaredy@cvs.openbsd.org> | 2005-04-08 20:09:39 +0000 |
| commit | 4aa08f3abdbaffdf78a844c44ade693cf7daea1f (patch) | |
| tree | a1ea02a53fc7d6f64ba752eab0f4a0f1acc90dad /sbin/mount | |
| parent | 6ae197dff1cae3924cfab9868d086c0e749e49de (diff) | |
Sync with recent realpath(3) changes: on failure, don't use the second
argument "resolved", since it is undefined.
ok and help millert, otto
Diffstat (limited to 'sbin/mount')
| -rw-r--r-- | sbin/mount/mount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 39355330db6..b6ecf946516 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.37 2004/11/13 21:45:50 miod Exp $ */ +/* $OpenBSD: mount.c,v 1.38 2005/04/08 20:09:36 jaredy Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount.c 8.19 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: mount.c,v 1.37 2004/11/13 21:45:50 miod Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.38 2005/04/08 20:09:36 jaredy Exp $"; #endif #endif /* not lint */ @@ -216,7 +216,7 @@ main(int argc, char * const argv[]) usage(); if (realpath(*argv, mntpath) == NULL) - err(1, "realpath %s", mntpath); + err(1, "realpath %s", *argv); if (hasopt(options, "update")) { if ((mntbuf = getmntpt(mntpath)) == NULL) errx(1, @@ -348,7 +348,7 @@ mountfs(const char *vfstype, const char *spec, const char *name, char *optbuf, execname[MAXPATHLEN], mntpath[MAXPATHLEN]; if (realpath(name, mntpath) == NULL) { - warn("realpath %s", mntpath); + warn("realpath %s", name); return (1); } |