symbolic links take on user ownership of their containing directory

[unix-history] / usr / src / include / dirent.h

diff --git a/usr/src/include/dirent.h b/usr/src/include/dirent.h
index 8d1631c..e051321 100644 (file)
--- a/usr/src/include/dirent.h
+++ b/usr/src/include/dirent.h
@@ -4,31 +4,17 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dirent.h    5.17 (Berkeley) %G%
+ *     @(#)dirent.h    5.19 (Berkeley) %G%

  */
 
 #ifndef _DIRENT_H_
 #define _DIRENT_H_
 
 /*
  */
 
 #ifndef _DIRENT_H_
 #define _DIRENT_H_
 
 /*

- * A directory entry has a struct dirent 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 kernel defines the format of directory entries returned by 
+ * the getdirentries(2) system call.

  */
  */

-
-struct dirent {
-       u_long  d_fileno;               /* file number of entry */
-       u_short d_reclen;               /* length of this record */
-       u_short d_namlen;               /* length of string in d_name */
-#ifdef _POSIX_SOURCE
-       char    d_name[255 + 1];        /* name must be no longer than this */
-#else
-#define        MAXNAMLEN       255
-       char    d_name[MAXNAMLEN + 1];  /* name must be no longer than this */
-#endif
-};
+#include <sys/dirent.h>

 
 #ifdef _POSIX_SOURCE
 typedef void * DIR;
 
 #ifdef _POSIX_SOURCE
 typedef void * DIR;


@@ -70,7 +56,7 @@ int closedir __P((DIR *));
 long telldir __P((const DIR *));
 void seekdir __P((DIR *, long));
 int scandir __P((const char *, struct dirent ***,
 long telldir __P((const DIR *));
 void seekdir __P((DIR *, long));
 int scandir __P((const char *, struct dirent ***,

-    int (*)(struct dirent *), int (*)(void *, void *)));
+    int (*)(struct dirent *), int (*)(const void *, const void *)));

 int alphasort __P((const void *, const void *));
 int getdirentries __P((int, char *, int, long *));
 #endif /* not POSIX */
 int alphasort __P((const void *, const void *));
 int getdirentries __P((int, char *, int, long *));
 #endif /* not POSIX */