From 5dcefc77777f47407801f8c51d3951fcb675da6e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 21 Dec 2022 18:37:05 -0800 Subject: wsutil: Make progfile_dir the main program file directory. If our program file directory has a trailing "/extcap" or "\extcap", trim it off. This should let extcaps determine the proper data file and plugin directories. Fixes #15592. --- wsutil/filesystem.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wsutil/filesystem.h') diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h index ae082e7fb7..90dd49140f 100644 --- a/wsutil/filesystem.h +++ b/wsutil/filesystem.h @@ -53,7 +53,11 @@ WS_DLL_PUBLIC const char *get_configuration_namespace(void); WS_DLL_PUBLIC bool is_packet_configuration_namespace(void); /* - * Get the directory in which the program resides. + * Get the directory in which the main (Wireshark, TShark, Logray, etc) + * program resides. + * Extcaps should use get_extcap_dir() to get their path. + * + * @return The main program file directory. */ WS_DLL_PUBLIC const char *get_progfile_dir(void); -- cgit v1.2.3