Move the epan/filesystem.c routines to wsutil; they're not specific to

packet dissection, they're specific to the entire Wireshark suite of programs. svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00 · 2013-11-17 02:55:14 +00:00 · db25270df8
parent dd1034e1f5
commit db25270df8
100 changed files with 114 additions and 104 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -747,7 +747,6 @@ endif()

 set(WTAP_PLUGIN_SOURCES
 	epan/plugins.c
-	epan/filesystem.c
 )

 set(SHARK_COMMON_CAPTURE_SRC
--- a/Makefile.am
+++ b/Makefile.am
@ -312,8 +312,7 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 	-dlopen plugins/wimaxmacphy/wimaxmacphy.la

 WTAP_PLUGIN_SOURCES = \
-       epan/plugins.c \
-       epan/filesystem.c
+       epan/plugins.c

 else		# HAVE_PLUGINS

--- a/Makefile.nmake
+++ b/Makefile.nmake
@ -54,8 +54,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c

 WTAP_PLUGIN_SOURCES = \
-	epan/plugins.c \
-	epan/filesystem.c
+	epan/plugins.c

 include Makefile.common

--- a/capinfos.c
+++ b/capinfos.c
@ -76,16 +76,16 @@
 #include <glib.h>

 #include <wsutil/privileges.h>
+#include <wsutil/filesystem.h>

 /*
 * The symbols declared in the below are exported from libwireshark,
- * but we don't want to link whole libwireshark to editcap.
+ * but we don't want to link whole libwireshark to capinfos.
 * We link the object directly instead and this needs a little trick
 * with the WS_BUILD_DLL #define.
 */
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
-#include <epan/filesystem.h>
 #include <epan/plugins.h>
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
--- a/capture_info.c
+++ b/capture_info.c
@ -32,7 +32,6 @@
 /* XXX - try to remove this later */
 #include <epan/prefs.h>
 /* XXX - try to remove this later */
-#include <epan/filesystem.h>

 #include "capture_info.h"

@ -59,6 +58,8 @@
 #include <epan/dissectors/packet-i2c.h>
 #include <epan/dissectors/packet-ax25-kiss.h>

+#include <wsutil/filesystem.h>
+
 static void capture_info_packet(
 packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);

--- a/capture_sync.c
+++ b/capture_sync.c
@ -84,7 +84,6 @@

 #include "globals.h"
 #include "file.h"
-#include <epan/filesystem.h>

 #include "capture.h"
 #include "capture_sync.h"
@ -97,6 +96,7 @@

 #include "ui/ui_util.h"

+#include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_err.h>
 #include "log.h"
--- a/color_filters.c
+++ b/color_filters.c
@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <string.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>

 #include <epan/packet.h>
--- a/dftest.c
+++ b/dftest.c
@ -35,7 +35,7 @@

 #include <epan/timestamp.h>
 #include <epan/plugins.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/prefs.h>
 #include "ui/util.h"
--- a/editcap.c
+++ b/editcap.c
@ -76,6 +76,7 @@
 #endif

 #include <wsutil/privileges.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/report_err.h>
 #include <wsutil/strnatcmp.h>
 #include <wsutil/md5.h>
@ -89,7 +90,6 @@
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
 #include "epan/plugins.h"
-#include "epan/filesystem.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT

--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@ -1480,7 +1480,6 @@ set(LIBWIRESHARK_FILES
 	except.c
 	expert.c
 	exported_pdu.c
-	filesystem.c
 	filter_expressions.c
 	follow.c
 	frame_data.c
@ -1682,8 +1681,6 @@ if(NOT ${ENABLE_STATIC})
 	)
 endif()

-add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
-
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@ -62,8 +62,7 @@ include Makefile.common

 AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
 	@LUA_INCLUDES@ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \
-	$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS) \
-	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"
+	$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS)

 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL

--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@ -51,7 +51,6 @@ LIBWIRESHARK_SRC =		\
 	except.c		\
 	expert.c		\
 	exported_pdu.c		\
-	filesystem.c		\
 	filter_expressions.c	\
 	follow.c		\
 	frame_data.c		\
@ -189,7 +188,6 @@ LIBWIRESHARK_INCLUDES =		\
 	expert.h		\
 	exported_pdu.h		\
 	filter_expressions.h	\
-	filesystem.h		\
 	follow.h		\
 	frame_data.h		\
 	frame_data_sequence.h	\
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@ -122,7 +122,7 @@
 #include "addr_and_mask.h"
 #include "ipv6-utils.h"
 #include "addr_resolv.h"
-#include "filesystem.h"
+#include "wsutil/filesystem.h"

 #include <wsutil/report_err.h>
 #include <wsutil/file_util.h>
