summaryrefslogtreecommitdiff
path: root/ufs/dir.h
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1994-09-16 14:33:29 +0000
committerMichael I. Bushnell <mib@gnu.org>1994-09-16 14:33:29 +0000
commite4624b4e1f1447dfc81b2c294170c76ae7dd8c15 (patch)
tree20a90ae5b6f74bcc62d8fb1df52624259dc2a835 /ufs/dir.h
parent5c273332a4d453bdc8f3b6c542c5f793ba8e88e9 (diff)
Formerly dir.h.~3~
Diffstat (limited to 'ufs/dir.h')
-rw-r--r--ufs/dir.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/ufs/dir.h b/ufs/dir.h
index 3fbb511a..c6535342 100644
--- a/ufs/dir.h
+++ b/ufs/dir.h
@@ -72,7 +72,10 @@
#define DIRBLKSIZ DEV_BSIZE
#define MAXNAMLEN 255
-struct direct {
+/* Don't call this struct DIRECT because the library defines that
+ (sometimes) in a possible different way. */
+
+struct directory_entry {
u_long d_ino; /* inode number of entry */
u_short d_reclen; /* length of this record */
u_char d_type; /* file type, see below */
@@ -98,7 +101,7 @@ struct direct {
#define IFTODT(mode) (((mode) & 0170000) >> 12)
#define DTTOIF(dirtype) ((dirtype) << 12)
-/* Return the type from a struct direct, paying attention to whether
+/* Return the type from a struct directory_entry, paying attention to whether
this filesystem supports the type extension */
#define DIRECT_TYPE(dp) (direct_symlink_extension ? (dp)->d_type : DT_UNKNOWN)
@@ -120,7 +123,7 @@ struct direct {
/* In BSD this macro takes a struct direct. Modified by MIB here to
take the namelen (as computed by strlen). */
#define DIRSIZ(namelen) \
- ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((namelen)+1 + 3) &~ 3))
+ ((sizeof (struct directory_entry) - (MAXNAMLEN+1)) + (((namelen)+1 + 3) &~ 3))
#if 0 /* This is the BSD definition */
#if (BYTE_ORDER == LITTLE_ENDIAN)