Page MenuHomeFreeBSD
Files F109932405

D29917.id.diff
No OneTemporary
Actions

D29917.id.diff
View Options

diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PROG= fstyp
-SRCS= apfs.c cd9660.c exfat.c ext2fs.c fstyp.c geli.c hammer.c \
+SRCS= apfs.c befs.c cd9660.c exfat.c ext2fs.c fstyp.c geli.c hammer.c \
hammer2.c hfsplus.c msdosfs.c ntfs.c ufs.c
.if ${MK_ZFS} != "no"
diff --git a/usr.sbin/fstyp/befs.c b/usr.sbin/fstyp/befs.c
new file mode 100644
--- /dev/null
+++ b/usr.sbin/fstyp/befs.c
@@ -0,0 +1,70 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2021 Miguel Gocobachi
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * 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>
+__FBSDID("$FreeBSD$");
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "fstyp.h"
+
+#define B_OS_NAME_LENGTH 32
+#define BEFS_BLOCK_OFFSET 512
+#define BEFS_SUPER_BLOCK_MAGIC1 0x42465331
+
+struct disk_super_block {
+ char name[B_OS_NAME_LENGTH];
+ int32_t magic1;
+};
+
+int
+fstyp_befs(FILE *fp, char *label, size_t size)
+{
+ struct disk_super_block *volume;
+
+ volume = read_buf(fp, BEFS_BLOCK_OFFSET, sizeof(*volume));
+
+ if (volume == NULL) {
+ return (1);
+ }
+
+ if (volume->magic1 == BEFS_SUPER_BLOCK_MAGIC1) {
+ strlcpy(label, volume->name, size);
+ free(volume);
+
+ return (0);
+ }
+
+ free(volume);
+
+ return (1);
+}
diff --git a/usr.sbin/fstyp/fstyp.h b/usr.sbin/fstyp/fstyp.h
--- a/usr.sbin/fstyp/fstyp.h
+++ b/usr.sbin/fstyp/fstyp.h
@@ -50,6 +50,7 @@
void rtrim(char *label, size_t size);
int fstyp_apfs(FILE *fp, char *label, size_t size);
+int fstyp_befs(FILE *fp, char *label, size_t size);
int fstyp_cd9660(FILE *fp, char *label, size_t size);
int fstyp_exfat(FILE *fp, char *label, size_t size);
int fstyp_ext2fs(FILE *fp, char *label, size_t size);
diff --git a/usr.sbin/fstyp/fstyp.8 b/usr.sbin/fstyp/fstyp.8
--- a/usr.sbin/fstyp/fstyp.8
+++ b/usr.sbin/fstyp/fstyp.8
@@ -42,7 +42,7 @@
The
.Nm
utility is used to determine the filesystem type on a given device.
-It can recognize ISO-9660, exFAT, Ext2, FAT, NTFS, and UFS filesystems.
+It can recognize BeFS (BeOS), ISO-9660, exFAT, Ext2, FAT, NTFS, and UFS filesystems.
When the
.Fl u
flag is specified,
@@ -59,6 +59,8 @@
as, respectively:
.Bl -item -offset indent -compact
.It
+befs
+.It
cd9660
.It
exfat
diff --git a/usr.sbin/fstyp/fstyp.c b/usr.sbin/fstyp/fstyp.c
--- a/usr.sbin/fstyp/fstyp.c
+++ b/usr.sbin/fstyp/fstyp.c
@@ -64,6 +64,7 @@
char *precache_encoding;
} fstypes[] = {
{ "apfs", &fstyp_apfs, true, NULL },
+ { "befs", &fstyp_befs, false, NULL },
{ "cd9660", &fstyp_cd9660, false, NULL },
{ "exfat", &fstyp_exfat, false, EXFAT_ENC },
{ "ext2fs", &fstyp_ext2fs, false, NULL },
diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile
--- a/usr.sbin/fstyp/tests/Makefile
+++ b/usr.sbin/fstyp/tests/Makefile
@@ -4,6 +4,7 @@
ATF_TESTS_SH= fstyp_test
+${PACKAGE}FILES+= befs.img.bz2
${PACKAGE}FILES+= dfr-01-xfat.img.bz2
${PACKAGE}FILES+= ext2.img.bz2
${PACKAGE}FILES+= ext3.img.bz2
diff --git a/usr.sbin/fstyp/tests/befs.img.bz2 b/usr.sbin/fstyp/tests/befs.img.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
literal 0
Hc$@<O00001
diff --git a/usr.sbin/fstyp/tests/fstyp_test.sh b/usr.sbin/fstyp/tests/fstyp_test.sh
--- a/usr.sbin/fstyp/tests/fstyp_test.sh
+++ b/usr.sbin/fstyp/tests/fstyp_test.sh
@@ -27,6 +27,16 @@
# $FreeBSD$
+atf_test_case befs
+befs_head() {
+ atf_set "descr" "fstyp(8) can detect BeFS and label filesystem"
+}
+befs_body() {
+ bzcat $(atf_get_srcdir)/befs.img.bz2 > befs.img
+ atf_check -s exit:0 -o inline:"befs\n" fstyp befs.img
+ atf_check -s exit:0 -o inline:"befs BeFS\n" fstyp -l befs.img
+}
+
atf_test_case cd9660
cd9660_head() {
atf_set "descr" "fstyp(8) should detect cd9660 filesystems"
@@ -257,6 +267,7 @@
atf_init_test_cases() {
+ atf_add_test_case befs
atf_add_test_case cd9660
atf_add_test_case cd9660_label
atf_add_test_case dir

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 10:23 AM (10 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16609336
Default Alt Text
D29917.id.diff (5 KB)

Event Timeline