From c1d67786b0dbfa50ba3399c958bfa2a7c5650be5 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <opensides@users.sourceforge.net>
Date: Mon, 14 Nov 2005 01:18:57 +0000
Subject: localization cleaning ... last commit before sleeping

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1283 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 9ff572e..b86b264 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -21,7 +21,7 @@
 
 const char *progname = "check_http";
 const char *revision = "$Revision$";
-const char *copyright = "1999-2004";
+const char *copyright = "1999-2005";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
@@ -32,9 +32,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #define HTTP_EXPECT "HTTP/1."
 enum {
-	MAX_IPV4_HOSTLENGTH = 255,
-	HTTP_PORT = 80,
-	HTTPS_PORT = 443
+  MAX_IPV4_HOSTLENGTH = 255,
+  HTTP_PORT = 80,
+  HTTPS_PORT = 443
 };
 
 #ifdef HAVE_SSL
@@ -53,8 +53,8 @@ int maximum_age = -1;
 
 #ifdef HAVE_REGEX_H
 enum {
-	REGS = 2,
-	MAX_RE_SIZE = 256
+  REGS = 2,
+  MAX_RE_SIZE = 256
 };
 #include <regex.h>
 regex_t preg;
@@ -117,36 +117,36 @@ void print_usage (void);
 int
 main (int argc, char **argv)
 {
-	int result = STATE_UNKNOWN;
-
-	/* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
-	server_url = strdup(HTTP_URL);
-	server_url_length = strlen(server_url);
-	asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
-	          clean_revstring (revision), VERSION);
-
-	if (process_arguments (argc, argv) == ERROR)
-		usage4 (_("Could not parse arguments"));
-
-	if (strstr (timestamp, ":")) {
-		if (strstr (server_url, "?"))
-			asprintf (&server_url, "%s&%s", server_url, timestamp);
-		else
-			asprintf (&server_url, "%s?%s", server_url, timestamp);
-	}
-
-	if (display_html == TRUE)
-		printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">", 
-			use_ssl ? "https" : "http", host_name,
-			server_port, server_url);
-
-	/* initialize alarm signal handling, set socket timeout, start timer */
-	(void) signal (SIGALRM, socket_timeout_alarm_handler);
-	(void) alarm (socket_timeout);
-	gettimeofday (&tv, NULL);
-
-	result = check_http ();
-	return result;
+  int result = STATE_UNKNOWN;
+
+  /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
+  server_url = strdup(HTTP_URL);
+  server_url_length = strlen(server_url);
+  asprintf (&user_agent, "User-Agent: check_http/%s (nagios-plugins %s)",
+            clean_revstring (revision), VERSION);
+
+  if (process_arguments (argc, argv) == ERROR)
+    usage4 (_("Could not parse arguments"));
+
+  if (strstr (timestamp, ":")) {
+    if (strstr (server_url, "?"))
+      asprintf (&server_url, "%s&%s", server_url, timestamp);
+    else
+      asprintf (&server_url, "%s?%s", server_url, timestamp);
+  }
+
+  if (display_html == TRUE)
+    printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">", 
+      use_ssl ? "https" : "http", host_name,
+      server_port, server_url);
+
+  /* initialize alarm signal handling, set socket timeout, start timer */
+  (void) signal (SIGALRM, socket_timeout_alarm_handler);
+  (void) alarm (socket_timeout);
+  gettimeofday (&tv, NULL);
+
+  result = check_http ();
+  return result;
 }
 
 
