Add a WIRESHARK_RUN_FROM_BUILD_DIRECTORY environment variable on UN*X;

if set, and if the program isn't running with additional privileges,
it'll treat the directory in which the program is found as the data
directory.

If, on Windows, the version-number subdirectory of {data
directory}\plugins doesn't exist (which is assumed to mean that the
program is being run from the build directory), or if, on UN*X,
WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set, the plugin directory is the
"plugins" subdirectory of the data directory, and all subdirectories of
that directory are scanned for plugins, as the "plugins" subdirectory of
the build directory contains subdirectories for the plugins; this means
that if we're running from the build directory, we'll find the plugins
we built in the build tree.

When generating the wireshark-filter man page, run tshark with
WIRESHARK_RUN_FROM_BUILD_DIRECTORY set, so it uses the plugins from the
build to generate the list of filters.

svn path=/trunk/; revision=20261

1 files changed, 15 insertions, 5 deletions

diff --git a/dftest.c b/dftest.c
index 37629c4cd8..69d4d7875a 100644
--- a/dftest.c
+++ b/dftest.c
@@ -67,17 +67,27 @@ main(int argc, char **argv)
 	dfilter_t	*df;
 
 	/*
+	 * Attempt to get the pathname of the executable file.
+	 */
+	init_progfile_dir(argv[0]);
+
+	/*
 	 * Get credential information for later use.
 	 */
 	get_credential_info();
 
+	/*
+	 * Now attempt to get the pathname of the plugins.
+	 */
+	init_plugin_dir();
+
 	timestamp_set_type(TS_RELATIVE);
 
-	/* register all dissectors; we must do this before checking for the
-	"-g" flag, as the "-g" flag dumps a list of fields registered
-	by the dissectors, and we must do it before we read the preferences,
-	in case any dissectors register preferences. */
-	epan_init(PLUGIN_DIR,register_all_protocols,
+	/* Register all dissectors; we must do this before checking for the
+	   "-g" flag, as the "-g" flag dumps a list of fields registered
+	   by the dissectors, and we must do it before we read the preferences,
+	   in case any dissectors register preferences. */
+	epan_init(register_all_protocols,
 		  register_all_protocol_handoffs,
 		  failure_message, open_failure_message, read_failure_message);