if (*ptr == '=') {
*ptr = '\0';
value = ptr+1;
+ VERIFY3P(value, !=, NULL);
break;
}
}
char cwd[PATH_MAX];
int len;
- (void) getcwd(cwd, PATH_MAX);
+ if (getcwd(cwd, PATH_MAX) == NULL)
+ return (dataset);
+
len = strlen(cwd);
/* Do not add one when cwd already ends in a trailing '/' */
struct stat st;
int error, fd;
- error = stat(MNTTAB, &st);
+ error = lstat(MNTTAB, &st);
if (error || S_ISLNK(st.st_mode))
return (0);
return (MOUNT_SYSERR);
/* try to open the dataset to access the mount point */
- if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_FILESYSTEM)) == NULL) {
+ if ((zhp = zfs_open(g_zfs, dataset,
+ ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT)) == NULL) {
(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
"mounted, unable to open the dataset\n"), dataset);
libzfs_fini(g_zfs);
return (MOUNT_USAGE);
}
- (void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, legacy,
- sizeof (legacy), NULL, NULL, 0, B_FALSE);
+ /* treat all snapshots as legacy mount points */
+ if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT)
+ (void) strlcpy(legacy, ZFS_MOUNTPOINT_LEGACY, ZFS_MAXPROPLEN);
+ else
+ (void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, legacy,
+ sizeof (legacy), NULL, NULL, 0, B_FALSE);
zfs_close(zhp);
libzfs_fini(g_zfs);