@@ -155,242 +155,242 @@ main (int argc, char **argv)
 int
 process_arguments (int argc, char **argv)
 {
-	int c = 1;
-
-	int option = 0;
-	static struct option longopts[] = {
-		STD_LONG_OPTS,
-		{"file",required_argument,0,'F'},
-		{"link", no_argument, 0, 'L'},
-		{"nohtml", no_argument, 0, 'n'},
-		{"ssl", no_argument, 0, 'S'},
-		{"verbose", no_argument, 0, 'v'},
-		{"post", required_argument, 0, 'P'},
-		{"IP-address", required_argument, 0, 'I'},
-		{"url", required_argument, 0, 'u'},
-		{"string", required_argument, 0, 's'},
-		{"regex", required_argument, 0, 'r'},
-		{"ereg", required_argument, 0, 'r'},
-		{"eregi", required_argument, 0, 'R'},
- 		{"linespan", no_argument, 0, 'l'},
-		{"onredirect", required_argument, 0, 'f'},
-		{"certificate", required_argument, 0, 'C'},
-		{"useragent", required_argument, 0, 'A'},
-		{"header", required_argument, 0, 'k'},
-		{"no-body", no_argument, 0, 'N'},
-		{"max-age", required_argument, 0, 'M'},
-		{"content-type", required_argument, 0, 'T'},
-		{"pagesize", required_argument, 0, 'm'},
-		{"use-ipv4", no_argument, 0, '4'},
-		{"use-ipv6", no_argument, 0, '6'},
-		{0, 0, 0, 0}
-	};
-
-	if (argc < 2)
-		return ERROR;
-
-	for (c = 1; c < argc; c++) {
-		if (strcmp ("-to", argv[c]) == 0)
-			strcpy (argv[c], "-t");
-		if (strcmp ("-hn", argv[c]) == 0)
-			strcpy (argv[c], "-H");
-		if (strcmp ("-wt", argv[c]) == 0)
-			strcpy (argv[c], "-w");
-		if (strcmp ("-ct", argv[c]) == 0)
-			strcpy (argv[c], "-c");
-		if (strcmp ("-nohtml", argv[c]) == 0)
-			strcpy (argv[c], "-n");
-	}
-
-	while (1) {
-		c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
-		if (c == -1 || c == EOF)
-			break;
-
-		switch (c) {
-		case '?': /* usage */
-			usage2 (_("Unknown argument"), optarg);
-			break;
-		case 'h': /* help */
-			print_help ();
-			exit (STATE_OK);
-			break;
-		case 'V': /* version */
-			print_revision (progname, revision);
-			exit (STATE_OK);
-			break;
-		case 't': /* timeout period */
-			if (!is_intnonneg (optarg))
-				usage2 (_("Timeout interval must be a positive integer"), optarg);
-			else
-				socket_timeout = atoi (optarg);
-			break;
-		case 'c': /* critical time threshold */
-			if (!is_nonnegative (optarg))
-				usage2 (_("Critical threshold must be integer"), optarg);
-			else {
-				critical_time = strtod (optarg, NULL);
-				check_critical_time = TRUE;
-			}
-			break;
-		case 'w': /* warning time threshold */
-			if (!is_nonnegative (optarg))
-				usage2 (_("Warning threshold must be integer"), optarg);
-			else {
-				warning_time = strtod (optarg, NULL);
-				check_warning_time = TRUE;
-			}
-			break;
-		case 'A': /* User Agent String */
-			asprintf (&user_agent, "User-Agent: %s", optarg);
-			break;
-		case 'k': /* Additional headers */
-			asprintf (&http_opt_headers, "%s", optarg);
-			break;
-		case 'L': /* show html link */
-			display_html = TRUE;
-			break;
-		case 'n': /* do not show html link */
-			display_html = FALSE;
-			break;
-		case 'S': /* use SSL */
+  int c = 1;
+
+  int option = 0;
+  static struct option longopts[] = {
+    STD_LONG_OPTS,
+    {"file",required_argument,0,'F'},
+    {"link", no_argument, 0, 'L'},
+    {"nohtml", no_argument, 0, 'n'},
+    {"ssl", no_argument, 0, 'S'},
+    {"verbose", no_argument, 0, 'v'},
+    {"post", required_argument, 0, 'P'},
+    {"IP-address", required_argument, 0, 'I'},
+    {"url", required_argument, 0, 'u'},
+    {"string", required_argument, 0, 's'},
+    {"regex", required_argument, 0, 'r'},
+    {"ereg", required_argument, 0, 'r'},
+    {"eregi", required_argument, 0, 'R'},
+    {"linespan", no_argument, 0, 'l'},
+    {"onredirect", required_argument, 0, 'f'},
+    {"certificate", required_argument, 0, 'C'},
+    {"useragent", required_argument, 0, 'A'},
+    {"header", required_argument, 0, 'k'},
+    {"no-body", no_argument, 0, 'N'},
+    {"max-age", required_argument, 0, 'M'},
+    {"content-type", required_argument, 0, 'T'},
+    {"pagesize", required_argument, 0, 'm'},
+    {"use-ipv4", no_argument, 0, '4'},
+    {"use-ipv6", no_argument, 0, '6'},
+    {0, 0, 0, 0}
+  };
+
+  if (argc < 2)
+    return ERROR;
+
+  for (c = 1; c < argc; c++) {
+    if (strcmp ("-to", argv[c]) == 0)
+      strcpy (argv[c], "-t");
+    if (strcmp ("-hn", argv[c]) == 0)
+      strcpy (argv[c], "-H");
+    if (strcmp ("-wt", argv[c]) == 0)
+      strcpy (argv[c], "-w");
+    if (strcmp ("-ct", argv[c]) == 0)
+      strcpy (argv[c], "-c");
+    if (strcmp ("-nohtml", argv[c]) == 0)
+      strcpy (argv[c], "-n");
+  }
+
+  while (1) {
+    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+    if (c == -1 || c == EOF)
+      break;
+
+    switch (c) {
+    case '?': /* usage */
+      usage2 (_("Unknown argument"), optarg);
+      break;
+    case 'h': /* help */
+      print_help ();
+      exit (STATE_OK);
+      break;
+    case 'V': /* version */
+      print_revision (progname, revision);
+      exit (STATE_OK);
+      break;
+    case 't': /* timeout period */
+      if (!is_intnonneg (optarg))
+        usage2 (_("Timeout interval must be a positive integer"), optarg);
+      else
+        socket_timeout = atoi (optarg);
+      break;
+    case 'c': /* critical time threshold */
+      if (!is_nonnegative (optarg))
+        usage2 (_("Critical threshold must be integer"), optarg);
+      else {
+        critical_time = strtod (optarg, NULL);
+        check_critical_time = TRUE;
+      }
+      break;
+    case 'w': /* warning time threshold */
+      if (!is_nonnegative (optarg))
+        usage2 (_("Warning threshold must be integer"), optarg);
+      else {
+        warning_time = strtod (optarg, NULL);
+        check_warning_time = TRUE;
+      }
+      break;
+    case 'A': /* User Agent String */
+      asprintf (&user_agent, "User-Agent: %s", optarg);
+      break;
+    case 'k': /* Additional headers */
+      asprintf (&http_opt_headers, "%s", optarg);
+      break;
+    case 'L': /* show html link */
+      display_html = TRUE;
+      break;
+    case 'n': /* do not show html link */
+      display_html = FALSE;
+      break;
+    case 'S': /* use SSL */
 #ifndef HAVE_SSL
-			usage4 (_("Invalid option - SSL is not available"));
+      usage4 (_("Invalid option - SSL is not available"));
 #endif
-			use_ssl = TRUE;
-			if (specify_port == FALSE)
-				server_port = HTTPS_PORT;
-			break;
-		case 'C': /* Check SSL cert validity */
+      use_ssl = TRUE;
+      if (specify_port == FALSE)
+        server_port = HTTPS_PORT;
+      break;
+    case 'C': /* Check SSL cert validity */
 #ifdef USE_OPENSSL
-			if (!is_intnonneg (optarg))
-				usage2 (_("Invalid certificate expiration period"), optarg);
-			else {
-				days_till_exp = atoi (optarg);
-				check_cert = TRUE;
-			}
+      if (!is_intnonneg (optarg))
+        usage2 (_("Invalid certificate expiration period"), optarg);
+      else {
+        days_till_exp = atoi (optarg);
+        check_cert = TRUE;
+      }
 #else
-			usage4 (_("Invalid option - SSL is not available"));
+      usage4 (_("Invalid option - SSL is not available"));
 #endif
-			break;
-		case 'f': /* onredirect */
-			if (!strcmp (optarg, "follow"))
-				onredirect = STATE_DEPENDENT;
-			if (!strcmp (optarg, "unknown"))
-				onredirect = STATE_UNKNOWN;
-			if (!strcmp (optarg, "ok"))
-				onredirect = STATE_OK;
-			if (!strcmp (optarg, "warning"))
-				onredirect = STATE_WARNING;
-			if (!strcmp (optarg, "critical"))
-				onredirect = STATE_CRITICAL;
-			if (verbose)
-				printf(_("option f:%d \n"), onredirect);  
-			break;
-		/* Note: H, I, and u must be malloc'd or will fail on redirects */
-		case 'H': /* Host Name (virtual host) */
- 			host_name = strdup (optarg);
-			if (strstr (optarg, ":"))
-				sscanf (optarg, "%*[^:]:%d", &server_port);
-			break;
-		case 'I': /* Server IP-address */
- 			server_address = strdup (optarg);
-			break;
-		case 'u': /* URL path */
-			server_url = strdup (optarg);
-			server_url_length = strlen (server_url);
-			break;
-		case 'p': /* Server port */
-			if (!is_intnonneg (optarg))
-				usage2 (_("Invalid port number"), optarg);
-			else {
-				server_port = atoi (optarg);
-				specify_port = TRUE;
-			}
-			break;
-		case 'a': /* authorization info */
-			strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
-			user_auth[MAX_INPUT_BUFFER - 1] = 0;
-			break;
-		case 'P': /* HTTP POST data in URL encoded format */
-			if (http_method || http_post_data) break;
-			http_method = strdup("POST");
-			http_post_data = strdup (optarg);
-			break;
-		case 's': /* string or substring */
-			strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
-			string_expect[MAX_INPUT_BUFFER - 1] = 0;
-			break;
-		case 'e': /* string or substring */
-			strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
-			server_expect[MAX_INPUT_BUFFER - 1] = 0;
-			server_expect_yn = 1;
-			break;
-		case 'T': /* Content-type */
-			asprintf (&http_content_type, "%s", optarg);
-			break;
+      break;
+    case 'f': /* onredirect */
+      if (!strcmp (optarg, "follow"))
+        onredirect = STATE_DEPENDENT;
+      if (!strcmp (optarg, "unknown"))
+        onredirect = STATE_UNKNOWN;
+      if (!strcmp (optarg, "ok"))
+        onredirect = STATE_OK;
+      if (!strcmp (optarg, "warning"))
+        onredirect = STATE_WARNING;
+      if (!strcmp (optarg, "critical"))
+        onredirect = STATE_CRITICAL;
+      if (verbose)
+        printf(_("option f:%d \n"), onredirect);  
+      break;
+    /* Note: H, I, and u must be malloc'd or will fail on redirects */
+    case 'H': /* Host Name (virtual host) */
+      host_name = strdup (optarg);
+      if (strstr (optarg, ":"))
+        sscanf (optarg, "%*[^:]:%d", &server_port);
+      break;
+    case 'I': /* Server IP-address */
+      server_address = strdup (optarg);
+      break;
+    case 'u': /* URL path */
+      server_url = strdup (optarg);
+      server_url_length = strlen (server_url);
+      break;
+    case 'p': /* Server port */
+      if (!is_intnonneg (optarg))
+        usage2 (_("Invalid port number"), optarg);
+      else {
+        server_port = atoi (optarg);
+        specify_port = TRUE;
+      }
+      break;
+    case 'a': /* authorization info */
+      strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
+      user_auth[MAX_INPUT_BUFFER - 1] = 0;
+      break;
+    case 'P': /* HTTP POST data in URL encoded format */
+      if (http_method || http_post_data) break;
+      http_method = strdup("POST");
+      http_post_data = strdup (optarg);
+      break;
+    case 's': /* string or substring */
+      strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
+      string_expect[MAX_INPUT_BUFFER - 1] = 0;
+      break;
+    case 'e': /* string or substring */
+      strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
+      server_expect[MAX_INPUT_BUFFER - 1] = 0;
+      server_expect_yn = 1;
+      break;
+    case 'T': /* Content-type */
+      asprintf (&http_content_type, "%s", optarg);
+      break;
 #ifndef HAVE_REGEX_H
- 		case 'l': /* linespan */
- 		case 'r': /* linespan */
- 		case 'R': /* linespan */
-			usage4 (_("Call for regex which was not a compiled option"));
-			break;
+    case 'l': /* linespan */
+    case 'r': /* linespan */
+    case 'R': /* linespan */
+      usage4 (_("Call for regex which was not a compiled option"));
+      break;
 #else
- 		case 'l': /* linespan */
- 			cflags &= ~REG_NEWLINE;
- 			break;
-		case 'R': /* regex */
-			cflags |= REG_ICASE;
-		case 'r': /* regex */
-			strncpy (regexp, optarg, MAX_RE_SIZE - 1);
-			regexp[MAX_RE_SIZE - 1] = 0;
-			errcode = regcomp (&preg, regexp, cflags);
-			if (errcode != 0) {
-				(void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-				printf (_("Could Not Compile Regular Expression: %s"), errbuf);
-				return ERROR;
-			}
-			break;
+    case 'l': /* linespan */
+      cflags &= ~REG_NEWLINE;
+      break;
+    case 'R': /* regex */
+      cflags |= REG_ICASE;
+    case 'r': /* regex */
+      strncpy (regexp, optarg, MAX_RE_SIZE - 1);
+      regexp[MAX_RE_SIZE - 1] = 0;
+      errcode = regcomp (&preg, regexp, cflags);
+      if (errcode != 0) {
+        (void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+        printf (_("Could Not Compile Regular Expression: %s"), errbuf);
+        return ERROR;
+      }
+      break;
 #endif
-		case '4':
-			address_family = AF_INET;
-			break;
-		case '6':
+    case '4':
+      address_family = AF_INET;
+      break;
+    case '6':
 #ifdef USE_IPV6
-			address_family = AF_INET6;
+      address_family = AF_INET6;
 #else
-			usage4 (_("IPv6 support not available"));
+      usage4 (_("IPv6 support not available"));
 #endif
-			break;
-		case 'v': /* verbose */
-			verbose = TRUE;
-			break;
-		case 'm': /* min_page_length */
-			{
-			char *tmp;
-			if (strchr(optarg, ':') != (char *)NULL) {
-				/* range, so get two values, min:max */
-				tmp = strtok(optarg, ":");
-				if (tmp == NULL) {
-					printf("Bad format: try \"-m min:max\"\n");
-					exit (STATE_WARNING);
-				} else
-					min_page_len = atoi(tmp);
-
-				tmp = strtok(NULL, ":");
-				if (tmp == NULL) {
-					printf("Bad format: try \"-m min:max\"\n");
-					exit (STATE_WARNING);
-				} else
-					max_page_len = atoi(tmp);
-			} else 
-				min_page_len = atoi (optarg);
-			break;
-			}
-		case 'N': /* no-body */
-			no_body = TRUE;
-			break;
-		case 'M': /* max-age */
+      break;
+    case 'v': /* verbose */
+      verbose = TRUE;
+      break;
+    case 'm': /* min_page_length */
+      {
+      char *tmp;
+      if (strchr(optarg, ':') != (char *)NULL) {
+        /* range, so get two values, min:max */
+        tmp = strtok(optarg, ":");
+        if (tmp == NULL) {
+          printf("Bad format: try \"-m min:max\"\n");
+          exit (STATE_WARNING);
+        } else
+          min_page_len = atoi(tmp);
+
+        tmp = strtok(NULL, ":");
+        if (tmp == NULL) {
+          printf("Bad format: try \"-m min:max\"\n");
+          exit (STATE_WARNING);
+        } else
+          max_page_len = atoi(tmp);
+      } else 
+        min_page_len = atoi (optarg);
+      break;
+      }
+    case 'N': /* no-body */
+      no_body = TRUE;
+      break;
+    case 'M': /* max-age */
                   {
                     int L = strlen(optarg);
                     if (L && optarg[L-1] == 'm')
@@ -408,31 +408,31 @@ process_arguments (int argc, char **argv)
                     }
                   }
                   break;
-		}
-	}
+    }
+  }
 
-	c = optind;
+  c = optind;
 
-	if (server_address == NULL && c < argc)
-		server_address = strdup (argv[c++]);
+  if (server_address == NULL && c < argc)
+    server_address = strdup (argv[c++]);
 
-	if (host_name == NULL && c < argc)
- 		host_name = strdup (argv[c++]);
+  if (host_name == NULL && c < argc)
+    host_name = strdup (argv[c++]);
 
-	if (server_address == NULL) {
-		if (host_name == NULL)
-			usage4 (_("You must specify a server address or host name"));
-		else
-			server_address = strdup (host_name);
-	}
+  if (server_address == NULL) {
+    if (host_name == NULL)
+      usage4 (_("You must specify a server address or host name"));
+    else
+      server_address = strdup (host_name);
+  }
 
-	if (check_critical_time && critical_time>(double)socket_timeout)
-		socket_timeout = (int)critical_time + 1;
+  if (check_critical_time && critical_time>(double)socket_timeout)
+    socket_timeout = (int)critical_time + 1;
 
-	if (http_method == NULL)
-		http_method = strdup ("GET");
+  if (http_method == NULL)
+    http_method = strdup ("GET");
 
-	return TRUE;
+  return TRUE;
 }
 
 
@@ -442,40 +442,40 @@ static char *
 base64 (const char *bin, size_t len)
 {
 
-	char *buf = (char *) malloc ((len + 2) / 3 * 4 + 1);
-	size_t i = 0, j = 0;
-
-	char BASE64_END = '=';
-	char base64_table[64];
-	strncpy (base64_table, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 64);
-
-	while (j < len - 2) {
-		buf[i++] = base64_table[bin[j] >> 2];
-		buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
-		buf[i++] = base64_table[((bin[j + 1] & 15) << 2) | (bin[j + 2] >> 6)];
-		buf[i++] = base64_table[bin[j + 2] & 63];
-		j += 3;
-	}
-
-	switch (len - j) {
-	case 1:
-		buf[i++] = base64_table[bin[j] >> 2];
-		buf[i++] = base64_table[(bin[j] & 3) << 4];
-		buf[i++] = BASE64_END;
-		buf[i++] = BASE64_END;
-		break;
-	case 2:
-		buf[i++] = base64_table[bin[j] >> 2];
-		buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
-		buf[i++] = base64_table[(bin[j + 1] & 15) << 2];
-		buf[i++] = BASE64_END;
-		break;
-	case 0:
-		break;
-	}
-
-	buf[i] = '\0';
-	return buf;
+  char *buf = (char *) malloc ((len + 2) / 3 * 4 + 1);
+  size_t i = 0, j = 0;
+
+  char BASE64_END = '=';
+  char base64_table[64];
+  strncpy (base64_table, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 64);
+
+  while (j < len - 2) {
+    buf[i++] = base64_table[bin[j] >> 2];
+    buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
+    buf[i++] = base64_table[((bin[j + 1] & 15) << 2) | (bin[j + 2] >> 6)];
+    buf[i++] = base64_table[bin[j + 2] & 63];
+    j += 3;
+  }
+
+  switch (len - j) {
+  case 1:
+    buf[i++] = base64_table[bin[j] >> 2];
+    buf[i++] = base64_table[(bin[j] & 3) << 4];
+    buf[i++] = BASE64_END;
+    buf[i++] = BASE64_END;
+    break;
+  case 2:
+    buf[i++] = base64_table[bin[j] >> 2];
+    buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
+    buf[i++] = base64_table[(bin[j + 1] & 15) << 2];
+    buf[i++] = BASE64_END;
+    break;
+  case 0:
+    break;
+  }
+
+  buf[i] = '\0';
+  return buf;
 }
 
 
@@ -484,109 +484,109 @@ base64 (const char *bin, size_t len)
 static int
 document_headers_done (char *full_page)
 {
-	const char *body;
+  const char *body;
 
-	for (body = full_page; *body; body++) {
-		if (!strncmp (body, "\n\n", 2) || !strncmp (body, "\n\r\n", 3))
-			break;
-	}
+  for (body = full_page; *body; body++) {
+    if (!strncmp (body, "\n\n", 2) || !strncmp (body, "\n\r\n", 3))
+      break;
+  }
 
-	if (!*body)
-		return 0;  /* haven't read end of headers yet */
+  if (!*body)
+    return 0;  /* haven't read end of headers yet */
 
-	full_page[body - full_page] = 0;
-	return 1;
+  full_page[body - full_page] = 0;
+  return 1;
 }
 
 static time_t
 parse_time_string (const char *string)
 {
-	struct tm tm;
-	time_t t;
-	memset (&tm, 0, sizeof(tm));
-
-	/* Like this: Tue, 25 Dec 2001 02:59:03 GMT */
-
-	if (isupper (string[0])  &&  /* Tue */
-		islower (string[1])  &&
-		islower (string[2])  &&
-		',' ==   string[3]   &&
-		' ' ==   string[4]   &&
-		(isdigit(string[5]) || string[5] == ' ') &&   /* 25 */
-		isdigit (string[6])  &&
-		' ' ==   string[7]   &&
-		isupper (string[8])  &&  /* Dec */
-		islower (string[9])  &&
-		islower (string[10]) &&
-		' ' ==   string[11]  &&
-		isdigit (string[12]) &&  /* 2001 */
-		isdigit (string[13]) &&
-		isdigit (string[14]) &&
-		isdigit (string[15]) &&
-		' ' ==   string[16]  &&
-		isdigit (string[17]) &&  /* 02: */
-		isdigit (string[18]) &&
-		':' ==   string[19]  &&
-		isdigit (string[20]) &&  /* 59: */
-		isdigit (string[21]) &&
-		':' ==   string[22]  &&
-		isdigit (string[23]) &&  /* 03 */
-		isdigit (string[24]) &&
-		' ' ==   string[25]  &&
-		'G' ==   string[26]  &&  /* GMT */
-		'M' ==   string[27]  &&  /* GMT */
-		'T' ==   string[28]) {
-
-		tm.tm_sec  = 10 * (string[23]-'0') + (string[24]-'0');
-		tm.tm_min  = 10 * (string[20]-'0') + (string[21]-'0');
-		tm.tm_hour = 10 * (string[17]-'0') + (string[18]-'0');
-		tm.tm_mday = 10 * (string[5] == ' ' ? 0 : string[5]-'0') + (string[6]-'0');
-		tm.tm_mon = (!strncmp (string+8, "Jan", 3) ? 0 :
-			!strncmp (string+8, "Feb", 3) ? 1 :
-			!strncmp (string+8, "Mar", 3) ? 2 :
-			!strncmp (string+8, "Apr", 3) ? 3 :
-			!strncmp (string+8, "May", 3) ? 4 :
-			!strncmp (string+8, "Jun", 3) ? 5 :
-			!strncmp (string+8, "Jul", 3) ? 6 :
-			!strncmp (string+8, "Aug", 3) ? 7 :
-			!strncmp (string+8, "Sep", 3) ? 8 :
-			!strncmp (string+8, "Oct", 3) ? 9 :
-			!strncmp (string+8, "Nov", 3) ? 10 :
-			!strncmp (string+8, "Dec", 3) ? 11 :
-			-1);
-		tm.tm_year = ((1000 * (string[12]-'0') +
-			100 * (string[13]-'0') +
-			10 * (string[14]-'0') +
-			(string[15]-'0'))
-			- 1900);
-
-		tm.tm_isdst = 0;  /* GMT is never in DST, right? */
-
-		if (tm.tm_mon < 0 || tm.tm_mday < 1 || tm.tm_mday > 31)
-			return 0;
-
-		/* 
-		This is actually wrong: we need to subtract the local timezone
-		offset from GMT from this value.  But, that's ok in this usage,
-		because we only comparing these two GMT dates against each other,
-		so it doesn't matter what time zone we parse them in.
-		*/
-
-		t = mktime (&tm);
-		if (t == (time_t) -1) t = 0;
-
-		if (verbose) {
-			const char *s = string;
-			while (*s && *s != '\r' && *s != '\n')
-			fputc (*s++, stdout);
-			printf (" ==> %lu\n", (unsigned long) t);
-		}
-
-		return t;
-
-	} else {
-		return 0;
-	}
+  struct tm tm;
+  time_t t;
+  memset (&tm, 0, sizeof(tm));
+
+  /* Like this: Tue, 25 Dec 2001 02:59:03 GMT */
+
+  if (isupper (string[0])  &&  /* Tue */
+    islower (string[1])  &&
+    islower (string[2])  &&
+    ',' ==   string[3]   &&
+    ' ' ==   string[4]   &&
+    (isdigit(string[5]) || string[5] == ' ') &&   /* 25 */
+    isdigit (string[6])  &&
+    ' ' ==   string[7]   &&
+    isupper (string[8])  &&  /* Dec */
+    islower (string[9])  &&
+    islower (string[10]) &&
+    ' ' ==   string[11]  &&
+    isdigit (string[12]) &&  /* 2001 */
+    isdigit (string[13]) &&
+    isdigit (string[14]) &&
+    isdigit (string[15]) &&
+    ' ' ==   string[16]  &&
+    isdigit (string[17]) &&  /* 02: */
+    isdigit (string[18]) &&
+    ':' ==   string[19]  &&
+    isdigit (string[20]) &&  /* 59: */
+    isdigit (string[21]) &&
+    ':' ==   string[22]  &&
+    isdigit (string[23]) &&  /* 03 */
+    isdigit (string[24]) &&
+    ' ' ==   string[25]  &&
+    'G' ==   string[26]  &&  /* GMT */
+    'M' ==   string[27]  &&  /* GMT */
+    'T' ==   string[28]) {
+
+    tm.tm_sec  = 10 * (string[23]-'0') + (string[24]-'0');
+    tm.tm_min  = 10 * (string[20]-'0') + (string[21]-'0');
+    tm.tm_hour = 10 * (string[17]-'0') + (string[18]-'0');
+    tm.tm_mday = 10 * (string[5] == ' ' ? 0 : string[5]-'0') + (string[6]-'0');
+    tm.tm_mon = (!strncmp (string+8, "Jan", 3) ? 0 :
+      !strncmp (string+8, "Feb", 3) ? 1 :
+      !strncmp (string+8, "Mar", 3) ? 2 :
+      !strncmp (string+8, "Apr", 3) ? 3 :
+      !strncmp (string+8, "May", 3) ? 4 :
+      !strncmp (string+8, "Jun", 3) ? 5 :
+      !strncmp (string+8, "Jul", 3) ? 6 :
+      !strncmp (string+8, "Aug", 3) ? 7 :
+      !strncmp (string+8, "Sep", 3) ? 8 :
+      !strncmp (string+8, "Oct", 3) ? 9 :
+      !strncmp (string+8, "Nov", 3) ? 10 :
+      !strncmp (string+8, "Dec", 3) ? 11 :
+      -1);
+    tm.tm_year = ((1000 * (string[12]-'0') +
+      100 * (string[13]-'0') +
+      10 * (string[14]-'0') +
+      (string[15]-'0'))
+      - 1900);
+
+    tm.tm_isdst = 0;  /* GMT is never in DST, right? */
+
+    if (tm.tm_mon < 0 || tm.tm_mday < 1 || tm.tm_mday > 31)
+      return 0;
+
+    /* 
+    This is actually wrong: we need to subtract the local timezone
+    offset from GMT from this value.  But, that's ok in this usage,
+    because we only comparing these two GMT dates against each other,
+    so it doesn't matter what time zone we parse them in.
+    */
+
+    t = mktime (&tm);
+    if (t == (time_t) -1) t = 0;
+
+    if (verbose) {
+      const char *s = string;
+      while (*s && *s != '\r' && *s != '\n')
+      fputc (*s++, stdout);
+      printf (" ==> %lu\n", (unsigned long) t);
+    }
+
+    return t;
+
+  } else {
+    return 0;
+  }
 }
 
 
@@ -594,82 +594,82 @@ parse_time_string (const char *string)
 static void
 check_document_dates (const char *headers)
 {
-	const char *s;
-	char *server_date = 0;
-	char *document_date = 0;
-
-	s = headers;
-	while (*s) {
-		const char *field = s;
-		const char *value = 0;
-
-		/* Find the end of the header field */
-		while (*s && !isspace(*s) && *s != ':')
-			s++;
-
-		/* Remember the header value, if any. */
-		if (*s == ':')
-			value = ++s;
-
-		/* Skip to the end of the header, including continuation lines. */
-		while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
-			s++;
-		s++;
-
-		/* Process this header. */
-		if (value && value > field+2) {
-			char *ff = (char *) malloc (value-field);
-			char *ss = ff;
-			while (field < value-1)
-				*ss++ = tolower(*field++);
-			*ss++ = 0;
-
-			if (!strcmp (ff, "date") || !strcmp (ff, "last-modified")) {
-				const char *e;
-				while (*value && isspace (*value))
-					value++;
-				for (e = value; *e && *e != '\r' && *e != '\n'; e++)
-					;
-				ss = (char *) malloc (e - value + 1);
-				strncpy (ss, value, e - value);
-				ss[e - value] = 0;
-				if (!strcmp (ff, "date")) {
-					if (server_date) free (server_date);
-					server_date = ss;
-				} else {
-					if (document_date) free (document_date);
-					document_date = ss;
-				}
-			}
-			free (ff);
-		}
-	}
-
-	/* Done parsing the body.  Now check the dates we (hopefully) parsed.  */
-	if (!server_date || !*server_date) {
-		die (STATE_UNKNOWN, _("Server date unknown\n"));
-	} else if (!document_date || !*document_date) {
-		die (STATE_CRITICAL, _("Document modification date unknown\n"));
-	} else {
-		time_t srv_data = parse_time_string (server_date);
-		time_t doc_data = parse_time_string (document_date);
-
-		if (srv_data <= 0) {
-			die (STATE_CRITICAL, _("CRITICAL - Server date \"%100s\" unparsable"), server_date);
-		} else if (doc_data <= 0) {
-			die (STATE_CRITICAL, _("CRITICAL - Document date \"%100s\" unparsable"), document_date);
-		} else if (doc_data > srv_data + 30) {
-			die (STATE_CRITICAL, _("CRITICAL - Document is %d seconds in the future\n"), (int)doc_data - (int)srv_data);
-		} else if (doc_data < srv_data - maximum_age) {
-		int n = (srv_data - doc_data);
-		if (n > (60 * 60 * 24 * 2))
-			die (STATE_CRITICAL,
-			  _("CRITICAL - Last modified %.1f days ago\n"),
-			  ((float) n) / (60 * 60 * 24));
-	else
-		die (STATE_CRITICAL,
-		    _("CRITICAL - Last modified %d:%02d:%02d ago\n"),
-		    n / (60 * 60), (n / 60) % 60, n % 60);
+  const char *s;
+  char *server_date = 0;
+  char *document_date = 0;
+
+  s = headers;
+  while (*s) {
+    const char *field = s;
+    const char *value = 0;
+
+    /* Find the end of the header field */
+    while (*s && !isspace(*s) && *s != ':')
+      s++;
+
+    /* Remember the header value, if any. */
+    if (*s == ':')
+      value = ++s;
+
+    /* Skip to the end of the header, including continuation lines. */
+    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
+      s++;
+    s++;
+
+    /* Process this header. */
+    if (value && value > field+2) {
+      char *ff = (char *) malloc (value-field);
+      char *ss = ff;
+      while (field < value-1)
+        *ss++ = tolower(*field++);
+      *ss++ = 0;
+
+      if (!strcmp (ff, "date") || !strcmp (ff, "last-modified")) {
+        const char *e;
+        while (*value && isspace (*value))
+          value++;
+        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
+          ;
+        ss = (char *) malloc (e - value + 1);
+        strncpy (ss, value, e - value);
+        ss[e - value] = 0;
+        if (!strcmp (ff, "date")) {
+          if (server_date) free (server_date);
+          server_date = ss;
+        } else {
+          if (document_date) free (document_date);
+          document_date = ss;
+        }
+      }
+      free (ff);
+    }
+  }
+
+  /* Done parsing the body.  Now check the dates we (hopefully) parsed.  */
+  if (!server_date || !*server_date) {
+    die (STATE_UNKNOWN, _("Server date unknown\n"));
+  } else if (!document_date || !*document_date) {
+    die (STATE_CRITICAL, _("Document modification date unknown\n"));
+  } else {
+    time_t srv_data = parse_time_string (server_date);
+    time_t doc_data = parse_time_string (document_date);
+
+    if (srv_data <= 0) {
+      die (STATE_CRITICAL, _("CRITICAL - Server date \"%100s\" unparsable"), server_date);
+    } else if (doc_data <= 0) {
+      die (STATE_CRITICAL, _("CRITICAL - Document date \"%100s\" unparsable"), document_date);
+    } else if (doc_data > srv_data + 30) {
+      die (STATE_CRITICAL, _("CRITICAL - Document is %d seconds in the future\n"), (int)doc_data - (int)srv_data);
+    } else if (doc_data < srv_data - maximum_age) {
+    int n = (srv_data - doc_data);
+    if (n > (60 * 60 * 24 * 2))
+      die (STATE_CRITICAL,
+        _("CRITICAL - Last modified %.1f days ago\n"),
+        ((float) n) / (60 * 60 * 24));
+  else
+    die (STATE_CRITICAL,
+        _("CRITICAL - Last modified %d:%02d:%02d ago\n"),
+        n / (60 * 60), (n / 60) % 60, n % 60);
     }
 
     free (server_date);
@@ -680,358 +680,358 @@ check_document_dates (const char *headers)
 int
 get_content_length (const char *headers)
 {
-	const char *s;
-	int content_length = 0;
-
-	s = headers;
-	while (*s) {
-		const char *field = s;
-		const char *value = 0;
-
-		/* Find the end of the header field */
-		while (*s && !isspace(*s) && *s != ':')
-			s++;
-
-		/* Remember the header value, if any. */
-		if (*s == ':')
-			value = ++s;
-
-		/* Skip to the end of the header, including continuation lines. */
-		while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
-			s++;
-		s++;
-
-		/* Process this header. */
-		if (value && value > field+2) {
-			char *ff = (char *) malloc (value-field);
-			char *ss = ff;
-			while (field < value-1)
-				*ss++ = tolower(*field++);
-			*ss++ = 0;
-
-			if (!strcmp (ff, "content-length")) {
-				const char *e;
-				while (*value && isspace (*value))
-					value++;
-				for (e = value; *e && *e != '\r' && *e != '\n'; e++)
-					;
-				ss = (char *) malloc (e - value + 1);
-				strncpy (ss, value, e - value);
-				ss[e - value] = 0;
-				content_length = atoi(ss);
-				free (ss);
-			}
-			free (ff);
-		}
-	}
-	return (content_length);
+  const char *s;
+  int content_length = 0;
+
+  s = headers;
+  while (*s) {
+    const char *field = s;
+    const char *value = 0;
+
+    /* Find the end of the header field */
+    while (*s && !isspace(*s) && *s != ':')
+      s++;
+
+    /* Remember the header value, if any. */
+    if (*s == ':')
+      value = ++s;
+
+    /* Skip to the end of the header, including continuation lines. */
+    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
+      s++;
+    s++;
+
+    /* Process this header. */
+    if (value && value > field+2) {
+      char *ff = (char *) malloc (value-field);
+      char *ss = ff;
+      while (field < value-1)
+        *ss++ = tolower(*field++);
+      *ss++ = 0;
+
+      if (!strcmp (ff, "content-length")) {
+        const char *e;
+        while (*value && isspace (*value))
+          value++;
+        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
+          ;
+        ss = (char *) malloc (e - value + 1);
+        strncpy (ss, value, e - value);
+        ss[e - value] = 0;
+        content_length = atoi(ss);
+        free (ss);
+      }
+      free (ff);
+    }
+  }
+  return (content_length);
 }
 
 int
 check_http (void)
 {
-	char *msg;
-	char *status_line;
-	char *status_code;
-	char *header;
-	char *page;
-	char *auth;
-	int http_status;
-	int i = 0;
-	size_t pagesize = 0;
-	char *full_page;
-	char *buf;
-	char *pos;
-	long microsec;
-	double elapsed_time;
-	int page_len = 0;
-	int result = STATE_UNKNOWN;
-
-	/* try to connect to the host at the given port number */
-	if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
-		die (STATE_CRITICAL, _("Unable to open TCP socket\n"));
+  char *msg;
+  char *status_line;
+  char *status_code;
+  char *header;
+  char *page;
+  char *auth;
+  int http_status;
+  int i = 0;
+  size_t pagesize = 0;
+  char *full_page;
+  char *buf;
+  char *pos;
+  long microsec;
+  double elapsed_time;
+  int page_len = 0;
+  int result = STATE_UNKNOWN;
+
+  /* try to connect to the host at the given port number */
+  if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
+    die (STATE_CRITICAL, _("Unable to open TCP socket\n"));
 #ifdef HAVE_SSL
-	if (use_ssl == TRUE) {
-		np_net_ssl_init(sd);
-		if (check_cert == TRUE) {
-			result = np_net_ssl_check_cert(days_till_exp);
-			if(result != STATE_OK){
-				np_net_ssl_cleanup();
-				if(sd) close(sd);
-				return result;
-			}
-		}
-	}
+  if (use_ssl == TRUE) {
+    np_net_ssl_init(sd);
+    if (check_cert == TRUE) {
+      result = np_net_ssl_check_cert(days_till_exp);
+      if(result != STATE_OK){
+        np_net_ssl_cleanup();
+        if(sd) close(sd);
+        return result;
+      }
+    }
+  }
 #endif /* HAVE_SSL */
 
-	asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent);
-
-	/* optionally send the host header info */
-	if (host_name)
-		asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
-
-	/* optionally send any other header tag */
-	if (http_opt_headers) {
-		for ((pos = strtok(http_opt_headers, INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER)))
-			asprintf (&buf, "%s%s\r\n", buf, pos);
-	}
-
-	/* optionally send the authentication info */
-	if (strlen(user_auth)) {
-		auth = base64 (user_auth, strlen (user_auth));
-		asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
-	}
-
-	/* either send http POST data */
-	if (http_post_data) {
-		if (http_content_type) {
-			asprintf (&buf, "%sContent-Type: %s\r\n", buf, http_content_type);
-		} else {
-			asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
-		}
-		
-		asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));
-		asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
-	}
-	else {
-		/* or just a newline so the server knows we're done with the request */
-		asprintf (&buf, "%s%s", buf, CRLF);
-	}
-
-	if (verbose) printf ("%s\n", buf);
-	my_send (buf, strlen (buf));
-
-	/* fetch the page */
-	full_page = strdup("");
-	while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
-		buffer[i] = '\0';
-		asprintf (&full_page, "%s%s", full_page, buffer);
-		pagesize += i;
+  asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent);
+
+  /* optionally send the host header info */
+  if (host_name)
+    asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
+
+  /* optionally send any other header tag */
+  if (http_opt_headers) {
+    for ((pos = strtok(http_opt_headers, INPUT_DELIMITER)); pos; (pos = strtok(NULL, INPUT_DELIMITER)))
+      asprintf (&buf, "%s%s\r\n", buf, pos);
+  }
+
+  /* optionally send the authentication info */
+  if (strlen(user_auth)) {
+    auth = base64 (user_auth, strlen (user_auth));
+    asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
+  }
+
+  /* either send http POST data */
+  if (http_post_data) {
+    if (http_content_type) {
+      asprintf (&buf, "%sContent-Type: %s\r\n", buf, http_content_type);
+    } else {
+      asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
+    }
+    
+    asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));
+    asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
+  }
+  else {
+    /* or just a newline so the server knows we're done with the request */
+    asprintf (&buf, "%s%s", buf, CRLF);
+  }
+
+  if (verbose) printf ("%s\n", buf);
+  my_send (buf, strlen (buf));
+
+  /* fetch the page */
+  full_page = strdup("");
+  while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
+    buffer[i] = '\0';
+    asprintf (&full_page, "%s%s", full_page, buffer);
+    pagesize += i;
 
                 if (no_body && document_headers_done (full_page)) {
                   i = 0;
                   break;
                 }
