X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_swap.c;h=a1356cfac3e5030971cc54b63af43ffadb6aeca5;hb=25d1ee331dbe4977a4a1a756c67f32bd51d9b070;hp=4e17163cd1e6c061cb48fc62a0da2635a1d68b8d;hpb=30a4266a3a624abbbaace89141f1369ecb5367aa;p=nagiosplug.git

diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 4e17163..a1356cf 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,40 +1,57 @@
-/******************************************************************************
- *
- * Program: Swap space plugin for Nagios
- * License: GPL
- *
- * License Information:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
- *
- * $Id$
- *
- *****************************************************************************/
+/*****************************************************************************
+* 
+* Nagios check_disk plugin
+* 
+* License: GPL
+* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* 
+* Description:
+* 
+* This file contains the check_disk plugin
+* 
+* 
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+* 
+*****************************************************************************/
 
 const char *progname = "check_swap";
-const char *revision = "$Revision$";
-const char *copyright = "2000-2004";
+const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
 #include "popen.h"
 #include "utils.h"
 
-int check_swap (int usp, long unsigned int free_swap);
+#ifdef HAVE_DECL_SWAPCTL
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+# ifdef HAVE_SYS_SWAP_H
+#  include <sys/swap.h>
+# endif
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+#endif
+
+#ifndef SWAP_CONVERSION
+# define SWAP_CONVERSION 1
+#endif
+
+int check_swap (int usp, float free_swap_mb);
 int process_arguments (int argc, char **argv);
 int validate_arguments (void);
 void print_usage (void);
@@ -42,8 +59,8 @@ void print_help (void);
 
 int warn_percent = 0;
 int crit_percent = 0;
-unsigned long long warn_size = 0;
-unsigned long long crit_size = 0;
+float warn_size_bytes = 0;
+float crit_size_bytes= 0;
 int verbose;
 int allswaps;
 
@@ -51,15 +68,14 @@ int
 main (int argc, char **argv)
 {
 	int percent_used, percent;
-	unsigned long long total_swap = 0, used_swap = 0, free_swap = 0;
-	unsigned long long dsktotal = 0, dskused = 0, dskfree = 0, tmp = 0;
+	float total_swap_mb = 0, used_swap_mb = 0, free_swap_mb = 0;
+	float dsktotal_mb = 0, dskused_mb = 0, dskfree_mb = 0, tmp_mb = 0;
 	int result = STATE_UNKNOWN;
 	char input_buffer[MAX_INPUT_BUFFER];
-	char *perf;
-	int conv_factor = SWAP_CONVERSION;
 #ifdef HAVE_PROC_MEMINFO
 	FILE *fp;
 #else
+	int conv_factor = SWAP_CONVERSION;
 # ifdef HAVE_SWAP
 	char *temp_buffer;
 	char *swap_command;
@@ -79,53 +95,61 @@ main (int argc, char **argv)
 # endif
 #endif
 	char str[32];
-	char *status, *tmp_status;
+	char *status;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
 	textdomain (PACKAGE);
 
 	status = strdup ("");
-	tmp_status = strdup ("");
-	perf = strdup ("");
+
+	/* Parse extra opts if any */
+	argv=np_extra_opts (&argc, argv, progname);
 
 	if (process_arguments (argc, argv) == ERROR)
 		usage4 (_("Could not parse arguments"));
 
 #ifdef HAVE_PROC_MEMINFO
+	if (verbose >= 3) {
+		printf("Reading PROC_MEMINFO at %s\n", PROC_MEMINFO);
+	}
 	fp = fopen (PROC_MEMINFO, "r");
 	while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-		if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %llu %llu %llu", &dsktotal, &dskused, &dskfree) == 3) {
-			dsktotal = dsktotal / 1048576;
-			dskused = dskused / 1048576;
-			dskfree = dskfree / 1048576;
-			total_swap += dsktotal;
-			used_swap += dskused;
-			free_swap += dskfree;
+		if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %f %f %f", &dsktotal_mb, &dskused_mb, &dskfree_mb) == 3) {
+			dsktotal_mb = dsktotal_mb / 1048576;	/* Apply conversion */
+			dskused_mb = dskused_mb / 1048576;
+			dskfree_mb = dskfree_mb / 1048576;
+			total_swap_mb += dsktotal_mb;
+			used_swap_mb += dskused_mb;
+			free_swap_mb += dskfree_mb;
 			if (allswaps) {
-				if (dsktotal == 0)
+				if (dsktotal_mb == 0)
 					percent=100.0;
 				else
-					percent = 100 * (((double) dskused) / ((double) dsktotal));
-				result = max_state (result, check_swap (percent, dskfree));
+					percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
+				result = max_state (result, check_swap (percent, dskfree_mb));
 				if (verbose)
-					asprintf (&status, "%s [%llu (%d%%)]", status, dskfree, 100 - percent);
+					asprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
 			}
 		}
