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

Imagine a situation where:

Browse Source 
# ls -ld /mnt/{foo,bar}
	drwxr-xr-x  3 root  wheel  512 Mar 16 06:56 /mnt/bar
	lrwxr-xr-x  1 root  wheel    3 Mar 16 12:10 /mnt/foo -> bar

	# grep /mnt/foo /etc/fstab
	/dev/da1	/mnt/foo	ufs	rw	0	0

Which means, we give symbolic link as a mount point to mount(8), but mount(8)
use realpath(3) before mounting the file systems, so we get:

	# mount | grep /dev/da1
	/dev/da1 on /mnt/bar (ufs, local)

Before the commit:

	# snapinfo /mnt/foo
	usage: snapinfo [-v] -a
	       snapinfo [-v] mountpoint
	# snapinfo /mnt/bar
	/mnt/bar/snap

This commit makes snapinfo(8) to first realpath(3) the given mount point and
now we have:

	# snapinfo /mnt/foo
	/mnt/bar/snap
	# snapinfo /mnt/bar
	/mnt/bar/snap
This commit is contained in:
pjd 2007-03-16 12:36:54 +00:00
parent 996c735fb5
commit bb1f6478b9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/snapinfo/snapinfo.c
View File

@ -81,12 +81,19 @@ main(int argc, char **argv)
usage(); usage();
if (!all) { if (!all) {
path = *argv; char resolved[PATH_MAX];
if (strrchr(path, '/') == NULL || /* is absolute path */ path = *argv;
(stat(path, &st) == -1) || /* is it stat'able */ /*
!(st.st_mode & S_IFDIR)) /* is it a directory */ * mount(8) use realpath(3) before mounting file system,
* so let's do the same with the given path.
*/
if (realpath(path, resolved) == NULL || /* can create full path */
stat(resolved, &st) == -1 || /* is it stat'able */
!S_ISDIR(st.st_mode)) { /* is it a directory */
usage(); usage();
}
path = resolved;
} }
fscount = getmntinfo(&mntbuf, MNT_WAIT); fscount = getmntinfo(&mntbuf, MNT_WAIT);