d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use realpath on the source as well as the destination.

Browse Source
This commit is contained in:
Doug Rabson 1997-05-23 17:07:40 +00:00
parent 9c63729513
commit f329f664dd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/mount_null/mount_null.c
View File

@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_null.c 8.6 (Berkeley) 4/26/95";
*/
static const char rcsid[] =
"$Id: mount_null.c,v 1.8 1997/03/11 12:33:36 peter Exp $";
"$Id: mount_null.c,v 1.9 1997/03/29 03:32:42 imp Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -76,6 +76,7 @@ main(argc, argv)
{
struct null_args args;
int ch, mntflags;
char source[MAXPATHLEN];
char target[MAXPATHLEN];
struct vfsconf vfc;
int error;
@ -99,7 +100,10 @@ main(argc, argv)
if (realpath(argv[0], target) == 0)
err(EX_OSERR, "%s", target);
if (subdir(target, argv[1]) || subdir(argv[1], target))
if (realpath(argv[1], source) == 0)
err(EX_OSERR, "%s", source);
if (subdir(target, source) || subdir(source, target))
errx(EX_USAGE, "%s (%s) and %s are not distinct paths",
argv[0], target, argv[1]);
@ -115,7 +119,7 @@ main(argc, argv)
if (error)
errx(EX_OSERR, "null/loopback filesystem is not available");
if (mount(vfc.vfc_name, argv[1], mntflags, &args))
if (mount(vfc.vfc_name, source, mntflags, &args))
err(1, NULL);
exit(0);
}

10
sbin/mount_nullfs/mount_nullfs.c
View File

@ -45,7 +45,7 @@ char copyright[] =
static char sccsid[] = "@(#)mount_null.c 8.6 (Berkeley) 4/26/95";
*/
static const char rcsid[] =
"$Id: mount_null.c,v 1.8 1997/03/11 12:33:36 peter Exp $";
"$Id: mount_null.c,v 1.9 1997/03/29 03:32:42 imp Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -76,6 +76,7 @@ main(argc, argv)
{
struct null_args args;
int ch, mntflags;
char source[MAXPATHLEN];
char target[MAXPATHLEN];
struct vfsconf vfc;
int error;
@ -99,7 +100,10 @@ main(argc, argv)
if (realpath(argv[0], target) == 0)
err(EX_OSERR, "%s", target);
if (subdir(target, argv[1]) || subdir(argv[1], target))
if (realpath(argv[1], source) == 0)
err(EX_OSERR, "%s", source);
if (subdir(target, source) || subdir(source, target))
errx(EX_USAGE, "%s (%s) and %s are not distinct paths",
argv[0], target, argv[1]);
@ -115,7 +119,7 @@ main(argc, argv)
if (error)
errx(EX_OSERR, "null/loopback filesystem is not available");
if (mount(vfc.vfc_name, argv[1], mntflags, &args))
if (mount(vfc.vfc_name, source, mntflags, &args))
err(1, NULL);
exit(0);
}