Move the file utility functions from wiretap to libwsutil so that

libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354

1 files changed, 126 insertions, 0 deletions

diff --git a/wsutil/file_util.h b/wsutil/file_util.h
new file mode 100644
index 0000000000..1508ede555
--- /dev/null
+++ b/wsutil/file_util.h
@@ -0,0 +1,126 @@
+/* file_util.h
+ * File utility definitions
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef __FILE_UTIL_H__
+#define __FILE_UTIL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <glib.h>
+
+#ifdef _WIN32
+#include <io.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+
+/*  Win32: Since GLib2.6, we use UTF8 throughout the code, so file functions
+ *  must tweak a given filename from UTF8 to UTF16 as we use NT Unicode (Win9x
+ *  - now unsupported - used locale based encoding here).
+ */
+#if defined _WIN32 && GLIB_CHECK_VERSION(2,6,0)
+#include <stdio.h>
+
+extern int ws_stdio_open (const gchar *filename, int flags, int mode);
+extern int ws_stdio_rename (const gchar *oldfilename, const gchar *newfilename);
+extern int ws_stdio_mkdir (const gchar *filename, int mode);
+extern int ws_stdio_stat (const gchar *filename, struct stat *buf);
+extern int ws_stdio_unlink (const gchar *filename);
+extern int ws_stdio_remove (const gchar *filename);
+extern FILE * ws_stdio_fopen (const gchar *filename, const gchar *mode);
+extern FILE * ws_stdio_freopen (const gchar *filename, const gchar *mode, FILE *stream);
+
+#define ws_open	ws_stdio_open
+#define ws_rename	ws_stdio_rename
+#define ws_mkdir	ws_stdio_mkdir
+#define ws_stat	ws_stdio_stat
+#define ws_unlink	ws_stdio_unlink
+#define ws_remove	ws_stdio_remove
+#define ws_fopen	ws_stdio_fopen
+#define ws_freopen	ws_stdio_freopen
+
+#else	/* _WIN32 && GLIB_CHECK_VERSION */
+
+/* GLib 2.4 or below, using "old school" functions */
+#ifdef _WIN32
+#define ws_open		_open
+#define ws_stat		_stat
+#define ws_unlink	_unlink
+#define ws_mkdir(dir,mode)	_mkdir(dir)
+#else
+#define ws_open		open
+#define ws_stat		stat
+#define ws_unlink	unlink
+#define ws_mkdir(dir,mode)	mkdir(dir,mode)
+#endif /* _WIN32 */
+
+#define ws_rename	rename
+#define ws_remove	remove
+#define ws_fopen	fopen
+#define ws_freopen	freopen
+
+#endif	/* _WIN32 && GLIB_CHECK_VERSION */
+
+
+/* some common file function differences between UNIX and WIN32 */
+#ifdef _WIN32
+/* the Win32 API prepends underscores for whatever reasons */
+#define ws_read  _read
+#define ws_write _write
+#define ws_close _close
+#define ws_dup   _dup
+#define ws_lseek _lseek
+#else
+#define ws_read  read
+#define ws_write write
+#define ws_close close
+#define ws_dup   dup
+#define ws_lseek lseek
+#define O_BINARY	0		/* Win32 needs the O_BINARY flag for open() */
+#endif /* _WIN32 */
+
+/* directory handling */
+#define ETH_DIR				GDir
+#define ETH_DIRENT			const char
+#define ws_dir_open			g_dir_open
+#define ws_dir_read_name		g_dir_read_name
+#define ws_dir_get_name(dirent)	dirent
+#define ws_dir_rewind			g_dir_rewind
+#define ws_dir_close			g_dir_close
+
+/* XXX - remove include "dirent.h" */
+/* XXX - remove include "direct.h" */
+/* XXX - remove include "sys/stat.h" */
+/* XXX - update docs (e.g. README.developer) */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __FILE_UTIL_H__ */