summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2003-03-26 03:57:58 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2003-03-26 03:57:58 (GMT)
commit118b845d236f9cf4aa2a4e68aa999dec2e619729 (patch)
treeb77ff9473f53ecbea29edc95283fcfc8c206837f
parentfbb6e27531d83c2e7e15be5d38af6d3d207571ba (diff)
downloadmonitoring-plugins-118b845d236f9cf4aa2a4e68aa999dec2e619729.tar.gz
Removal of ps_raw and ps_vars
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@463 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--configure.in38
-rw-r--r--plugins/check_procs.c6
2 files changed, 1 insertions, 43 deletions
diff --git a/configure.in b/configure.in
index 646519f..5e5ee36 100644
--- a/configure.in
+++ b/configure.in
@@ -616,16 +616,13 @@ fi
616dnl #### Process table test 616dnl #### Process table test
617 617
618AC_PATH_PROG(PATH_TO_PS,ps) 618AC_PATH_PROG(PATH_TO_PS,ps)
619ac_cv_use_ps_vars=no
620 619
621AC_MSG_CHECKING(for ps syntax) 620AC_MSG_CHECKING(for ps syntax)
622dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND 621dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
623if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ 622if ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
624 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null 623 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
625then 624then
626 ac_cv_use_ps_vars=yes
627 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 625 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
628 ac_cv_ps_raw_command="$PATH_TO_PS -weo 'stat user ppid args'"
629 ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid comm args'" 626 ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid comm args'"
630 ac_cv_ps_format="%s %d %d %s %n" 627 ac_cv_ps_format="%s %d %d %s %n"
631 ac_cv_vsz_command="$PATH_TO_PS -weo 'vsz comm'" 628 ac_cv_vsz_command="$PATH_TO_PS -weo 'vsz comm'"
@@ -639,9 +636,7 @@ dnl FreeBSD
639elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | \ 636elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | \
640 egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null 637 egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
641then 638then
642 ac_cv_use_ps_vars=yes
643 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 639 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
644 ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'"
645 ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid command command'" 640 ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid command command'"
646 ac_cv_ps_format="%s %d %d %s %n" 641 ac_cv_ps_format="%s %d %d %s %n"
647 ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'" 642 ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
@@ -655,9 +650,7 @@ dnl BSD-like mode in RH 6.1
655elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \ 650elif ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | \
656 egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null 651 egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
657then 652then
658 ac_cv_use_ps_vars=yes
659 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 653 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
660 ac_cv_ps_raw_command="$PATH_TO_PS waxno 'state user ppid comm'"
661 ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid comm args'" 654 ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid comm args'"
662 ac_cv_ps_format="%s %d %d %s %n" 655 ac_cv_ps_format="%s %d %d %s %n"
663 ac_cv_vsz_command="$PATH_TO_PS waxno 'vsz comm'" 656 ac_cv_vsz_command="$PATH_TO_PS waxno 'vsz comm'"
@@ -672,8 +665,6 @@ dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
672elif ps -laxnwww 2>/dev/null | \ 665elif ps -laxnwww 2>/dev/null | \
673 egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null 666 egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
674then 667then
675 ac_cv_use_ps_vars=yes
676 ac_cv_ps_raw_command="$PATH_TO_PS laxnwww"
677 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" 668 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
678 ac_cv_ps_command="$PATH_TO_PS -laxnwww" 669 ac_cv_ps_command="$PATH_TO_PS -laxnwww"
679 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s" 670 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s"
@@ -691,8 +682,6 @@ dnl
691elif ps laxnwww 2>/dev/null | \ 682elif ps laxnwww 2>/dev/null | \
692 egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null 683 egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
693then 684then
694 ac_cv_use_ps_vars=yes
695 ac_cv_ps_raw_command="$PATH_TO_PS laxnwww"
696 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" 685 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
697 ac_cv_ps_command="$PATH_TO_PS laxnwww" 686 ac_cv_ps_command="$PATH_TO_PS laxnwww"
698 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s" 687 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s"
@@ -707,9 +696,7 @@ dnl OpenBSD (needs to come early because -exo appears to work, but does not give
707elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ 696elif ps -axo 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
708 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null 697 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
709then 698then
710 ac_cv_use_ps_vars=yes
711 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 699 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
712 ac_cv_ps_raw_command="$PATH_TO_PS -axo 'stat user ppid args'"
713 ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid comm args'" 700 ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid comm args'"
714 ac_cv_ps_format="%s %d %d %s %n" 701 ac_cv_ps_format="%s %d %d %s %n"
715 ac_cv_vsz_command="$PATH_TO_PS -axo 'vsz comm'" 702 ac_cv_vsz_command="$PATH_TO_PS -axo 'vsz comm'"
@@ -723,9 +710,7 @@ dnl AIX 4.3.3 - needs verification. This works for Tru64 - needs %*[ +] in PS_FO
723elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \ 710elif ps -ao 'stat comm vsz rss user uid ppid args' 2>/dev/null | \
724 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null 711 egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
725then 712then
726 ac_cv_use_ps_vars=yes
727 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 713 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
728 ac_cv_ps_raw_command="$PATH_TO_PS -ao 'stat user ppid args'"
729 ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid comm args'" 714 ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid comm args'"
730 ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]" 715 ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]"
731 ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz comm'" 716 ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz comm'"
@@ -738,9 +723,7 @@ then
738elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \ 723elif ps -eo 's comm vsz rss user uid ppid args' 2>/dev/null | \
739 egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null 724 egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
740then 725then
741 ac_cv_use_ps_vars=yes
742 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 726 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
743 ac_cv_ps_raw_command="$PATH_TO_PS -eo 's user ppid args'"
744 ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid comm args'" 727 ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid comm args'"
745 ac_cv_ps_format="%s %d %d %s %n" 728 ac_cv_ps_format="%s %d %d %s %n"
746 ac_cv_vsz_command="$PATH_TO_PS -eo 'vsz comm'" 729 ac_cv_vsz_command="$PATH_TO_PS -eo 'vsz comm'"
@@ -753,9 +736,7 @@ then
753elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \ 736elif ps -Ao 's comm vsz rss uid user ppid args' 2>/dev/null | \
754 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null 737 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
755then 738then
756 ac_cv_use_ps_vars=yes
757 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 739 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
758 ac_cv_ps_raw_command="$PATH_TO_PS -Ao 's user ppid args'"
759 ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid comm args'" 740 ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid comm args'"
760 ac_cv_ps_format="%s %d %d %s %n" 741 ac_cv_ps_format="%s %d %d %s %n"
761 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" 742 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
@@ -768,9 +749,7 @@ then
768elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \ 749elif ps -Ao 'status comm vsz rss uid user ppid args' 2>/dev/null | \
769 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null 750 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
770then 751then
771 ac_cv_use_ps_vars=yes
772 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 752 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
773 ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'status user ppid args'"
774 ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid comm args'" 753 ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid comm args'"
775 ac_cv_ps_format="%s %d %d %s %n" 754 ac_cv_ps_format="%s %d %d %s %n"
776 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" 755 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
@@ -783,9 +762,7 @@ then
783elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \ 762elif ps -Ao 'state comm vsz rss uid user ppid args' 2>/dev/null | \
784 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null 763 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
785then 764then
786 ac_cv_use_ps_vars=yes
787 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 765 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
788 ac_cv_ps_raw_command="$PATH_TO_PS -Ao 'state user ppid args'"
789 ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid comm args'" 766 ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid comm args'"
790 ac_cv_ps_format="%s %d %d %s %n" 767 ac_cv_ps_format="%s %d %d %s %n"
791 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'" 768 ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
@@ -799,9 +776,7 @@ dnl wonder who takes state instead of stat
799elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \ 776elif ps -ao 'state command vsz rss user ppid args' 2>/dev/null | \
800 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null 777 egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
801then 778then
802 ac_cv_use_ps_vars=yes
803 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 779 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
804 ac_cv_ps_raw_command="$PATH_TO_PS -ao 'state user ppid args'"
805 ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid command args'" 780 ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid command args'"
806 ac_cv_ps_format="%s %d %d %s %n" 781 ac_cv_ps_format="%s %d %d %s %n"
807 ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz command'" 782 ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz command'"
@@ -815,7 +790,6 @@ dnl IRIX 53
815elif ps -el 2>/dev/null | \ 790elif ps -el 2>/dev/null | \
816 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null 791 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
817then 792then
818 ac_cv_use_ps_vars=yes
819 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" 793 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
820 ac_cv_ps_command="$PATH_TO_PS -el" 794 ac_cv_ps_command="$PATH_TO_PS -el"
821 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" 795 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
@@ -829,7 +803,6 @@ dnl IRIX 63
829elif ps -el 2>/dev/null | \ 803elif ps -el 2>/dev/null | \
830 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null 804 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
831then 805then
832 ac_cv_use_ps_vars=yes
833 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" 806 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
834 ac_cv_ps_command="$PATH_TO_PS -el" 807 ac_cv_ps_command="$PATH_TO_PS -el"
835 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" 808 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
@@ -845,7 +818,6 @@ dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45
845elif ps -el 2>/dev/null | \ 818elif ps -el 2>/dev/null | \
846 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null 819 egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
847then 820then
848 ac_cv_use_ps_vars=yes
849 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" 821 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
850 ac_cv_ps_command="$PATH_TO_PS -el" 822 ac_cv_ps_command="$PATH_TO_PS -el"
851 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s" 823 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
@@ -859,7 +831,6 @@ dnl AIX?
859elif ps glaxen 2>/dev/null | \ 831elif ps glaxen 2>/dev/null | \
860 egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null 832 egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
861then 833then
862 ac_cv_use_ps_vars=yes
863 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]" 834 ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
864 ac_cv_ps_command="$PATH_TO_PS glaxen" 835 ac_cv_ps_command="$PATH_TO_PS glaxen"
865 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s" 836 ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s"
@@ -876,9 +847,7 @@ dnl Ss 1308 272 0 root 0 init /sbin/init
876elif ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | \ 847elif ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | \
877 egrep -i ["^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND"] >/dev/null 848 egrep -i ["^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND"] >/dev/null
878then 849then
879 ac_cv_use_ps_vars=yes
880 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]" 850 ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
881 ac_cv_ps_raw_command="$PATH_TO_PS waxo 'state uid ppid command'"
882 ac_cv_ps_command="$PATH_TO_PS waxo 'state uid ppid ucomm command'" 851 ac_cv_ps_command="$PATH_TO_PS waxo 'state uid ppid ucomm command'"
883 ac_cv_ps_format="%s %d %d %s %n" 852 ac_cv_ps_format="%s %d %d %s %n"
884 ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'" 853 ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
@@ -892,7 +861,6 @@ dnl UnixWare
892elif ps -Al 2>/dev/null | \ 861elif ps -Al 2>/dev/null | \
893 egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null 862 egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
894then 863then
895 ac_cv_use_ps_vars=yes
896 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]" 864 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
897 ac_cv_ps_command="$PATH_TO_PS -Al" 865 ac_cv_ps_command="$PATH_TO_PS -Al"
898 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s" 866 ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
@@ -908,14 +876,8 @@ else
908 AC_MSG_WARN([unable to find usable ps syntax]) 876 AC_MSG_WARN([unable to find usable ps syntax])
909fi 877fi
910 878
911if test "x$ac_cv_use_ps_vars" != "xno"
912then
913 AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
914fi
915AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist, 879AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
916 [Variable list for sscanf of 'ps' output]) 880 [Variable list for sscanf of 'ps' output])
917AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$ac_cv_ps_raw_command",
918 [Verbatim command to execute for ps in check_netsaint])
919AC_DEFINE_UNQUOTED(PS_COMMAND,"$ac_cv_ps_command", 881AC_DEFINE_UNQUOTED(PS_COMMAND,"$ac_cv_ps_command",
920 [Verbatim command to execute for ps in check_procs]) 882 [Verbatim command to execute for ps in check_procs])
921AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format", 883AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format",
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index e95a072..29f86be 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -117,12 +117,8 @@ main (int argc, char **argv)
117 fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process); 117 fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
118 118
119 while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) { 119 while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
120#ifdef USE_PS_VARS
121 cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST); 120 cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
122#else 121
123 cols = sscanf (input_buffer, PS_FORMAT, procstat, &procuid,
124 &procppid, &pos, procprog);
125#endif
126 /* Zombie processes do not give a procprog command */ 122 /* Zombie processes do not give a procprog command */
127 if ( cols == 3 && strstr(procstat, zombie) ) { 123 if ( cols == 3 && strstr(procstat, zombie) ) {
128 strcpy(procprog, ""); 124 strcpy(procprog, "");