-	}
+  }
 
-	if (i < 0 && errno != ECONNRESET) {
+  if (i < 0 && errno != ECONNRESET) {
 #ifdef HAVE_SSL
-		/*
-		if (use_ssl) {
-			sslerr=SSL_get_error(ssl, i);
-			if ( sslerr == SSL_ERROR_SSL ) {
-				die (STATE_WARNING, _("Client Certificate Required\n"));
-			} else {
-				die (STATE_CRITICAL, _("Error on receive\n"));
-			}
-		}
-		else {
-		*/
+    /*
+    if (use_ssl) {
+      sslerr=SSL_get_error(ssl, i);
+      if ( sslerr == SSL_ERROR_SSL ) {
+        die (STATE_WARNING, _("Client Certificate Required\n"));
+      } else {
+        die (STATE_CRITICAL, _("Error on receive\n"));
+      }
+    }
+    else {
+    */
 #endif
-			die (STATE_CRITICAL, _("Error on receive\n"));
+      die (STATE_CRITICAL, _("Error on receive\n"));
 #ifdef HAVE_SSL
-			/* XXX
-		}
-		*/
+      /* XXX
+    }
+    */
 #endif
-	}
+  }
 
-	/* return a CRITICAL status if we couldn't read any data */
-	if (pagesize == (size_t) 0)
-		die (STATE_CRITICAL, _("No data received %s\n"), timestamp);
+  /* return a CRITICAL status if we couldn't read any data */
+  if (pagesize == (size_t) 0)
+    die (STATE_CRITICAL, _("No data received %s\n"), timestamp);
 
