1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update a comment to reflect current reality.

Browse Source 
Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448
Reviewed-on: https://code.wireshark.org/review/19074
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-12-04 19:21:19 -08:00
parent 83a1ab23ab
commit faf70602a8
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wsutil/filesystem.c
View File

@ -925,20 +925,24 @@ get_datafile_dir(void)
/* /*
* Find the directory where the plugins are stored. * Find the directory where the plugins are stored.
* *
* On Windows, we use the "plugin" subdirectory of the datafile directory. * On Windows, we use the plugin/{VERSION} subdirectory of the datafile
* directory, where {VERSION} is the version number of this version of
* Wireshark.
* *
* On UN*X, we use the PLUGIN_INSTALL_DIR value supplied by the configure * On UN*X:
* script, unless we think we're being run from the build directory,
* in which case we use the "plugin" subdirectory of the datafile directory.
* *
* In both cases, we then use the subdirectory of that directory whose * if we appear to be run from the build directory, we use the
* name is the version number. * "plugin" subdirectory of the datafile directory;
* *
* XXX - if we think we're being run from the build directory, perhaps we * otherwise, if the WIRESHARK_PLUGIN_DIR environment variable is
* should have the plugin code not look in the version subdirectory * set and we aren't running with special privileges, we use the
* of the plugin directory, but look in all of the subdirectories * value of that environment variable;
* of the plugin directory, so it can just fetch the plugins built *
* as part of the build process. * otherwise, if we're running from an app bundle in macOS, we
* use the Contents/PlugIns/wireshark subdirectory of the app bundle;
*
* otherwise, we use the PLUGIN_INSTALL_DIR value supplied by the
* configure script.
*/ */
static char *plugin_dir = NULL; static char *plugin_dir = NULL;