summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Martelletto <pedro@cvs.openbsd.org>2006-06-22 00:48:32 +0000
committerPedro Martelletto <pedro@cvs.openbsd.org>2006-06-22 00:48:32 +0000
commit3cc1cc3656b625fa99064a6eeac61e925695f379 (patch)
tree5aa0b34ceaf70bb53d5658426dcee41f1438cf72
parent02744f0c723c63efd37aba8952060023749e4650 (diff)
Roll in some defines for the file types used in udf_vget() and add one
for the VAT, no binary change
-rw-r--r--sys/isofs/udf/ecma167-udf.h11
-rw-r--r--sys/isofs/udf/udf_vfsops.c16
2 files changed, 18 insertions, 9 deletions
diff --git a/sys/isofs/udf/ecma167-udf.h b/sys/isofs/udf/ecma167-udf.h
index f4538261173..31b403b9780 100644
--- a/sys/isofs/udf/ecma167-udf.h
+++ b/sys/isofs/udf/ecma167-udf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecma167-udf.h,v 1.4 2006/06/22 00:10:01 pedro Exp $ */
+/* $OpenBSD: ecma167-udf.h,v 1.5 2006/06/22 00:48:31 pedro Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -139,6 +139,15 @@ struct icb_tag {
struct lb_addr parent_icb;
uint16_t flags;
} __packed;
+
+#define UDF_ICB_TYPE_DIR 0x04
+#define UDF_ICB_TYPE_FILE 0x05
+#define UDF_ICB_TYPE_BLKDEV 0x06
+#define UDF_ICB_TYPE_CHRDEV 0x07
+#define UDF_ICB_TYPE_FIFO 0x09
+#define UDF_ICB_TYPE_SOCKET 0x0a
+#define UDF_ICB_TYPE_SYMLINK 0x0c
+#define UDF_ICB_TYPE_VAT 0xf8
#define UDF_ICB_TAG_FLAGS_SETUID 0x40
#define UDF_ICB_TAG_FLAGS_SETGID 0x80
#define UDF_ICB_TAG_FLAGS_STICKY 0x100
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 94128de29a3..e160e492b46 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udf_vfsops.c,v 1.8 2006/06/22 00:10:01 pedro Exp $ */
+/* $OpenBSD: udf_vfsops.c,v 1.9 2006/06/22 00:48:31 pedro Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -606,25 +606,25 @@ udf_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
default:
vp->v_type = VBAD;
break;
- case 4:
+ case UDF_ICB_TYPE_DIR:
vp->v_type = VDIR;
break;
- case 5:
+ case UDF_ICB_TYPE_FILE:
vp->v_type = VREG;
break;
- case 6:
+ case UDF_ICB_TYPE_BLKDEV:
vp->v_type = VBLK;
break;
- case 7:
+ case UDF_ICB_TYPE_CHRDEV:
vp->v_type = VCHR;
break;
- case 9:
+ case UDF_ICB_TYPE_FIFO:
vp->v_type = VFIFO;
break;
- case 10:
+ case UDF_ICB_TYPE_SOCKET:
vp->v_type = VSOCK;
break;
- case 12:
+ case UDF_ICB_TYPE_SYMLINK:
vp->v_type = VLNK;
break;
}