-	/* close the connection */
+  /* close the connection */
 #ifdef HAVE_SSL
-	np_net_ssl_cleanup();
+  np_net_ssl_cleanup();
 #endif
-	if(sd) close(sd);
-
-	/* reset the alarm */
-	alarm (0);
-
-	/* leave full_page untouched so we can free it later */
-	page = full_page;
-
-	if (verbose)
-		printf ("%s://%s:%d%s is %d characters\n",
-			use_ssl ? "https" : "http", server_address,
-			server_port, server_url, (int)pagesize);
-
-	/* find status line and null-terminate it */
-	status_line = page;
-	page += (size_t) strcspn (page, "\r\n");
-	pos = page;
-	page += (size_t) strspn (page, "\r\n");
-	status_line[strcspn(status_line, "\r\n")] = 0;
-	strip (status_line);
-	if (verbose)
-		printf ("STATUS: %s\n", status_line);
-
-	/* find header info and null-terminate it */
-	header = page;
-	while (strcspn (page, "\r\n") > 0) {
-		page += (size_t) strcspn (page, "\r\n");
-		pos = page;
-		if ((strspn (page, "\r") == 1 && strspn (page, "\r\n") >= 2) ||
-		    (strspn (page, "\n") == 1 && strspn (page, "\r\n") >= 2))
-			page += (size_t) 2;
-		else
-			page += (size_t) 1;
-	}
-	page += (size_t) strspn (page, "\r\n");
-	header[pos - header] = 0;
-	if (verbose)
-		printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
+  if(sd) close(sd);
+
+  /* reset the alarm */
+  alarm (0);
+
+  /* leave full_page untouched so we can free it later */
+  page = full_page;
+
+  if (verbose)
+    printf ("%s://%s:%d%s is %d characters\n",
+      use_ssl ? "https" : "http", server_address,
+      server_port, server_url, (int)pagesize);
+
+  /* find status line and null-terminate it */
+  status_line = page;
+  page += (size_t) strcspn (page, "\r\n");
+  pos = page;
+  page += (size_t) strspn (page, "\r\n");
+  status_line[strcspn(status_line, "\r\n")] = 0;
+  strip (status_line);
+  if (verbose)
+    printf ("STATUS: %s\n", status_line);
+
+  /* find header info and null-terminate it */
+  header = page;
+  while (strcspn (page, "\r\n") > 0) {
+    page += (size_t) strcspn (page, "\r\n");
+    pos = page;
+    if ((strspn (page, "\r") == 1 && strspn (page, "\r\n") >= 2) ||
+        (strspn (page, "\n") == 1 && strspn (page, "\r\n") >= 2))
+      page += (size_t) 2;
+    else
+      page += (size_t) 1;
+  }
+  page += (size_t) strspn (page, "\r\n");
+  header[pos - header] = 0;
+  if (verbose)
+    printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
                 (no_body ? "  [[ skipped ]]" : page));
 