-		else if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFre]%*[:] %llu %*[k]%*[B]", str, &tmp)) {
+		else if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFre]%*[:] %f %*[k]%*[B]", str, &tmp_mb)) {
+			if (verbose >= 3) {
+				printf("Got %s with %f\n", str, tmp_mb);
+			}
+			/* I think this part is always in Kb, so convert to mb */
 			if (strcmp ("Total", str) == 0) {
-				dsktotal = tmp / 1024;
+				dsktotal_mb = tmp_mb / 1024;
 			}
 			else if (strcmp ("Free", str) == 0) {
-				dskfree = tmp / 1024;
+				dskfree_mb = tmp_mb / 1024;
 			}
 		}
 	}
 	fclose(fp);
-	dskused = dsktotal - dskfree;
-	total_swap = dsktotal;
-	used_swap = dskused;
-	free_swap = dskfree;
+	dskused_mb = dsktotal_mb - dskfree_mb;
+	total_swap_mb = dsktotal_mb;
+	used_swap_mb = dskused_mb;
+	free_swap_mb = dskfree_mb;
 #else
 # ifdef HAVE_SWAP
 	asprintf(&swap_command, "%s", SWAP_COMMAND);
@@ -136,7 +160,7 @@ main (int argc, char **argv)
 #  ifdef _AIX
 	if (!allswaps) {
 		asprintf(&swap_command, "%s", "/usr/sbin/lsps -s");
-		asprintf(&swap_format, "%s", "%d%*s %d");
+		asprintf(&swap_format, "%s", "%f%*s %f");
 		conv_factor = 1;
 	}
 #  endif
@@ -176,35 +200,35 @@ main (int argc, char **argv)
 #  ifdef _AIX
 	if (!allswaps) {
 		fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process);	/* Ignore first line */
-		sscanf (input_buffer, swap_format, &total_swap, &used_swap);
-		free_swap = total_swap * (100 - used_swap) /100;
-		used_swap = total_swap - free_swap;
+		sscanf (input_buffer, swap_format, &total_swap_mb, &used_swap_mb);
+		free_swap_mb = total_swap_mb * (100 - used_swap_mb) /100;
+		used_swap_mb = total_swap_mb - free_swap_mb;
 		if (verbose >= 3)
