diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-18 16:25:20 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-09-20 16:41:21 +0000 |
commit | 25ba538bc50ff3a824185cca532f4e0feb4f8ec4 (patch) | |
tree | c2df4d54627a48815479f168900f195156e20f37 /tshark.c | |
parent | f1501b82a7354de76a8d3833db2aa8fa8b9d62e0 (diff) |
plugins: Be more descriptive in "about wireshark"->"folders"
Display separate entries for binary plugins and lua scripts.
This is explained in the user guide, that the binary folder is
a subfolder of the lua folder, but it's probably a good idea to be more
explicit about it, at the risk of cluttering the interface a bit.
Move GeoIP information down because it seems the least important.
Add helper functions to provide plugin version subdir.
Change some #ifdefs while at it for legibility.
Change-Id: Ieb8665df029b3c14de19e2c973bd9b1cc4ec4621
Reviewed-on: https://code.wireshark.org/review/23609
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 36 |
1 files changed, 22 insertions, 14 deletions
@@ -611,12 +611,31 @@ about_folders(void) constpath = get_progfile_dir(); printf("%-21s\t%s\n", "Program:", constpath); -#if defined(HAVE_PLUGINS) || defined(HAVE_LUA) +#ifdef HAVE_PLUGINS /* pers plugins */ - printf("%-21s\t%s\n", "Personal Plugins:", get_plugins_pers_dir()); + printf("%-21s\t%s\n", "Personal Plugins:", get_plugins_pers_dir_with_version()); /* global plugins */ - printf("%-21s\t%s\n", "Global Plugins:", get_plugins_dir()); + printf("%-21s\t%s\n", "Global Plugins:", get_plugins_dir_with_version()); +#endif + +#ifdef HAVE_LUA + /* pers lua plugins */ + printf("%-21s\t%s\n", "Personal Lua Plugins:", get_plugins_pers_dir()); + + /* global lua plugins */ + printf("%-21s\t%s\n", "Global Lua Plugins:", get_plugins_dir()); +#endif + +#ifdef HAVE_EXTCAP + /* Extcap */ + constpath = get_extcap_dir(); + + resultArray = g_strsplit(constpath, G_SEARCHPATH_SEPARATOR_S, 10); + for(i = 0; resultArray[i]; i++) + printf("%-21s\t%s\n", "Extcap path:", g_strstrip(resultArray[i])); + + g_strfreev(resultArray); #endif #ifdef HAVE_GEOIP @@ -644,17 +663,6 @@ about_folders(void) g_free(path); #endif -#ifdef HAVE_EXTCAP - /* Extcap */ - constpath = get_extcap_dir(); - - resultArray = g_strsplit(constpath, G_SEARCHPATH_SEPARATOR_S, 10); - for(i = 0; resultArray[i]; i++) - printf("%-21s\t%s\n", "Extcap path:", g_strstrip(resultArray[i])); - - g_strfreev(resultArray); -#endif - } int |