From b18f5bf2db0fba2e7e539f68645836036d940d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 29 Apr 2015 15:44:44 +0200 Subject: Imported Upstream version 2.9.6 --- util/isel.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'util/isel.c') diff --git a/util/isel.c b/util/isel.c index c974b24..723ae48 100644 --- a/util/isel.c +++ b/util/isel.c @@ -162,7 +162,7 @@ typedef struct #define RDATA_OFFSET 13 //byte offset to the record event data static char *progname = "isel"; -static char *progver = "2.93"; +static char *progver = "2.96"; #ifdef WIN32 #define IDXFILE "sel.idx" static char idxfile[80] = IDXFILE; @@ -651,7 +651,7 @@ int i_sel(int argc, char **argv) char *s1; printf("%s: version %s\n",progname,progver); - while ((c = getopt(argc,argv,"a:b:cdef:h:l:m:nprs:uwvx:T:V:J:EYF:P:N:U:R:Z:?")) != EOF) + while ((c = getopt(argc,argv,"a:b:cdef:h:l:m:np:rs:uwvx:T:V:J:EYF:P:N:U:R:Z:?")) != EOF) switch(c) { case 'a': faddsel = 1; /*undocumented option, to prevent misuse*/ addstr = optarg; /*text string, max 13 bytes*/ @@ -686,13 +686,14 @@ int i_sel(int argc, char **argv) fsensdesc = 1; /*extended sensor descriptions*/ /* Note that this option does not show event data bytes */ break; - case 'p': fall = 0; break; /*crit stop (panic) only*/ + // case 'p': fall = 0; break; /*crit stop (panic) only*/ case 'r': fshowraw = 1; break; case 's': min_sev = atob(optarg); break; /*show sev >= value*/ case 'u': futc = 1; break; case 'v': fonlyver = 1; break; case 'w': fwritesel = 1; break; case 'x': fdebug = 1; break; + case 'p': /* port */ case 'N': /* nodename */ case 'U': /* remote username */ case 'P': /* remote password */ @@ -717,13 +718,13 @@ int i_sel(int argc, char **argv) printf(" -l5 Show last 5 SEL records (reverse order)\n"); printf(" -r Show uninterpreted raw SEL records in ascii hex\n"); printf(" -n Show nominal/canonical output (same as -c)\n"); - printf(" -p Show only Panic/Critical Stop records\n"); + //printf(" -p Show only Panic/Critical Stop records\n"); printf(" -s1 Show only Severity >= value (0,1,2,3)\n"); printf(" -u use raw UTC time\n"); printf(" -v Only show version information\n"); printf(" -w Writes new SEL records to syslog\n"); printf(" -x Display extra debug messages\n"); - print_lan_opt_usage(); + print_lan_opt_usage(1); ret = ERR_USAGE; goto do_exit; } @@ -866,10 +867,10 @@ int i_sel(int argc, char **argv) /* PEF alerts and other log messages fail if low free space, so show a warning. */ if (vfree < MIN_FREE) { - printf("WARNING: free space is very low (=%d), need to clear with -c\n", + printf("WARNING: free space is very low (=%d), need to clear with -d\n", vfree); } else if ((vfree/vsize) < ((vtotal * 20)/100)) { - printf("WARNING: free space is low (=%d), need to clear with -c\n", + printf("WARNING: free space is low (=%d), need to clear with -d\n", vfree); } } -- cgit v1.2.3