 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstyp.c,v 1.10 2020/01/01 09:17:27 tkusumi Exp $	*/
+/*	$NetBSD: fstyp.c,v 1.11 2020/01/01 12:47:19 tkusumi Exp $	*/
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * Copyright (c) 2016 The DragonFly Project
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tomohiro Kusumi <kusumi.tomohiro@gmail.com>.
+ *
  * This software was developed by Edward Tomasz Napierala under sponsorship
  * from the FreeBSD Foundation.
+ *
 @@ -25,28 +25,29 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fstyp.c,v 1.10 2020/01/01 09:17:27 tkusumi Exp $");
+__RCSID("$NetBSD: fstyp.c,v 1.11 2020/01/01 12:47:19 tkusumi Exp $");
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
 #include <iconv.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -175,27 +176,29 @@ type_check(const char *path, FILE *fp)
 		return;
 	error = ioctl(fd, DIOCGDINFO, &dl);
 	if (error != 0)
 		errx(EXIT_FAILURE, "%s: not a disk", path);
+}
 int
 main(int argc, char **argv)
+{
 	int ch, error, i, nbytes;
 	bool ignore_type = false, show_unmountable = false;
 	char label[LABEL_LEN + 1], strvised[LABEL_LEN * 4 + 1];
-	char *path;
+	char fdpath[MAXPATHLEN];
 	char *p;
 	const char *path;
 	const char *name = NULL;
 	FILE *fp;
 	fstyp_function fstyp_f;
 	fsvtyp_function fsvtyp_f;
 	while ((ch = getopt(argc, argv, "lsu")) != -1) {
 		switch (ch) {
 		case 'l':
 			show_label = true;
 			break;
 		case 's':
 			ignore_type = true;
 			break;
 @@ -223,32 +226,48 @@ main(int argc, char **argv)
 			iconv_t cd;
 			if (fstypes[i].precache_encoding == NULL)
 				continue;
 			cd = iconv_open("", fstypes[i].precache_encoding);
 			if (cd == (iconv_t)-1)
 				err(1, "%s: iconv_open %s", fstypes[i].name,
 				    fstypes[i].precache_encoding);
 			/* Iconv keeps a small cache of unused encodings. */
 			iconv_close(cd);
+		}
+	}
-	fp = fopen(path, "r");
+	/*
-	if (fp == NULL)
+	 * DragonFly: Filesystems may have syntax to decorate path.
-		goto fsvtyp; /* DragonFly */
+	 * Make a wild guess.
 	 * XXX devpath is unsupported in NetBSD, but at least parse '@' for fp.
 	 */
 	strlcpy(fdpath, path, sizeof(fdpath));
 	p = strchr(fdpath, '@');
 	if (p)
 		*p = '\0';
 	fp = fopen(fdpath, "r");
 	if (fp == NULL) {
 		if (strcmp(path, fdpath))
 			fp = fopen(path, "r");
 		if (fp == NULL)
 			goto fsvtyp; /* DragonFly */
 		else
 			strlcpy(fdpath, path, sizeof(fdpath));
+	}
 	if (ignore_type == false)
-		type_check(path, fp);
+		type_check(fdpath, fp);
 	memset(label, '\0', sizeof(label));
 	for (i = 0;; i++) {
 		if (!show_unmountable && fstypes[i].unmountable)
 			continue;
 		fstyp_f = fstypes[i].function;
 		if (fstyp_f == NULL)
 			break;
 		error = fstyp_f(fp, label, sizeof(label));
 		if (error == 0) {
 			name = fstypes[i].name;