-	/* make sure the status line matches the response we are looking for */
-	if (!strstr (status_line, server_expect)) {
-		if (server_port == HTTP_PORT)
-			asprintf (&msg,
-		            _("Invalid HTTP response received from host\n"));
-		else
-			asprintf (&msg,
-			          _("Invalid HTTP response received from host on port %d\n"),
-			          server_port);
-		die (STATE_CRITICAL, "%s", msg);
-	}
-
-	/* Exit here if server_expect was set by user and not default */
-	if ( server_expect_yn  )  {
-		asprintf (&msg,
-		          _("HTTP OK: Status line output matched \"%s\"\n"),
-		          server_expect);
-		if (verbose)
-			printf ("%s\n",msg);
-	}
-	else {
-		/* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
-		/* HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT */
+  /* make sure the status line matches the response we are looking for */
+  if (!strstr (status_line, server_expect)) {
+    if (server_port == HTTP_PORT)
+      asprintf (&msg,
+                _("Invalid HTTP response received from host\n"));
+    else
+      asprintf (&msg,
+                _("Invalid HTTP response received from host on port %d\n"),
+                server_port);
+    die (STATE_CRITICAL, "%s", msg);
+  }
+
+  /* Exit here if server_expect was set by user and not default */
+  if ( server_expect_yn  )  {
+    asprintf (&msg,
+              _("HTTP OK: Status line output matched \"%s\"\n"),
+              server_expect);
+    if (verbose)
+      printf ("%s\n",msg);
+  }
+  else {
+    /* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
+    /* HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT */
     /* Status-Code = 3 DIGITS */
 
-		status_code = strchr (status_line, ' ') + sizeof (char);
-		if (strspn (status_code, "1234567890") != 3)
- 			die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status Line (%s)\n"), status_line);
-
-		http_status = atoi (status_code);
-
-		/* check the return code */
-
-		if (http_status >= 600 || http_status < 100)
-			die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%s)\n"), status_line);
-
-		/* server errors result in a critical state */
-		else if (http_status >= 500)
- 			die (STATE_CRITICAL, _("HTTP CRITICAL: %s\n"), status_line);
-
-		/* client errors result in a warning state */
-		else if (http_status >= 400)
-			die (STATE_WARNING, _("HTTP WARNING: %s\n"), status_line);
-
-		/* check redirected page if specified */
-		else if (http_status >= 300) {
-
-			if (onredirect == STATE_DEPENDENT)
-				redir (header, status_line);
-			else if (onredirect == STATE_UNKNOWN)
-				printf (_("UNKNOWN"));
-			else if (onredirect == STATE_OK)
-				printf (_("OK"));
-			else if (onredirect == STATE_WARNING)
-				printf (_("WARNING"));
-			else if (onredirect == STATE_CRITICAL)
-				printf (_("CRITICAL"));
-			microsec = deltime (tv);
-			elapsed_time = (double)microsec / 1.0e6;
-			die (onredirect,
-			     _(" - %s - %.3f second response time %s%s|%s %s\n"),
-			     status_line, elapsed_time, timestamp,
-			     (display_html ? "</A>" : ""),
-					 perfd_time (elapsed_time), perfd_size (pagesize));
-		} /* end if (http_status >= 300) */
-
-	} /* end else (server_expect_yn)  */
-		
+    status_code = strchr (status_line, ' ') + sizeof (char);
+    if (strspn (status_code, "1234567890") != 3)
+      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status Line (%s)\n"), status_line);
+
+    http_status = atoi (status_code);
+
+    /* check the return code */
+
+    if (http_status >= 600 || http_status < 100)
+      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%s)\n"), status_line);
+
+    /* server errors result in a critical state */
+    else if (http_status >= 500)
+      die (STATE_CRITICAL, _("HTTP CRITICAL: %s\n"), status_line);
+
+    /* client errors result in a warning state */
+    else if (http_status >= 400)
+      die (STATE_WARNING, _("HTTP WARNING: %s\n"), status_line);
+
+    /* check redirected page if specified */
+    else if (http_status >= 300) {
+
+      if (onredirect == STATE_DEPENDENT)
+        redir (header, status_line);
+      else if (onredirect == STATE_UNKNOWN)
+        printf (_("UNKNOWN"));
+      else if (onredirect == STATE_OK)
+        printf (_("OK"));
+      else if (onredirect == STATE_WARNING)
+        printf (_("WARNING"));
+      else if (onredirect == STATE_CRITICAL)
+        printf (_("CRITICAL"));
+      microsec = deltime (tv);
+      elapsed_time = (double)microsec / 1.0e6;
+      die (onredirect,
+           _(" - %s - %.3f second response time %s%s|%s %s\n"),
+           status_line, elapsed_time, timestamp,
+           (display_html ? "</A>" : ""),
+           perfd_time (elapsed_time), perfd_size (pagesize));
+    } /* end if (http_status >= 300) */
+
+  } /* end else (server_expect_yn)  */
+    
         if (maximum_age >= 0) {
           check_document_dates (header);
         }
 