-			printf (_("total=%d, used=%d, free=%d\n"), total_swap, used_swap, free_swap);
+			printf (_("total=%.0f, used=%.0f, free=%.0f\n"), total_swap_mb, used_swap_mb, free_swap_mb);
 	} else {
 #  endif
 		while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
-			sscanf (input_buffer, swap_format, &dsktotal, &dskfree);
+			sscanf (input_buffer, swap_format, &dsktotal_mb, &dskfree_mb);
 
-			dsktotal = dsktotal / conv_factor;
+			dsktotal_mb = dsktotal_mb / conv_factor;
 			/* AIX lists percent used, so this converts to dskfree in MBs */
 #  ifdef _AIX
-			dskfree = dsktotal * (100 - dskfree) / 100;
+			dskfree_mb = dsktotal_mb * (100 - dskfree_mb) / 100;
 #  else
-			dskfree = dskfree / conv_factor;
+			dskfree_mb = dskfree_mb / conv_factor;
 #  endif
 			if (verbose >= 3)
-				printf (_("total=%d, free=%d\n"), dsktotal, dskfree);
+				printf (_("total=%.0f, free=%.0f\n"), dsktotal_mb, dskfree_mb);
 
-			dskused = dsktotal - dskfree;
-			total_swap += dsktotal;
-			used_swap += dskused;
-			free_swap += dskfree;
+			dskused_mb = dsktotal_mb - dskfree_mb;
+			total_swap_mb += dsktotal_mb;
+			used_swap_mb += dskused_mb;
+			free_swap_mb += dskfree_mb;
 			if (allswaps) {
-				percent = 100 * (((double) dskused) / ((double) dsktotal));
-				result = max_state (result, check_swap (percent, dskfree));
+				percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
+				result = max_state (result, check_swap (percent, dskfree_mb));
 				if (verbose)
-					asprintf (&status, "%s [%llu (%d%%)]", status, dskfree, 100 - percent);
+					asprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
 			}
 		}
 #  ifdef _AIX
@@ -225,40 +249,54 @@ main (int argc, char **argv)
 #  ifdef CHECK_SWAP_SWAPCTL_SVR4
 
 	/* get the number of active swap devices */
