projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert 67496 as it makes running Paint.NET impossible
[mono.git]
/
support
/
dirent.c
diff --git
a/support/dirent.c
b/support/dirent.c
index e2272c5994094ae74f7e205d45d682ea289f8f6e..ae13bf2ea529bd4a9dfbe053221d5c2712b5a75b 100644
(file)
--- a/
support/dirent.c
+++ b/
support/dirent.c
@@
-4,42
+4,36
@@
* Authors:
* Jonathan Pryor (jonpryor@vt.edu)
*
* Authors:
* Jonathan Pryor (jonpryor@vt.edu)
*
- * Copyright (C) 2004 Jonathan Pryor
+ * Copyright (C) 2004
-2005
Jonathan Pryor
*/
#include <dirent.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
*/
#include <dirent.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
+#include <unistd.h>
+#include "map.h"
#include "mph.h"
G_BEGIN_DECLS
#include "mph.h"
G_BEGIN_DECLS
-struct Mono_Posix_Syscall__Dirent {
- /* ino_t */ mph_ino_t d_ino;
- /* off_t */ mph_off_t d_off;
- /* ushort */ unsigned short d_reclen;
- /* byte */ unsigned char d_type;
- /* string */ char *d_name;
-};
-
gint32
gint32
-Mono_Posix_Syscall_seekdir (
DIR
*dir, mph_off_t offset)
+Mono_Posix_Syscall_seekdir (
void
*dir, mph_off_t offset)
{
mph_return_if_off_t_overflow (offset);
errno = 0;
{
mph_return_if_off_t_overflow (offset);
errno = 0;
- seekdir (dir, (off_t) offset);
+ seekdir (
(DIR*)
dir, (off_t) offset);
return errno != 0;
}
mph_off_t
return errno != 0;
}
mph_off_t
-Mono_Posix_Syscall_telldir (
DIR
*dir)
+Mono_Posix_Syscall_telldir (
void
*dir)
{
{
- return telldir (dir);
+ return telldir (
(DIR*)
dir);
}
static void
}
static void
@@
-62,7
+56,7
@@
copy_dirent (struct Mono_Posix_Syscall__Dirent *to, struct dirent *from)
}
gint32
}
gint32
-Mono_Posix_Syscall_readdir (
DIR
*dirp, struct Mono_Posix_Syscall__Dirent *entry)
+Mono_Posix_Syscall_readdir (
void
*dirp, struct Mono_Posix_Syscall__Dirent *entry)
{
struct dirent *d;
{
struct dirent *d;
@@
-83,7
+77,7
@@
Mono_Posix_Syscall_readdir (DIR *dirp, struct Mono_Posix_Syscall__Dirent *entry)
}
gint32
}
gint32
-Mono_Posix_Syscall_readdir_r (
DIR
*dirp, struct Mono_Posix_Syscall__Dirent *entry, void **result)
+Mono_Posix_Syscall_readdir_r (
void
*dirp, struct Mono_Posix_Syscall__Dirent *entry, void **result)
{
struct dirent _entry;
int r;
{
struct dirent _entry;
int r;
@@
-97,6
+91,14
@@
Mono_Posix_Syscall_readdir_r (DIR *dirp, struct Mono_Posix_Syscall__Dirent *entr
return r;
}
return r;
}
+int
+Mono_Posix_Syscall_rewinddir (void* dir)
+{
+ errno = 0;
+ rewinddir (dir);
+ return errno == 0 ? 0 : -1;
+}
+
G_END_DECLS
/*
G_END_DECLS
/*