-	/* check elapsed time */
-	microsec = deltime (tv);
-	elapsed_time = (double)microsec / 1.0e6;
-	asprintf (&msg,
-	          _("HTTP WARNING: %s - %.3f second response time %s%s|%s %s\n"),
-	          status_line, elapsed_time, timestamp,
-	          (display_html ? "</A>" : ""),
-						perfd_time (elapsed_time), perfd_size (pagesize));
-	if (check_critical_time == TRUE && elapsed_time > critical_time)
-		die (STATE_CRITICAL, "%s", msg);
-	if (check_warning_time == TRUE && elapsed_time > warning_time)
-		die (STATE_WARNING, "%s", msg);
-
-	/* Page and Header content checks go here */
-	/* these checks should be last */
-
-	if (strlen (string_expect)) {
-		if (strstr (page, string_expect)) {
-			printf (_("HTTP OK %s - %.3f second response time %s%s|%s %s\n"),
-			        status_line, elapsed_time,
-			        timestamp, (display_html ? "</A>" : ""),
-			        perfd_time (elapsed_time), perfd_size (pagesize));
-			exit (STATE_OK);
-		}
-		else {
-			printf (_("CRITICAL - string not found%s|%s %s\n"),
-			        (display_html ? "</A>" : ""),
-			        perfd_time (elapsed_time), perfd_size (pagesize));
-			exit (STATE_CRITICAL);
-		}
-	}
+  /* check elapsed time */
+  microsec = deltime (tv);
+  elapsed_time = (double)microsec / 1.0e6;
+  asprintf (&msg,
+            _("HTTP WARNING: %s - %.3f second response time %s%s|%s %s\n"),
+            status_line, elapsed_time, timestamp,
+            (display_html ? "</A>" : ""),
+            perfd_time (elapsed_time), perfd_size (pagesize));
+  if (check_critical_time == TRUE && elapsed_time > critical_time)
+    die (STATE_CRITICAL, "%s", msg);
+  if (check_warning_time == TRUE && elapsed_time > warning_time)
+    die (STATE_WARNING, "%s", msg);
+
+  /* Page and Header content checks go here */
+  /* these checks should be last */
+
+  if (strlen (string_expect)) {
+    if (strstr (page, string_expect)) {
+      printf (_("HTTP OK %s - %.3f second response time %s%s|%s %s\n"),
+              status_line, elapsed_time,
+              timestamp, (display_html ? "</A>" : ""),
+              perfd_time (elapsed_time), perfd_size (pagesize));
+      exit (STATE_OK);
+    }
+    else {
+      printf (_("CRITICAL - string not found%s|%s %s\n"),
+              (display_html ? "</A>" : ""),
+              perfd_time (elapsed_time), perfd_size (pagesize));
+      exit (STATE_CRITICAL);
+    }
+  }
 #ifdef HAVE_REGEX_H
