add ifdefs for dev_bsize (almost working)

[unix-history] / usr / src / sys / ufs / ffs / dir.h

diff --git a/usr/src/sys/ufs/ffs/dir.h b/usr/src/sys/ufs/ffs/dir.h
index 6f896e3..218ee51 100644 (file)
--- a/usr/src/sys/ufs/ffs/dir.h
+++ b/usr/src/sys/ufs/ffs/dir.h
@@ -1,10 +1,98 @@
-/*     dir.h   4.1     %G%     */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)dir.h       7.2 (Berkeley) %G%
+ */

 
 

-#ifndef        DIRSIZ
-#define        DIRSIZ  14
+/*
+ * A directory consists of some number of blocks of DIRBLKSIZ
+ * bytes, where DIRBLKSIZ is chosen such that it can be transferred
+ * to disk in a single atomic operation (e.g. 512 bytes on most machines).
+ *
+ * Each DIRBLKSIZ byte block contains some number of directory entry
+ * structures, which are of variable length.  Each directory entry has
+ * a struct direct at the front of it, containing its inode number,
+ * the length of the entry, and the length of the name contained in
+ * the entry.  These are followed by the name padded to a 4 byte boundary
+ * with null bytes.  All names are guaranteed null terminated.
+ * The maximum length of a name in a directory is MAXNAMLEN.
+ *
+ * The macro DIRSIZ(dp) gives the amount of space required to represent
+ * a directory entry.  Free space in a directory is represented by
+ * entries which have dp->d_reclen > DIRSIZ(dp).  All DIRBLKSIZ bytes
+ * in a directory block are claimed by the directory entries.  This
+ * usually results in the last entry in a directory having a large
+ * dp->d_reclen.  When entries are deleted from a directory, the
+ * space is returned to the previous entry in the same directory
+ * block by increasing its dp->d_reclen.  If the first entry of
+ * a directory block is free, then its dp->d_ino is set to 0.
+ * Entries other than the first in a directory do not normally have
+ * dp->d_ino set to 0.
+ */
+/* so user programs can just include dir.h */
+#if !defined(KERNEL) && !defined(DEV_BSIZE)
+#define        DEV_BSIZE       512

 #endif
 #endif

-struct direct
-{
-       ino_t   d_ino;
-       char    d_name[DIRSIZ];
+#define DIRBLKSIZ      DEV_BSIZE
+#define        MAXNAMLEN       255
+
+struct direct {
+       u_long  d_ino;                  /* inode number of entry */
+       u_short d_reclen;               /* length of this record */
+       u_short d_namlen;               /* length of string in d_name */
+       char    d_name[MAXNAMLEN + 1];  /* name must be no longer than this */
+};
+
+/*
+ * The DIRSIZ macro gives the minimum record length which will hold
+ * the directory entry.  This requires the amount of space in struct direct
+ * without the d_name field, plus enough space for the name with a terminating
+ * null byte (dp->d_namlen+1), rounded up to a 4 byte boundary.
+ */
+#undef DIRSIZ
+#define DIRSIZ(dp) \
+    ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
+
+#ifndef KERNEL
+/*
+ * Definitions for library routines operating on directories.
+ */
+typedef struct _dirdesc {
+       int     dd_fd;
+       long    dd_loc;
+       long    dd_size;
+       char    dd_buf[DIRBLKSIZ];
+} DIR;
+
+#define dirfd(dirp)    ((dirp)->dd_fd)
+
+#ifndef NULL
+#define NULL 0
+#endif
+extern DIR *opendir();
+extern struct direct *readdir();
+extern long telldir();
+extern void seekdir();
+#define rewinddir(dirp)        seekdir((dirp), (long)0)
+extern void closedir();
+#endif
+
+#ifdef KERNEL
+/*
+ * Template for manipulating directories.
+ * Should use struct direct's, but the name field
+ * is MAXNAMLEN - 1, and this just won't do.
+ */
+struct dirtemplate {
+       u_long  dot_ino;
+       short   dot_reclen;
+       short   dot_namlen;
+       char    dot_name[4];            /* must be multiple of 4 */
+       u_long  dotdot_ino;
+       short   dotdot_reclen;
+       short   dotdot_namlen;
+       char    dotdot_name[4];         /* ditto */

 };
 };

+#endif