diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-03-17 16:37:10 +0100 |
---|---|---|
committer | Sven Nierlein <sven@nierlein.de> | 2018-10-22 16:28:51 +0200 |
commit | 2678d7fabc7bbd4f3d2502ab1d70bf81e9895259 (patch) | |
tree | 062e3d4fc987bad4652e6ca5aa5af2caa6a15115 /plugins | |
parent | 50577bf9b14f31eb6737a0ed3d2e8984a09a4fca (diff) | |
download | monitoring-plugins-2678d7fabc7bbd4f3d2502ab1d70bf81e9895259.tar.gz |
added -R/-ereg/-eregi
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_curl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 96b5a5e9..537268cd 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
@@ -520,6 +520,8 @@ process_arguments (int argc, char **argv) | |||
520 | {"authorization", required_argument, 0, 'a'}, | 520 | {"authorization", required_argument, 0, 'a'}, |
521 | {"string", required_argument, 0, 's'}, | 521 | {"string", required_argument, 0, 's'}, |
522 | {"regex", required_argument, 0, 'r'}, | 522 | {"regex", required_argument, 0, 'r'}, |
523 | {"ereg", required_argument, 0, 'r'}, | ||
524 | {"eregi", required_argument, 0, 'R'}, | ||
523 | {"onredirect", required_argument, 0, 'f'}, | 525 | {"onredirect", required_argument, 0, 'f'}, |
524 | {"certificate", required_argument, 0, 'C'}, | 526 | {"certificate", required_argument, 0, 'C'}, |
525 | {"client-cert", required_argument, 0, 'J'}, | 527 | {"client-cert", required_argument, 0, 'J'}, |
@@ -537,7 +539,7 @@ process_arguments (int argc, char **argv) | |||
537 | return ERROR; | 539 | return ERROR; |
538 | 540 | ||
539 | while (1) { | 541 | while (1) { |
540 | c = getopt_long (argc, argv, "Vvht:c:w:A:k:H:j:I:a:p:s:r:u:f:C:J:K:S::NE", longopts, &option); | 542 | c = getopt_long (argc, argv, "Vvht:c:w:A:k:H:j:I:a:p:s:R:r:u:f:C:J:K:S::NE", longopts, &option); |
541 | if (c == -1 || c == EOF || c == 1) | 543 | if (c == -1 || c == EOF || c == 1) |
542 | break; | 544 | break; |
543 | 545 | ||
@@ -707,6 +709,8 @@ process_arguments (int argc, char **argv) | |||
707 | strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1); | 709 | strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1); |
708 | string_expect[MAX_INPUT_BUFFER - 1] = 0; | 710 | string_expect[MAX_INPUT_BUFFER - 1] = 0; |
709 | break; | 711 | break; |
712 | case 'R': /* regex */ | ||
713 | cflags |= REG_ICASE; | ||
710 | case 'r': /* regex */ | 714 | case 'r': /* regex */ |
711 | strncpy (regexp, optarg, MAX_RE_SIZE - 1); | 715 | strncpy (regexp, optarg, MAX_RE_SIZE - 1); |
712 | regexp[MAX_RE_SIZE - 1] = 0; | 716 | regexp[MAX_RE_SIZE - 1] = 0; |
@@ -841,6 +845,8 @@ print_help (void) | |||
841 | printf (" %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)")); | 845 | printf (" %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)")); |
842 | printf (" %s\n", "-r, --regex, --ereg=STRING"); | 846 | printf (" %s\n", "-r, --regex, --ereg=STRING"); |
843 | printf (" %s\n", _("Search page for regex STRING")); | 847 | printf (" %s\n", _("Search page for regex STRING")); |
848 | printf (" %s\n", "-R, --eregi=STRING"); | ||
849 | printf (" %s\n", _("Search page for case-insensitive regex STRING")); | ||
844 | printf (" %s\n", "-a, --authorization=AUTH_PAIR"); | 850 | printf (" %s\n", "-a, --authorization=AUTH_PAIR"); |
845 | printf (" %s\n", _("Username:password on sites with basic authentication")); | 851 | printf (" %s\n", _("Username:password on sites with basic authentication")); |
846 | printf (" %s\n", "-A, --useragent=STRING"); | 852 | printf (" %s\n", "-A, --useragent=STRING"); |
@@ -919,7 +925,7 @@ print_usage (void) | |||
919 | printf (" [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>]\n"); | 925 | printf (" [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>]\n"); |
920 | printf (" [-w <warn time>] [-c <critical time>] [-t <timeout>] [-E] [-a auth]\n"); | 926 | printf (" [-w <warn time>] [-c <critical time>] [-t <timeout>] [-E] [-a auth]\n"); |
921 | printf (" [-f <ok|warning|critcal|follow>]\n"); | 927 | printf (" [-f <ok|warning|critcal|follow>]\n"); |
922 | printf (" [-s string] [-r <regex>\n"); | 928 | printf (" [-s string] [-r <regex> | -R <case-insensitive regex>]\n"); |
923 | printf (" [-N]\n"); | 929 | printf (" [-N]\n"); |
924 | printf (" [-A string] [-k string] [-S <version>] [-C]\n"); | 930 | printf (" [-A string] [-k string] [-S <version>] [-C]\n"); |
925 | printf (" [-v verbose]\n", progname); | 931 | printf (" [-v verbose]\n", progname); |