From a3d3282e64d9d2f82db472d6d422aca3d965b4b7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 21 May 2007 20:31:45 +0000 Subject: 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. svn path=/trunk/; revision=21866 --- dftest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dftest.c') 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. -- cgit v1.2.1