-	nswaps=swapctl(SC_GETNSWP, NULL);
+	if((nswaps=swapctl(SC_GETNSWP, NULL))== -1)
+		die(STATE_UNKNOWN, _("Error getting swap devices\n") );
+
+	if(nswaps == 0)
+		die(STATE_OK, _("SWAP OK: No swap devices defined\n"));
+
+	if(verbose >= 3)
+		printf("Found %d swap device(s)\n", nswaps);
 
 	/* initialize swap table + entries */
 	tbl=(swaptbl_t*)malloc(sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+
+	if(tbl==NULL)
+		die(STATE_UNKNOWN, _("malloc() failed!\n"));
+
 	memset(tbl, 0, sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
 	tbl->swt_n=nswaps;
 	for(i=0;i<nswaps;i++){
-		ent=&tbl->swt_ent[i];
-		ent->ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN);
+		if((tbl->swt_ent[i].ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN)) == NULL)
+			die(STATE_UNKNOWN, _("malloc() failed!\n"));
 	}
 
 	/* and now, tally 'em up */
 	swapctl_res=swapctl(SC_LIST, tbl);
 	if(swapctl_res < 0){
-		perror("swapctl failed: ");
-		result = STATE_WARNING;
+		perror(_("swapctl failed: "));
+		die(STATE_UNKNOWN, _("Error in swapctl call\n"));
 	}
 
 	for(i=0;i<nswaps;i++){
-		dsktotal = tbl->swt_ent[i].ste_pages / SWAP_CONVERSION;
-		dskfree = tbl->swt_ent[i].ste_free /  SWAP_CONVERSION;
-		dskused = ( dsktotal - dskfree );
+		dsktotal_mb = (float) tbl->swt_ent[i].ste_pages / SWAP_CONVERSION;
+		dskfree_mb = (float) tbl->swt_ent[i].ste_free /  SWAP_CONVERSION;
+		dskused_mb = ( dsktotal_mb - dskfree_mb );
+
+		if (verbose >= 3)
+			printf ("dsktotal_mb=%.0f dskfree_mb=%.0f dskused_mb=%.0f\n", dsktotal_mb, dskfree_mb, dskused_mb);
 
-		if(allswaps && dsktotal > 0){
-			percent = 100 * (((double) dskused) / ((double) dsktotal));
-			result = max_state (result, check_swap (percent, dskfree));
+		if(allswaps && dsktotal_mb > 0){
+			percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
+			result = max_state (result, check_swap (percent, dskfree_mb));
 			if (verbose) {
-				asprintf (&status, "%s [%d (%d%%)]", status, (int)dskfree, 100 - percent);
+				asprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
 			}
 		}
 
-		total_swap += dsktotal;
-		free_swap += dskfree;
-		used_swap += dskused;
+		total_swap_mb += dsktotal_mb;
+		free_swap_mb += dskfree_mb;
+		used_swap_mb += dskused_mb;
 	}
 
 	/* and clean up after ourselves */
@@ -278,26 +316,26 @@ main (int argc, char **argv)
 	/* and now, tally 'em up */
 	swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
 	if(swapctl_res < 0){
-		perror("swapctl failed: ");
-		result = STATE_WARNING;
+		perror(_("swapctl failed: "));
+		die(STATE_UNKNOWN, _("Error in swapctl call\n"));
 	}
 
 	for(i=0;i<nswaps;i++){
-		dsktotal = ent->se_nblks / conv_factor;
-		dskused = ent->se_inuse / conv_factor;
-		dskfree = ( dsktotal - dskused );
+		dsktotal_mb = (float) ent[i].se_nblks / conv_factor;
+		dskused_mb = (float) ent[i].se_inuse / conv_factor;
+		dskfree_mb = ( dsktotal_mb - dskused_mb );
 
-		if(allswaps && dsktotal > 0){
-			percent = 100 * (((double) dskused) / ((double) dsktotal));
-			result = max_state (result, check_swap (percent, dskfree));
+		if(allswaps && dsktotal_mb > 0){
+			percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
+			result = max_state (result, check_swap (percent, dskfree_mb));
 			if (verbose) {
-				asprintf (&status, "%s [%d (%d%%)]", status, (int)dskfree, 100 - percent);
+				asprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
 			}
 		}
 
-		total_swap += dsktotal;
-		free_swap += dskfree;
-		used_swap += dskused;
+		total_swap_mb += dsktotal_mb;
+		free_swap_mb += dskfree_mb;
+		used_swap_mb += dskused_mb;
 	}
 
 	/* and clean up after ourselves */
@@ -308,36 +346,41 @@ main (int argc, char **argv)
 # endif /* HAVE_SWAP */
 #endif /* HAVE_PROC_MEMINFO */
 
-	percent_used = 100 * ((double) used_swap) / ((double) total_swap);
-	result = max_state (result, check_swap (percent_used, free_swap));
-	/* broken into two steps because of funkiness with builtin asprintf */
-	asprintf (&tmp_status, _(" %d%% free (%llu MB out of %llu MB)"),
-						(100 - percent_used), free_swap, total_swap);
-	asprintf (&status, "%s%s", tmp_status, status);
-
-	asprintf (&perf, "%s", perfdata ("swap", (long) free_swap, "MB",
-		TRUE, (long) max (warn_size/1024, warn_percent/100.0*total_swap),
-		TRUE, (long) max (crit_size/1024, crit_percent/100.0*total_swap),
-		TRUE, 0,
-		TRUE, (long) total_swap));
-	printf ("SWAP %s:%s |%s\n", state_text (result), status, perf);
+	/* if total_swap_mb == 0, let's not divide by 0 */
+	if(total_swap_mb) {
+		percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb);
+	} else {
+		percent_used = 0;
+	}
+
+	result = max_state (result, check_swap (percent_used, free_swap_mb));
+	printf (_("SWAP %s - %d%% free (%d MB out of %d MB) %s|"),
+			state_text (result),
+			(100 - percent_used), (int) free_swap_mb, (int) total_swap_mb, status);
+
+	puts (perfdata ("swap", (long) free_swap_mb, "MB",
+	                TRUE, (long) max (warn_size_bytes/(1024 * 1024), warn_percent/100.0*total_swap_mb),
+	                TRUE, (long) max (crit_size_bytes/(1024 * 1024), crit_percent/100.0*total_swap_mb),
+	                TRUE, 0,
+	                TRUE, (long) total_swap_mb));
+
 	return result;
 }
 
 
 
 int