-	if (strlen (regexp)) {
-		errcode = regexec (&preg, page, REGS, pmatch, 0);
-		if (errcode == 0) {
-			printf (_("HTTP OK %s - %.3f second response time %s%s|%s %s\n"),
-			        status_line, elapsed_time,
-			        timestamp, (display_html ? "</A>" : ""),
-			        perfd_time (elapsed_time), perfd_size (pagesize));
-			exit (STATE_OK);
-		}
-		else {
-			if (errcode == REG_NOMATCH) {
-				printf (_("CRITICAL - pattern not found%s|%s %s\n"),
-				        (display_html ? "</A>" : ""),
-				        perfd_time (elapsed_time), perfd_size (pagesize));
-				exit (STATE_CRITICAL);
-			}
-			else {
-				regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-				printf (_("CRITICAL - Execute Error: %s\n"), errbuf);
-				exit (STATE_CRITICAL);
-			}
-		}
-	}
+  if (strlen (regexp)) {
+    errcode = regexec (&preg, page, REGS, pmatch, 0);
+    if (errcode == 0) {
+      printf (_("HTTP OK %s - %.3f second response time %s%s|%s %s\n"),
+              status_line, elapsed_time,
+              timestamp, (display_html ? "</A>" : ""),
+              perfd_time (elapsed_time), perfd_size (pagesize));
+      exit (STATE_OK);
+    }
+    else {
+      if (errcode == REG_NOMATCH) {
+        printf (_("CRITICAL - pattern not found%s|%s %s\n"),
+                (display_html ? "</A>" : ""),
+                perfd_time (elapsed_time), perfd_size (pagesize));
+        exit (STATE_CRITICAL);
+      }
+      else {
+        regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+        printf (_("CRITICAL - Execute Error: %s\n"), errbuf);
+        exit (STATE_CRITICAL);
+      }
+    }
+  }
 #endif
 
-	/* make sure the page is of an appropriate size */
-	/* page_len = get_content_length(header); */
-	page_len = pagesize;
-	if ((max_page_len > 0) && (page_len > max_page_len)) {
-		printf (_("HTTP WARNING: page size %d too large%s|%s\n"),
-			page_len, (display_html ? "</A>" : ""), perfd_size (page_len) );
-		exit (STATE_WARNING);
-	} else if ((min_page_len > 0) && (page_len < min_page_len)) {
-		printf (_("HTTP WARNING: page size %d too small%s|%s\n"),
-			page_len, (display_html ? "</A>" : ""), perfd_size (page_len) );
-		exit (STATE_WARNING);
-	}
-	/* We only get here if all tests have been passed */
-	asprintf (&msg, _("HTTP OK %s - %d bytes in %.3f seconds %s%s|%s %s\n"),
-	          status_line, page_len, elapsed_time,
-	          timestamp, (display_html ? "</A>" : ""),
-						perfd_time (elapsed_time), perfd_size (page_len));
-	die (STATE_OK, "%s", msg);
-	return STATE_UNKNOWN;
+  /* make sure the page is of an appropriate size */
+  /* page_len = get_content_length(header); */
+  page_len = pagesize;
+  if ((max_page_len > 0) && (page_len > max_page_len)) {
+    printf (_("HTTP WARNING: page size %d too large%s|%s\n"),
+      page_len, (display_html ? "</A>" : ""), perfd_size (page_len) );
+    exit (STATE_WARNING);
+  } else if ((min_page_len > 0) && (page_len < min_page_len)) {
+    printf (_("HTTP WARNING: page size %d too small%s|%s\n"),
+      page_len, (display_html ? "</A>" : ""), perfd_size (page_len) );
+    exit (STATE_WARNING);
+  }
+  /* We only get here if all tests have been passed */
+  asprintf (&msg, _("HTTP OK %s - %d bytes in %.3f seconds %s%s|%s %s\n"),
+            status_line, page_len, elapsed_time,
+            timestamp, (display_html ? "</A>" : ""),
+            perfd_time (elapsed_time), perfd_size (page_len));
+  die (STATE_OK, "%s", msg);
+  return STATE_UNKNOWN;
 }
 
 
@@ -1051,117 +1051,117 @@ check_http (void)
 void
 redir (char *pos, char *status_line)
 {
-	int i = 0;
-	char *x;
-	char xx[2];
-	char type[6];
-	char *addr;
-	char port[6];
-	char *url;
-
-	addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
-	if (addr == NULL)
-		die (STATE_UNKNOWN, _("Could not allocate addr\n"));
-	
-	url = malloc (strcspn (pos, "\r\n"));
-	if (url == NULL)
-		die (STATE_UNKNOWN, _("Could not allocate url\n"));
-
-	while (pos) {
-
-		if (sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i) < 1) {
-
-			pos += (size_t) strcspn (pos, "\r\n");
-			pos += (size_t) strspn (pos, "\r\n");
-			if (strlen(pos) == 0) 
-				die (STATE_UNKNOWN,
-						 _("UNKNOWN - Could not find redirect location - %s%s\n"),
-						 status_line, (display_html ? "</A>" : ""));
-			continue;
-		}
-
-		pos += i;
-		pos += strspn (pos, " \t\r\n");
-
-		url = realloc (url, strcspn (pos, "\r\n"));
-		if (url == NULL)
-			die (STATE_UNKNOWN, _("could not allocate url\n"));
-
-		/* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
-		if (sscanf (pos, HD1, type, addr, port, url) == 4) {
-			use_ssl = server_type_check (type);
-			i = atoi (port);
-		}
-
-		/* URI_HTTP URI_HOST URI_PATH */
-		else if (sscanf (pos, HD2, type, addr, url) == 3 ) { 
-			use_ssl = server_type_check (type);
-			i = server_port_check (use_ssl);
-		}
-
-		/* URI_HTTP URI_HOST URI_PORT */
-		else if(sscanf (pos, HD3, type, addr, port) == 3) {
-			strcpy (url, HTTP_URL);
-			use_ssl = server_type_check (type);
-			i = atoi (port);
-		}
-
-		/* URI_HTTP URI_HOST */
-		else if(sscanf (pos, HD4, type, addr) == 2) {
-			strcpy (url, HTTP_URL);
-			use_ssl = server_type_check (type);
-			i = server_port_check (use_ssl);
-		}
-
-		/* URI_PATH */
-		else if (sscanf (pos, HD5, url) == 1) {
-			/* relative url */
-			if ((url[0] != '/')) {
-				if ((x = strrchr(server_url, '/')))
-					*x = '\0';
-				asprintf (&url, "%s/%s", server_url, url);
-			}
-			i = server_port;
-			strcpy (type, server_type);
-			strcpy (addr, host_name);
-		} 					
-
-		else {
-			die (STATE_UNKNOWN,
-					 _("UNKNOWN - Could not parse redirect location - %s%s\n"),
-					 pos, (display_html ? "</A>" : ""));
-		}
-
-		break;
-
-	} /* end while (pos) */
-
-	if (++redir_depth > max_depth)
-		die (STATE_WARNING,
-		     _("WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"),
-		     max_depth, type, addr, i, url, (display_html ? "</A>" : ""));
-
-	if (server_port==i &&
-	    !strcmp(server_address, addr) &&
-	    (host_name && !strcmp(host_name, addr)) &&
-	    !strcmp(server_url, url))
-		die (STATE_WARNING,
-		     _("WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"),
-		     type, addr, i, url, (display_html ? "</A>" : ""));
-
-	server_port = i;
-	strcpy (server_type, type);
-
-	free (host_name);
-	host_name = strdup (addr);
-
-	free (server_address);
-	server_address = strdup (addr);
-
-	free (server_url);
-	server_url = strdup (url);
-
-	check_http ();
+  int i = 0;
+  char *x;
+  char xx[2];
+  char type[6];
+  char *addr;
+  char port[6];
+  char *url;
+
+  addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
+  if (addr == NULL)
+    die (STATE_UNKNOWN, _("Could not allocate addr\n"));
+  
+  url = malloc (strcspn (pos, "\r\n"));
+  if (url == NULL)
+    die (STATE_UNKNOWN, _("Could not allocate url\n"));
+
+  while (pos) {
+
+    if (sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i) < 1) {
+
+      pos += (size_t) strcspn (pos, "\r\n");
+      pos += (size_t) strspn (pos, "\r\n");
+      if (strlen(pos) == 0) 
+        die (STATE_UNKNOWN,
+             _("UNKNOWN - Could not find redirect location - %s%s\n"),
+             status_line, (display_html ? "</A>" : ""));
+      continue;
+    }
+
+    pos += i;
+    pos += strspn (pos, " \t\r\n");
+
+    url = realloc (url, strcspn (pos, "\r\n"));
+    if (url == NULL)
+      die (STATE_UNKNOWN, _("could not allocate url\n"));
+
+    /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+    if (sscanf (pos, HD1, type, addr, port, url) == 4) {
+      use_ssl = server_type_check (type);
+      i = atoi (port);
+    }
+
+    /* URI_HTTP URI_HOST URI_PATH */
+    else if (sscanf (pos, HD2, type, addr, url) == 3 ) { 
+      use_ssl = server_type_check (type);
+      i = server_port_check (use_ssl);
+    }
+
+    /* URI_HTTP URI_HOST URI_PORT */
+    else if(sscanf (pos, HD3, type, addr, port) == 3) {
+      strcpy (url, HTTP_URL);
+      use_ssl = server_type_check (type);
+      i = atoi (port);
+    }
+
+    /* URI_HTTP URI_HOST */
+    else if(sscanf (pos, HD4, type, addr) == 2) {
+      strcpy (url, HTTP_URL);
+      use_ssl = server_type_check (type);
+      i = server_port_check (use_ssl);
+    }
+
+    /* URI_PATH */
+    else if (sscanf (pos, HD5, url) == 1) {
+      /* relative url */
+      if ((url[0] != '/')) {
+        if ((x = strrchr(server_url, '/')))
+          *x = '\0';
+        asprintf (&url, "%s/%s", server_url, url);
+      }
+      i = server_port;
+      strcpy (type, server_type);
+      strcpy (addr, host_name);
+    }           
+
+    else {
+      die (STATE_UNKNOWN,
+           _("UNKNOWN - Could not parse redirect location - %s%s\n"),
+           pos, (display_html ? "</A>" : ""));
+    }
+
+    break;
+
+  } /* end while (pos) */
+
+  if (++redir_depth > max_depth)
+    die (STATE_WARNING,
+         _("WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"),
+         max_depth, type, addr, i, url, (display_html ? "</A>" : ""));
+
+  if (server_port==i &&
+      !strcmp(server_address, addr) &&
+      (host_name && !strcmp(host_name, addr)) &&
+      !strcmp(server_url, url))
+    die (STATE_WARNING,
+         _("WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"),
+         type, addr, i, url, (display_html ? "</A>" : ""));
+
+  server_port = i;
+  strcpy (server_type, type);
+
+  free (host_name);
+  host_name = strdup (addr);
+
+  free (server_address);
+  server_address = strdup (addr);
+
+  free (server_url);
+  server_url = strdup (url);
+
+  check_http ();
 }
 
 
