summaryrefslogtreecommitdiffstats
path: root/plugins/check_disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/check_disk.c')
-rw-r--r--plugins/check_disk.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 44c154fc..7048a561 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -220,7 +220,7 @@ main (int argc, char **argv)
220 220
221 temp_list = temp_list->name_next; 221 temp_list = temp_list->name_next;
222 } 222 }
223 223
224 /* Process for every path in list */ 224 /* Process for every path in list */
225 for (path = path_select_list; path; path=path->name_next) { 225 for (path = path_select_list; path; path=path->name_next) {
226 226
@@ -254,7 +254,7 @@ main (int argc, char **argv)
254 254
255 for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next) { 255 for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next) {
256 if (temp_list->group && ! (strcmp(temp_list->group, path->group))) { 256 if (temp_list->group && ! (strcmp(temp_list->group, path->group))) {
257 257
258 stat_path(path); 258 stat_path(path);
259 get_fs_usage (temp_list->best_match->me_mountdir, temp_list->best_match->me_devname, &tmpfsp); 259 get_fs_usage (temp_list->best_match->me_mountdir, temp_list->best_match->me_devname, &tmpfsp);
260 260
@@ -267,7 +267,7 @@ main (int argc, char **argv)
267 fsp.fsu_bavail += (tmpfsp.fsu_bavail > tmpfsp.fsu_bfree ? 0 : tmpfsp.fsu_bavail); /* Free blocks available to non-superuser. */ 267 fsp.fsu_bavail += (tmpfsp.fsu_bavail > tmpfsp.fsu_bfree ? 0 : tmpfsp.fsu_bavail); /* Free blocks available to non-superuser. */
268 fsp.fsu_files += tmpfsp.fsu_files; /* Total file nodes. */ 268 fsp.fsu_files += tmpfsp.fsu_files; /* Total file nodes. */
269 fsp.fsu_ffree += tmpfsp.fsu_ffree; /* Free file nodes. */ 269 fsp.fsu_ffree += tmpfsp.fsu_ffree; /* Free file nodes. */
270 270
271 if (verbose > 3) 271 if (verbose > 3)
272 printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name); 272 printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name);
273 /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */ 273 /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */
@@ -318,7 +318,7 @@ main (int argc, char **argv)
318 me->me_mountdir, total, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree); 318 me->me_mountdir, total, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree);
319 319
320 dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */ 320 dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */
321 321
322 dfree_pct = 100 - dused_pct; 322 dfree_pct = 100 - dused_pct;
323 dused_units = used*fsp.fsu_blocksize/mult; 323 dused_units = used*fsp.fsu_blocksize/mult;
324 dfree_units = available*fsp.fsu_blocksize/mult; 324 dfree_units = available*fsp.fsu_blocksize/mult;
@@ -683,7 +683,7 @@ process_arguments (int argc, char **argv)
683 while (temp_list) { 683 while (temp_list) {
684 if (temp_list->best_match) { 684 if (temp_list->best_match) {
685 if (np_regex_match_mount_entry(temp_list->best_match, &re)) { 685 if (np_regex_match_mount_entry(temp_list->best_match, &re)) {
686 686
687 if (verbose >=3) 687 if (verbose >=3)
688 printf("ignoring %s matching regex\n", temp_list->name); 688 printf("ignoring %s matching regex\n", temp_list->name);
689 689
@@ -722,7 +722,7 @@ process_arguments (int argc, char **argv)
722 regerror (err, &re, errbuf, MAX_INPUT_BUFFER); 722 regerror (err, &re, errbuf, MAX_INPUT_BUFFER);
723 die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf); 723 die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
724 } 724 }
725 725
726 for (me = mount_list; me; me = me->me_next) { 726 for (me = mount_list; me; me = me->me_next) {
727 if (np_regex_match_mount_entry(me, &re)) { 727 if (np_regex_match_mount_entry(me, &re)) {
728 fnd = TRUE; 728 fnd = TRUE;
@@ -776,7 +776,7 @@ process_arguments (int argc, char **argv)
776 crit_usedinodes_percent = NULL; 776 crit_usedinodes_percent = NULL;
777 warn_freeinodes_percent = NULL; 777 warn_freeinodes_percent = NULL;
778 crit_freeinodes_percent = NULL; 778 crit_freeinodes_percent = NULL;
779 779
780 path_selected = FALSE; 780 path_selected = FALSE;
781 group = NULL; 781 group = NULL;
782 break; 782 break;
@@ -875,7 +875,7 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
875 print_path (mypath); 875 print_path (mypath);
876 return ERROR; 876 return ERROR;
877 } 877 }
878 878
879 return OK; 879 return OK;
880} 880}
881 881
@@ -964,6 +964,7 @@ print_help (void)
964 printf (" %s\n", _("are grouped which means the freespace thresholds are applied to all disks together")); 964 printf (" %s\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
965 printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar"); 965 printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar");
966 printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M")); 966 printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
967
967 printf (_(UT_SUPPORT)); 968 printf (_(UT_SUPPORT));
968} 969}
969 970