[lwatch-cvs] files/src lwatch.conf,1.6,1.7 settings.c,1.10,1.11 settings.h,1.5,1.6 strpcre.c,1.9,1.10 yparse.l,1.10,1.11

[<ar...@us...>]

Update of /cvsroot/lwatch/files/src
In directory usw-pr-cvs1:/tmp/cvs-serv7464

Modified Files:
	lwatch.conf settings.c settings.h strpcre.c yparse.l 
Log Message:
Changed behavior of config file (all action are checked until end or "exit" keyword).


Index: lwatch.conf
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lwatch.conf	13 Jul 2002 00:28:23 -0000	1.6
--- lwatch.conf	23 Jul 2002 11:41:04 -0000	1.7
***************
*** 51,55 ****
  }
  
! /borys\.lan/	ignore		# don't mess with this zone
  
  /disconnect\w*/	highlight=red	# highlight only disconnect on red
--- 51,55 ----
  }
  
! #/borys\.lan/	ignore		# don't mess with this zone
  
  /disconnect\w*/	highlight=red	# highlight only disconnect on red

Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** settings.c	30 Jun 2002 00:23:53 -0000	1.10
--- settings.c	23 Jul 2002 11:41:04 -0000	1.11
***************
*** 193,196 ****
--- 193,197 ----
  			paction->highlight_color,
  			paction->ignore?"yes":"no",
+ 			paction->exit?"yes":"no",
  			paction->match_service?"yes":"no");
  	printf("^^^^^^^^^^^^^^^^\n");

Index: settings.h
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** settings.h	28 Jun 2002 11:03:58 -0000	1.5
--- settings.h	23 Jul 2002 11:41:04 -0000	1.6
***************
*** 53,57 ****
  	    highlight_color;	/* highlight color from re */
  	int match_service,	/* match service instead message */
! 	    ignore;		/* ignore this line and do not display */
  };
  
--- 53,58 ----
  	    highlight_color;	/* highlight color from re */
  	int match_service,	/* match service instead message */
! 	    ignore,		/* ignore this line and do not display */
! 	    exit;		/* dont process next options */
  };
  

Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** strpcre.c	16 Jul 2002 19:24:45 -0000	1.9
--- strpcre.c	23 Jul 2002 11:41:04 -0000	1.10
***************
*** 205,210 ****
  				mesg_s=match;
  			}
! 			
! 			break;
  		}
  	}
--- 205,210 ----
  				mesg_s=match;
  			}
! 			if(lw_actions[i].exit) /* dont check other actions */
! 				break;
  		}
  	}

Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** yparse.l	4 Jul 2002 14:35:54 -0000	1.10
--- yparse.l	23 Jul 2002 11:41:04 -0000	1.11
***************
*** 70,74 ****
  M_KEYWORD	input_fifo|create_fifo
  R_KEYCOLOR	date_color|host_color|serv_color|mesg_color|color|highlight
! R_KEYWORD	match_service|ignore
  COLOR		black|red|green|yellow|blue|magenta|cyan|white
  STRING		".*"
--- 70,74 ----
  M_KEYWORD	input_fifo|create_fifo
  R_KEYCOLOR	date_color|host_color|serv_color|mesg_color|color|highlight
! R_KEYWORD	match_service|ignore|exit
  COLOR		black|red|green|yellow|blue|magenta|cyan|white
  STRING		".*"
***************
*** 217,220 ****
--- 217,226 ----
  #ifdef DEBUG
  	printf("Ignore RE\n");
+ #endif
+ }
+ <MULTI,ACTION>exit {
+ 	action.exit=1;
+ #ifdef DEBUG
+ 	printf("Exit on action\n");
  #endif
  }