@@ -1169,60 +1169,64 @@ redir (char *pos, char *status_line)
 int
 server_type_check (const char *type)
 {
-	if (strcmp (type, "https"))
-		return FALSE;
-	else
-		return TRUE;
+  if (strcmp (type, "https"))
+    return FALSE;
+  else
+    return TRUE;
 }
 
 int
 server_port_check (int ssl_flag)
 {
-	if (ssl_flag)
-		return HTTPS_PORT;
-	else
-		return HTTP_PORT;
+  if (ssl_flag)
+    return HTTPS_PORT;
+  else
+    return HTTP_PORT;
 }
 
 char *perfd_time (double elapsed_time)
 {
-	return fperfdata ("time", elapsed_time, "s",
-	          check_warning_time, warning_time,
-	          check_critical_time, critical_time,
-									 TRUE, 0, FALSE, 0);
+  return fperfdata ("time", elapsed_time, "s",
+            check_warning_time, warning_time,
+            check_critical_time, critical_time,
+                   TRUE, 0, FALSE, 0);
 }
 
 
 
 char *perfd_size (int page_len)
 {
-	return perfdata ("size", page_len, "B",
-	          (min_page_len>0?TRUE:FALSE), min_page_len,
-	          (min_page_len>0?TRUE:FALSE), 0,
-	          TRUE, 0, FALSE, 0);
+  return perfdata ("size", page_len, "B",
+            (min_page_len>0?TRUE:FALSE), min_page_len,
+            (min_page_len>0?TRUE:FALSE), 0,
+            TRUE, 0, FALSE, 0);
 }
 
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+  print_revision (progname, revision);
 
-	printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-	printf (COPYRIGHT, copyright, email);
+  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+  printf (COPYRIGHT, copyright, email);
 
-	printf (_("\
+  printf (_("\
 This plugin tests the HTTP service on the specified host. It can test\n\
 normal (http) and secure (https) servers, follow redirects, search for\n\
 strings and regular expressions, check connection times, and report on\n\
-certificate expiration times.\n\n"));
+certificate expiration times."));
+
+  printf ("\n\n");
+
+  print_usage ();
 
-	print_usage ();
+  printf (_("NOTE: One or both of -H and -I must be specified"));
 
-	printf (_("NOTE: One or both of -H and -I must be specified\n"));
+  printf ("\n");
 
-	printf (_(UT_HELP_VRSN));
+  printf (_(UT_HELP_VRSN));
 
-	printf (_("\
+  printf (_("\
  -H, --hostname=ADDRESS\n\
     Host name argument for servers using host headers (virtual host)\n\
     Append a port to include it in the header (eg: example.com:5000)\n\
@@ -1231,10 +1235,10 @@ certificate expiration times.\n\n"));
  -p, --port=INTEGER\n\
    Port number (default: %d)\n"), HTTP_PORT);
 
-	printf (_(UT_IPv46));
+  printf (_(UT_IPv46));
 
 #ifdef HAVE_SSL
-	printf (_("\
+  printf (_("\
  -S, --ssl\n\
     Connect via SSL\n\
  -C, --certificate=INTEGER\n\
@@ -1242,7 +1246,7 @@ certificate expiration times.\n\n"));
     (when this option is used the url is not checked.)\n"));
 #endif
 
-	printf (_("\
+  printf (_("\
  -e, --expect=STRING\n\
    String to expect in first (status) line of server response (default: %s)\n\
    If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)\n\
@@ -1262,7 +1266,7 @@ certificate expiration times.\n\n"));
    specify Content-Type header media type when POSTing\n"), HTTP_EXPECT);
 
 #ifdef HAVE_REGEX_H
-	printf (_("\
+  printf (_("\
  -l, --linespan\n\
     Allow regex to span newlines (must precede -r or -R)\n\
  -r, --regex, --ereg=STRING\n\
@@ -1271,7 +1275,7 @@ certificate expiration times.\n\n"));
     Search page for case-insensitive regex STRING\n"));
 #endif
 
-	printf (_("\
+  printf (_("\
  -a, --authorization=AUTH_PAIR\n\
    Username:password on sites with basic authentication\n\
  -A, --useragent=STRING\n\
@@ -1285,13 +1289,13 @@ certificate expiration times.\n\n"));
  -m, --pagesize=INTEGER<:INTEGER>\n\
    Minimum page size required (bytes) : Maximum page size required (bytes)\n"));
 
-	printf (_(UT_WARN_CRIT));
+  printf (_(UT_WARN_CRIT));
 
-	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
 
-	printf (_(UT_VERBOSE));
+  printf (_(UT_VERBOSE));
 
-					printf (_("\
+          printf (_("\
 This plugin will attempt to open an HTTP connection with the host. Successful\n\
 connects return STATE_OK, refusals and timeouts return STATE_CRITICAL, other\n\
 errors return STATE_UNKNOWN.  Successful connects, but incorrect reponse\n\
@@ -1300,18 +1304,18 @@ checking a virtual server that uses 'host headers' you must supply the FQDN\n\
 (fully qualified domain name) as the [host_name] argument.\n"));
 
 #ifdef HAVE_SSL
-	printf (_("\n\
+  printf (_("\n\
 This plugin can also check whether an SSL enabled web server is able to\n\
 serve content (optionally within a specified time) or whether the X509 \n\
 certificate is still valid for the specified number of days.\n"));
-	printf (_("\n\
+  printf (_("\n\
 CHECK CONTENT: check_http -w 5 -c 10 --ssl www.verisign.com\n\n\
 When the 'www.verisign.com' server returns its content within 5 seconds, a\n\
 STATE_OK will be returned. When the server returns its content but exceeds\n\
 the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,\n\
 a STATE_CRITICAL will be returned.\n\n"));
 
-	printf (_("\
+  printf (_("\
 CHECK CERTIFICATE: check_http www.verisign.com -C 14\n\n\
 When the certificate of 'www.verisign.com' is valid for more than 14 days, a\n\
 STATE_OK is returned. When the certificate is still valid, but for less than\n\
@@ -1319,7 +1323,7 @@ STATE_OK is returned. When the certificate is still valid, but for less than\n\
 the certificate is expired.\n"));
 #endif
 
-	printf (_(UT_SUPPORT));
+  printf (_(UT_SUPPORT));
 
 }
 
@@ -1328,11 +1332,10 @@ the certificate is expired.\n"));
 void
 print_usage (void)
 {
-	printf ("\
-Usage: %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n\
-                  [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
-                  [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
-                  [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
-                  [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] \n\
-                  [-M <age>] [-A string] [-k string]\n", progname);
+  printf (_("Usage:"));
+  printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
+  printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n");
+  printf ("       [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n");
+  printf ("       [-s string] [-l] [-r <regex> | -R <case-insensitive regex>] [-P string]\n");
+  printf ("       [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>] [-A string] [-k string]\n");
 }
-- 
cgit v0.10-9-g596f

