summaryrefslogtreecommitdiff
path: root/src/options.c
diff options
context:
space:
mode:
authorWilliam Woodruff <william@tuffbizz.com>2016-01-07 23:45:15 -0500
committerWilliam Woodruff <william@tuffbizz.com>2016-01-07 23:57:09 -0500
commit3e8b853ec7cbe794108c250419ff01e56c656202 (patch)
tree68a7e119e4b576d7ee21f1d8e60d312eed682a04 /src/options.c
parentd4b383c74ece244f076d2b201b1dc6a3b234e671 (diff)
Changes:
* Added an --insecure option to disable host/peer verification in libcurl. This allows feh to load images on HTTPS hosts with self-signed certificates. For security, this is not the default. * Fixed an include in show_usage.
Diffstat (limited to 'src/options.c')
-rw-r--r--src/options.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/options.c b/src/options.c
index 804b485..75ca381 100644
--- a/src/options.c
+++ b/src/options.c
@@ -406,7 +406,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{"keep-zoom-vp" , 0, 0, 237},
{"scroll-step" , 1, 0, 238},
{"xinerama-index", 1, 0, 239},
-
+ {"insecure" , 0, 0, 240},
{0, 0, 0, 0}
};
int optch = 0, cmdx = 0;
@@ -759,6 +759,8 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
case 239:
opt.xinerama_index = atoi(optarg);
break;
+ case 240:
+ opt.insecure_ssl = 1;
default:
break;
}
@@ -863,7 +865,7 @@ static void show_usage(void)
{
fputs(
#ifdef INCLUDE_HELP
-#include "help.inc"
+#include "help.raw"
#else
"See 'man " PACKAGE "'\n"
#endif