--- a/epan/disabled_protos.c
+++ b/epan/disabled_protos.c
@ -35,7 +35,7 @@

 #include <glib.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/proto.h>

 #include "disabled_protos.h"
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@ -52,7 +52,7 @@

 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/wmem/wmem.h>
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@ -29,7 +29,7 @@
 #include "config.h"

 #include <glib.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@ -69,7 +69,7 @@
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/addr_resolv.h>
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@ -103,7 +103,7 @@
 #include <epan/dissectors/packet-x509af.h>
 #include <epan/dissectors/packet-ocsp.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/expert.h>
 #include "packet-x509if.h"
 #include "packet-ssl.h"
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@ -40,7 +40,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/strutil.h>

--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@ -45,7 +45,7 @@
 #include <epan/packet.h>
 #include <epan/tvbparse.h>
 #include <epan/dtd.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/garrayfix.h>

--- a/epan/oids.c
+++ b/epan/oids.c
@ -39,7 +39,7 @@
 #include "prefs.h"
 #include "proto.h"
 #include "packet.h"
-#include "filesystem.h"
+#include "wsutil/filesystem.h"
 #include "dissectors/packet-ber.h"

 #ifdef HAVE_LIBSMI
--- a/epan/plugins.c
+++ b/epan/plugins.c
@ -50,7 +50,7 @@ wslua_plugin *wslua_plugin_list = NULL;
 #include <unistd.h>
 #endif

-#include "filesystem.h"
+#include "wsutil/filesystem.h"
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_err.h>
--- a/epan/prefs.c
+++ b/epan/prefs.c
@ -36,7 +36,7 @@
 #include <glib.h>

 #include <stdio.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/oids.h>
--- a/epan/print.c
+++ b/epan/print.c
@ -50,7 +50,7 @@
 #include <epan/charsets.h>
 #include <epan/dissectors/packet-data.h>
 #include <epan/dissectors/packet-frame.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #define PDML_VERSION "0"
 #define PSML_VERSION "0"
--- a/epan/uat.c
+++ b/epan/uat.c
@ -42,7 +42,7 @@
 #include <wsutil/report_err.h>

 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/range.h>

--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@ -50,7 +50,7 @@
 #include <epan/proto.h>
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/funnel.h>
 #include <epan/tvbparse.h>
 #include <epan/epan.h>
--- a/file.c
+++ b/file.c
@ -43,6 +43,7 @@

 #include <wsutil/tempfile.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>

 #include <wiretap/merge.h>

@ -53,7 +54,6 @@
 #include <epan/packet.h>
 #include <epan/column-utils.h>
 #include <epan/expert.h>
-#include <epan/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/dfilter/dfilter.h>
 #include <epan/epan_dissect.h>
--- a/fileset.c
+++ b/fileset.c
@ -51,9 +51,9 @@
 #include <glib.h>

 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 #include "globals.h"

-#include <epan/filesystem.h>
 #include <epan/strutil.h>

 #include "fileset.h"
--- a/filters.c
+++ b/filters.c
@ -35,10 +35,10 @@

 #include <glib.h>

-#include <epan/filesystem.h>
+#include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>

 #include "filters.h"