-check_swap (int usp, long unsigned int free_swap)
+check_swap (int usp, float free_swap_mb)
 {
 	int result = STATE_UNKNOWN;
-	free_swap = free_swap * 1024;		/* Convert back to bytes as warn and crit specified in bytes */
+	float free_swap = free_swap_mb * (1024 * 1024);		/* Convert back to bytes as warn and crit specified in bytes */
 	if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
 		result = STATE_CRITICAL;
-	else if (crit_size > 0 && free_swap <= crit_size)
+	else if (crit_size_bytes > 0 && free_swap <= crit_size_bytes)
 		result = STATE_CRITICAL;
 	else if (usp >= 0 && warn_percent != 0 && usp >= (100.0 - warn_percent))
 		result = STATE_WARNING;
-	else if (warn_size > 0 && free_swap <= warn_size)
+	else if (warn_size_bytes > 0 && free_swap <= warn_size_bytes)
 		result = STATE_WARNING;
 	else if (usp >= 0.0)
 		result = STATE_OK;
@@ -375,12 +418,13 @@ process_arguments (int argc, char **argv)
 		switch (c) {
 		case 'w':									/* warning size threshold */
 			if (is_intnonneg (optarg)) {
-				warn_size = atoi (optarg);
+				warn_size_bytes = (float) atoi (optarg);
 				break;
 			}
 			else if (strstr (optarg, ",") &&
 							 strstr (optarg, "%") &&
-							 sscanf (optarg, "%llu,%d%%", &warn_size, &warn_percent) == 2) {
+							 sscanf (optarg, "%f,%d%%", &warn_size_bytes, &warn_percent) == 2) {
+				warn_size_bytes = floorf(warn_size_bytes);
 				break;
 			}
 			else if (strstr (optarg, "%") &&
@@ -388,16 +432,17 @@ process_arguments (int argc, char **argv)
 				break;
 			}
 			else {
-				usage (_("Warning threshold must be integer or percentage!\n"));
+				usage4 (_("Warning threshold must be integer or percentage!"));
 			}
 		case 'c':									/* critical size threshold */
 			if (is_intnonneg (optarg)) {
-				crit_size = atoi (optarg);
+				crit_size_bytes = (float) atoi (optarg);
 				break;
 			}
 			else if (strstr (optarg, ",") &&
 							 strstr (optarg, "%") &&
-							 sscanf (optarg, "%llu,%d%%", &crit_size, &crit_percent) == 2) {
+							 sscanf (optarg, "%f,%d%%", &crit_size_bytes, &crit_percent) == 2) {
+				crit_size_bytes = floorf(crit_size_bytes);
 				break;
 			}
 			else if (strstr (optarg, "%") &&
@@ -405,7 +450,7 @@ process_arguments (int argc, char **argv)
 				break;
 			}
 			else {
-				usage (_("Critical threshold must be integer or percentage!\n"));
+				usage4 (_("Critical threshold must be integer or percentage!"));
 			}
 		case 'a':									/* all swap */
 			allswaps = TRUE;
@@ -414,15 +459,13 @@ process_arguments (int argc, char **argv)
 			verbose++;
 			break;
 		case 'V':									/* version */
-			print_revision (progname, revision);
+			print_revision (progname, NP_VERSION);
 			exit (STATE_OK);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* error */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage5 ();
 		}
 	}
 
@@ -439,13 +482,13 @@ process_arguments (int argc, char **argv)
 
 	if (c == argc)
 		return validate_arguments ();
-	if (warn_size == 0 && is_intnonneg (argv[c]))
-		warn_size = atoi (argv[c++]);
+	if (warn_size_bytes == 0 && is_intnonneg (argv[c]))
+		warn_size_bytes = (float) atoi (argv[c++]);
 
 	if (c == argc)
 		return validate_arguments ();
