zero out usec fields (from Rick Macklem)

[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 1681e2a..c679e92 100644 (file)
--- a/usr/src/sys/ufs/ffs/dir.h
+++ b/usr/src/sys/ufs/ffs/dir.h
@@ -1,11 +1,25 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)dir.h       6.2 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)dir.h       7.6 (Berkeley) %G%

  */
 
  */
 

+#ifndef _DIR_
+#define        _DIR_
+

 /*
  * A directory consists of some number of blocks of DIRBLKSIZ
  * bytes, where DIRBLKSIZ is chosen such that it can be transferred
 /*
  * A directory consists of some number of blocks of DIRBLKSIZ
  * bytes, where DIRBLKSIZ is chosen such that it can be transferred


@@ -31,10 +45,6 @@
  * Entries other than the first in a directory do not normally have
  * dp->d_ino 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

 #define DIRBLKSIZ      DEV_BSIZE
 #define        MAXNAMLEN       255
 
 #define DIRBLKSIZ      DEV_BSIZE
 #define        MAXNAMLEN       255
 


@@ -42,7 +52,7 @@ 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 */
        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 */
+       char    d_name[MAXNAMLEN + 1];  /* name with length <= MAXNAMLEN */

 };
 
 /*
 };
 
 /*


@@ -55,7 +65,33 @@ struct       direct {
 #define DIRSIZ(dp) \
     ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 
 #define DIRSIZ(dp) \
     ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 

+#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
+
+/*
+ * The following information should be obtained from <dirent.h>
+ * and is provided solely (and temporarily) for backward compatibility.
+ */

 #ifndef KERNEL
 #ifndef KERNEL

+#define d_fileno d_ino         /* compatibility with POSIX */
+#ifndef DEV_BSIZE
+#define        DEV_BSIZE       512
+#endif

 /*
  * Definitions for library routines operating on directories.
  */
 /*
  * Definitions for library routines operating on directories.
  */


@@ -65,6 +101,9 @@ typedef struct _dirdesc {
        long    dd_size;
        char    dd_buf[DIRBLKSIZ];
 } DIR;
        long    dd_size;
        char    dd_buf[DIRBLKSIZ];
 } DIR;

+
+#define dirfd(dirp)    ((dirp)->dd_fd)
+

 #ifndef NULL
 #define NULL 0
 #endif
 #ifndef NULL
 #define NULL 0
 #endif


@@ -74,22 +113,5 @@ extern      long telldir();
 extern void seekdir();
 #define rewinddir(dirp)        seekdir((dirp), (long)0)
 extern void closedir();
 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
+#endif /* not KERNEL */
+#endif /* _DIR_ */