summaryrefslogtreecommitdiff
path: root/wsutil/filesystem.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-12-04 19:21:19 -0800
committerGuy Harris <guy@alum.mit.edu>2016-12-05 03:21:59 +0000
commitfaf70602a8e96433ae888278cccaac057091fbca (patch)
tree55dea365c80effdf9e6ec57a2232428eeac183d4 /wsutil/filesystem.c
parent83a1ab23abdb22ae7b84cff99009988f97fb3653 (diff)
downloadwireshark-faf70602a8e96433ae888278cccaac057091fbca.tar.gz
Update a comment to reflect current reality.
Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448 Reviewed-on: https://code.wireshark.org/review/19074 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil/filesystem.c')
-rw-r--r--wsutil/filesystem.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 989070305e..ed8b8c18c2 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -925,20 +925,24 @@ get_datafile_dir(void)
/*
* 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
- * script, unless we think we're being run from the build directory,
- * in which case we use the "plugin" subdirectory of the datafile directory.
+ * On UN*X:
*
- * In both cases, we then use the subdirectory of that directory whose
- * name is the version number.
+ * if we appear to be run from the build directory, we use the
+ * "plugin" subdirectory of the datafile directory;
*
- * XXX - if we think we're being run from the build directory, perhaps we
- * should have the plugin code not look in the version subdirectory
- * of the plugin directory, but look in all of the subdirectories
- * of the plugin directory, so it can just fetch the plugins built
- * as part of the build process.
+ * otherwise, if the WIRESHARK_PLUGIN_DIR environment variable is
+ * set and we aren't running with special privileges, we use the
+ * value of that environment variable;
+ *
+ * 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;