[105632] trunk/base/src/darwintracelib1.0/darwintrace.c
cal at macports.org
cal at macports.org
Sun Apr 28 11:51:08 PDT 2013
Revision: 105632
https://trac.macports.org/changeset/105632
Author: cal at macports.org
Date: 2013-04-28 11:51:08 -0700 (Sun, 28 Apr 2013)
Log Message:
-----------
darwintrace: move definition of struct dirent32 closer to the getdirentries syscall wrapper
Modified Paths:
--------------
trunk/base/src/darwintracelib1.0/darwintrace.c
Modified: trunk/base/src/darwintracelib1.0/darwintrace.c
===================================================================
--- trunk/base/src/darwintracelib1.0/darwintrace.c 2013-04-28 16:59:29 UTC (rev 105631)
+++ trunk/base/src/darwintracelib1.0/darwintrace.c 2013-04-28 18:51:08 UTC (rev 105632)
@@ -1087,16 +1087,6 @@
* other systems, and because other system's syscall names are probably
* different anyway */
-#pragma pack(4)
-struct dirent32 {
- ino_t d_ino; /* file number of entry */
- __uint16_t d_reclen; /* length of this record */
- __uint8_t d_type; /* file type */
- __uint8_t d_namlen; /* length of string in d_name */
- char d_name[__DARWIN_MAXNAMLEN + 1]; /* name must be no longer than this */
-};
-#pragma pack()
-
struct dirent64 {
__uint64_t d_ino; /* file number of entry */
__uint64_t d_seekoff; /* seek offset */
@@ -1143,6 +1133,16 @@
#undef __getdirentries64
}
+#pragma pack(4)
+struct dirent32 {
+ ino_t d_ino; /* file number of entry */
+ __uint16_t d_reclen; /* length of this record */
+ __uint8_t d_type; /* file type */
+ __uint8_t d_namlen; /* length of string in d_name */
+ char d_name[__DARWIN_MAXNAMLEN + 1]; /* name must be no longer than this */
+};
+#pragma pack()
+
int getdirentries(int fd, char *buf, int nbytes, long *basep) {
#define getdirentries(w,x,y,z) syscall(SYS_getdirentries, (w), (x), (y), (z))
size_t sz = getdirentries(fd, buf, nbytes, basep);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130428/b1ed14f0/attachment-0001.html>
More information about the macports-changes
mailing list