-#include <wsutil/file_util.h>

 /*
 * Old filter file name.
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@ -76,7 +76,7 @@
 #include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/oids.h>
 #include <epan/emem.h>
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@ -50,7 +50,7 @@
 #include <epan/proto.h>
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "mate_util.h"

--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@ -43,7 +43,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/eap.h>

 #include "wimaxasncp_dict.h"
--- a/rawshark.c
+++ b/rawshark.c
@ -66,10 +66,10 @@
 #include <glib.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
-#include <epan/filesystem.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>

 #include "globals.h"
 #include <epan/packet.h>
--- a/tshark.c
+++ b/tshark.c
@ -62,10 +62,10 @@
 #include <epan/exceptions.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
-#include <epan/filesystem.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>

 #include "globals.h"
 #include <epan/timestamp.h>
--- a/ui/alert_box.c
+++ b/ui/alert_box.c
@ -29,7 +29,7 @@

 #include <glib.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dfilter/dfilter.h>

 #include "ui/alert_box.h"
--- a/ui/follow.c
+++ b/ui/follow.c
@ -27,7 +27,7 @@

 #include <glib.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dfilter/dfilter.h>

 #include "ui/follow.h"
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@ -29,7 +29,7 @@

 #include <string.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/plugins.h>
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
--- a/ui/gtk/addr_resolution_dlg.c
+++ b/ui/gtk/addr_resolution_dlg.c
@ -31,7 +31,7 @@
 #include <gtk/gtk.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/addr_resolv.h>

 #include "../cfile.h"
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@ -32,7 +32,7 @@

 #include <string.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/emem.h>
 #include <epan/prefs.h>
 #include <epan/frequency-utils.h>
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/strutil.h>
 #include <epan/frequency-utils.h>
 #include <epan/crypt/airpdcap_ws.h>
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@ -36,7 +36,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "../capture.h"
 #include "../capture_ifinfo.h"
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@ -32,7 +32,7 @@

 #include <gtk/gtk.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>

--- a/ui/gtk/conversation_hastables_dlg.c
+++ b/ui/gtk/conversation_hastables_dlg.c
@ -31,7 +31,7 @@
 #include <gtk/gtk.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/conversation.h>

 #include "ui/main_statusbar.h"
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@ -33,7 +33,7 @@

 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>

--- a/ui/gtk/dlg_utils.c
+++ b/ui/gtk/dlg_utils.c
@ -34,7 +34,7 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/old-gtk-compat.h"

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"


 static void
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@ -30,7 +30,7 @@
 #include <gtk/gtk.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "ui/main_statusbar.h"

--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@ -45,7 +45,7 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
 #include <epan/charsets.h>
--- a/ui/gtk/file_dlg.c
+++ b/ui/gtk/file_dlg.c
@ -47,7 +47,7 @@

 #include <wsutil/file_util.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "ui/last_open_dir.h"
 #include "ui/util.h"
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@ -33,7 +33,7 @@
 #include <gtk/gtk.h>

 #include "file.h"
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "../fileset.h"

--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@ -28,7 +28,7 @@

 #include <gtk/gtk.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/proto.h>

--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@ -52,7 +52,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-ipv6.h>

 #include <ui/alert_box.h>
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@ -31,7 +31,7 @@

 #include <epan/epan.h>
 #include <epan/packet.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/to_str.h>
 #include <epan/strutil.h>
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@ -41,7 +41,7 @@
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>

 #include <ui/alert_box.h>
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@ -35,7 +35,7 @@

 #include <epan/addr_resolv.h>
 #include <epan/follow.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/charsets.h>

--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@ -42,7 +42,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/charsets.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/ipproto.h>
 #include <epan/charsets.h>

--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@ -48,7 +48,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/addr_resolv.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "ui/util.h"

--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@ -42,7 +42,7 @@
 #include <GeoIP.h>
 #include <epan/geoip_db.h>
 #include <wsutil/pint.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #endif

 #include <wsutil/file_util.h>
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@ -57,7 +57,7 @@
 #include <wsutil/pint.h>

 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>
 #include <epan/tap-voip.h>
 #include <epan/dissectors/packet-iax2.h>
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@ -71,7 +71,7 @@
 #include <wiretap/merge.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/epan_dissect.h>
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@ -44,7 +44,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/column.h>
 #include <epan/stats_tree_priv.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/print.h>

 #include "cfile.h"
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@ -31,7 +31,7 @@
 #include <gtk/gtk.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/epan_dissect.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@ -37,7 +37,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@ -50,7 +50,7 @@
 #include <epan/packet.h>
 #include <epan/charsets.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "../isprint.h"

--- a/ui/gtk/pixmap_save.c
+++ b/ui/gtk/pixmap_save.c
@ -29,7 +29,7 @@

 #include <gtk/gtk.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@ -30,7 +30,7 @@

 #include <epan/prefs.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/print.h>

 #include "ui/alert_box.h"
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@ -31,7 +31,7 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>

 #include "ui/profile.h"
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@ -33,7 +33,7 @@
 #endif

 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/disabled_protos.h>

 #include "ui/util.h"
--- a/ui/gtk/proto_help.c
+++ b/ui/gtk/proto_help.c
@ -40,7 +40,7 @@
 #include "../file.h"

 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/strutil.h>
 #include <epan/proto.h>

--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@ -57,7 +57,7 @@
 #include <wsutil/pint.h>

 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/rtp_pt.h>
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@ -35,7 +35,7 @@
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"

 #include "../globals.h"
 #include "../stat_menu.h"
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@ -27,7 +27,7 @@
 #include <gtk/gtk.h>

 #include <epan/epan_dissect.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/to_str.h>
 #include <epan/strutil.h>

--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@ -31,7 +31,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/strutil.h>

 #include "../globals.h"
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@ -28,7 +28,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/to_str.h"

 #include "../globals.h"
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@ -26,7 +26,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"

 #include "../globals.h"
 #include "ui/simple_dialog.h"
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@ -32,7 +32,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/strutil.h>

 #include "../globals.h"
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@ -27,7 +27,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/to_str.h"

 #include "../globals.h"
--- a/ui/gtk/text_page_utils.c
+++ b/ui/gtk/text_page_utils.c
@ -31,7 +31,7 @@

 #include <gtk/gtk.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"

 #include "ui/simple_dialog.h"
 #include <wsutil/file_util.h>
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@ -56,7 +56,7 @@
 #include <epan/packet.h>
 #include <epan/uat-int.h>
 #include <epan/value_string.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "../stat_menu.h"

--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@ -43,7 +43,7 @@

 #include <epan/epan.h>
 #include <epan/packet.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/to_str.h>
--- a/ui/gtk/webbrowser.c
+++ b/ui/gtk/webbrowser.c
@ -109,7 +109,7 @@

 #include <gtk/gtk.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>

 #include "ui/simple_dialog.h"
--- a/ui/help_url.c
+++ b/ui/help_url.c
@ -30,7 +30,7 @@
 #include <glib.h>

 #include "help_url.h"
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"

 #ifdef HHC_DIR
 #include <windows.h>
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@ -30,7 +30,7 @@

 #include <epan/column-info.h>
 #include <epan/column.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>

--- a/ui/profile.c
+++ b/ui/profile.c
@ -31,7 +31,7 @@
 #include <glib.h>

 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>

 #include "profile.h"
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@ -36,7 +36,7 @@
 #include "file.h"
 #include "../../epan/addr_resolv.h"
 #include "../../epan/prefs.h"
-#include "../../epan/filesystem.h"
+#include "../../wsutil/filesystem.h"
 #include "../../wsutil/nstime.h"

 #include <wireshark_application.h>
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@ -34,7 +34,7 @@
 #include "ui/util.h"

 #include <epan/print.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include "qt_ui_utils.h"

--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@ -32,7 +32,7 @@

 #include <ui/alert_box.h>

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>

 #include <wsutil/str_util.h>

--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@ -43,7 +43,7 @@
 #include <wiretap/merge.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/epan_dissect.h>
 #include <epan/timestamp.h>
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@ -26,7 +26,7 @@
 #include <glib.h>

 #include "epan/expert.h"
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"

 #include "ui/main_statusbar.h"
 #include "ui/profile.h"
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@ -27,7 +27,7 @@
 #include "globals.h"

 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/ipproto.h>
 #include <epan/prefs.h>

--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@ -36,7 +36,7 @@

 #include "globals.h"

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>

 #ifdef _WIN32
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@ -24,7 +24,7 @@
 #include "config.h"
 #include <glib.h>

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/prefs.h"

 #include "ui/profile.h"
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@ -23,7 +23,7 @@

 #include "wireshark_application.h"

-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/timestamp.h>
 #include <epan/disabled_protos.h>

--- a/ui/recent.c
+++ b/ui/recent.c
@ -31,7 +31,7 @@
 #include <errno.h>

 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/emem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@ -45,7 +45,7 @@

 #include "wiretap/merge.h"

-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/addr_resolv.h"
 #include "epan/prefs.h"
 #include "epan/print.h"
--- a/update.c
+++ b/update.c
@ -30,7 +30,6 @@

 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
-#include <epan/filesystem.h>

 #include "simple_dialog.h"
 #include "version_info.h"
@ -40,6 +39,7 @@
 #endif

 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>

 #include <wininet.h>
 #include "nio-ie5.h"
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@ -52,6 +52,7 @@ set(WSUTIL_FILES
  crcdrm.c
  des.c
  eax.c
+  filesystem.c
  g711.c
  md4.c
  md5.c
@ -121,3 +122,17 @@ if(NOT ${ENABLE_STATIC})
 	)
 endif()

+add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@ -65,7 +65,8 @@ lib_LTLIBRARIES = libwsutil.la
 libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@

 AM_CPPFLAGS = -I$(srcdir)/.. \
-	$(LIBGCRYPT_CFLAGS)
+	$(LIBGCRYPT_CFLAGS) \
+	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"

 libwsutil_la_SOURCES =		\
 	$(LIBWSUTIL_SRC)	\
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@ -45,6 +45,7 @@ LIBWSUTIL_SRC = 	\
 	crcdrm.c	\
 	des.c		\
 	eax.c		\
+	filesystem.c	\
 	g711.c		\
 	md4.c		\
 	md5.c		\
@ -79,6 +80,7 @@ LIBWSUTIL_INCLUDES = 	\
 	crcdrm.h	\
 	des.h		\
 	eax.h		\
+	filesystem.h	\
 	g711.h		\
 	md4.h		\
 	md5.h		\
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
--- a/wsutil/filesystem.h
+++ b/wsutil/filesystem.h