Have init_progfile_dir() also check whether

WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set and, if so and we weren't run
with special privileges, set the running_in_build_directory_flag.  Have
it do the same if it finds ".libs" in the pathname of the program and we
weren't run with special privileges, as that means it was probably run
from the libtool wrapper script and presumably thus isn't an installed
binary.

This means that get_credential_info() has to be called before
init_progfile_dir().

Clean up some indentation.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21866 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 4 deletions

diff --git a/dftest.c b/dftest.c
index e42ff526b1..c1631db8a4 100644
--- a/dftest.c
+++ b/dftest.c
@@ -67,14 +67,14 @@ main(int argc, char **argv)
 	dfilter_t	*df;
 
 	/*
-	 * Attempt to get the pathname of the executable file.
+	 * Get credential information for later use.
 	 */
-	init_progfile_dir(argv[0]);
+	get_credential_info();
 
 	/*
-	 * Get credential information for later use.
+	 * Attempt to get the pathname of the executable file.
 	 */
-	get_credential_info();
+	init_progfile_dir(argv[0]);
 
 	/*
 	 * Now attempt to get the pathname of the plugins.