-	if (crit_size == 0 && is_intnonneg (argv[c]))
-		crit_size = atoi (argv[c++]);
+	if (crit_size_bytes == 0 && is_intnonneg (argv[c]))
+		crit_size_bytes = (float) atoi (argv[c++]);
 
 	return validate_arguments ();
 }
@@ -455,17 +498,17 @@ process_arguments (int argc, char **argv)
 int
 validate_arguments (void)
 {
-	if (warn_percent == 0 && crit_percent == 0 && warn_size == 0
-			&& crit_size == 0) {
+	if (warn_percent == 0 && crit_percent == 0 && warn_size_bytes == 0
+			&& crit_size_bytes == 0) {
 		return ERROR;
 	}
 	else if (warn_percent < crit_percent) {
-		usage
-			(_("Warning percentage should be more than critical percentage\n"));
+		usage4
+			(_("Warning percentage should be more than critical percentage"));
 	}
-	else if (warn_size < crit_size) {
-		usage
-			(_("Warning free space should be more than critical free space\n"));
+	else if (warn_size_bytes < crit_size_bytes) {
+		usage4
+			(_("Warning free space should be more than critical free space"));
 	}
 	return OK;
 }
@@ -475,38 +518,41 @@ validate_arguments (void)
 void
 print_help (void)
 {
-	print_revision (progname, revision);
+	print_revision (progname, NP_VERSION);
 
 	printf (_(COPYRIGHT), copyright, email);
 
-	printf (_("Check swap space on local machine.\n\n"));
+	printf ("%s\n", _("Check swap space on local machine."));
+
+  printf ("\n\n");
 
 	print_usage ();
 
-	printf (_(UT_HELP_VRSN));
-
-	printf (_("\n\
- -w, --warning=INTEGER\n\
-   Exit with WARNING status if less than INTEGER bytes of swap space are free\n\
- -w, --warning=PERCENT%%\n\
-   Exit with WARNING status if less than PERCENT of swap space is free\n\
- -c, --critical=INTEGER\n\
-   Exit with CRITICAL status if less than INTEGER bytes of swap space are free\n\
- -c, --critical=PERCENT%%\n\
-   Exit with CRITCAL status if less than PERCENT of swap space is free\n\
- -a, --allswaps\n\
-    Conduct comparisons for all swap partitions, one by one\n\
- -v, --verbose\n\
-    Verbose output. Up to 3 levels\n"));
-
-	printf (_("\n\
-On Solaris, if -a specified, uses swap -l, otherwise uses swap -s.\n\
-Will be discrepencies because swap -s counts allocated swap and includes\n\
-real memory\n"));
-	printf (_("\n\
-On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
-
-	printf (_(UT_SUPPORT));
+	printf (UT_HELP_VRSN);
+	printf (UT_EXTRA_OPTS);
+
+	printf (" %s\n", "-w, --warning=INTEGER");
+  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
+  printf (" %s\n", "-w, --warning=PERCENT%%");
+  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of swap space is free"));
+  printf (" %s\n", "-c, --critical=INTEGER");
+  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free"));
+  printf (" %s\n", "-c, --critical=PERCENT%%");
+  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
+  printf (" %s\n", "-a, --allswaps");
+  printf ("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
+	printf (UT_VERBOSE);
+
+	printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
+#ifdef NP_EXTRA_OPTS
+  printf ("\n");
+  printf (UT_EXTRA_OPTS_NOTES);
+#endif
+
+
+	printf (UT_SUPPORT);
 }
 
 
@@ -514,7 +560,7 @@ On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"));
 void
 print_usage (void)
 {
-	printf ("\
-	Usage: %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
-         %s [-av] -w <bytes_free> -c <bytes_free>\n", progname, progname);
+	printf (_("Usage:"));
+  printf ("%s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
+  printf ("%s [-av] -w <bytes_free> -c <bytes_free>\n", progname);
 }