replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).

to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403

1 files changed, 3 insertions, 16 deletions

diff --git a/util.c b/util.c
index f6ed670b13..6b6298c70f 100644
--- a/util.c
+++ b/util.c
@@ -37,20 +37,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef NEED_MKSTEMP
-#include "mkstemp.h"
-#endif
-
-#ifdef HAVE_IO_H
-#include <io.h>
-#ifndef __MINGW32__
-typedef int mode_t;	/* for win32 */
-#endif /* __MINGW32__ */
-#endif /* HAVE_IO_H */
+#include "file_util.h"
 
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
@@ -130,7 +117,7 @@ try_tempfile(char *namebuf, int namebuflen, const char *dir, const char *pfx)
 {
 	static const char suffix[] = "XXXXXXXXXX";
 	int namelen = strlen(dir) + strlen(pfx) + sizeof suffix;
-	mode_t old_umask;
+	int old_umask;
 	int tmp_fd;
 
 	if (namebuflen < namelen) {
@@ -152,7 +139,7 @@ try_tempfile(char *namebuf, int namebuflen, const char *dir, const char *pfx)
 	   permissions, attempt to create the file, and then put
 	   the umask back. */
 	old_umask = umask(0077);
-	tmp_fd = mkstemp(namebuf);
+	tmp_fd = eth_mkstemp(namebuf);
 	umask(old_umask);
 	return tmp_fd;
 }