lwatch-cvs Mailing List for Log Watcher (Page 5)
Brought to you by:
arturcz
Menu
▾
▴
lwatch-cvs — lwatch CVS commit log
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(9) |
Jul
(22) |
Aug
(11) |
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(29) |
Mar
(85) |
Apr
(45) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(30) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(55) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
|
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2010 |
Jan
|
Feb
(15) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Artur R. C. <ar...@us...> - 2004-08-10 14:11:53
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15472 Modified Files: lwatch.1.in Log Message: Create stub from XML. Index: lwatch.1.in =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.1.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** lwatch.1.in 10 Aug 2004 14:08:09 -0000 1.18 --- lwatch.1.in 10 Aug 2004 14:11:44 -0000 1.19 *************** *** 58,62 **** .PP \fBlwatch\fR [-C \fIfilename\fR] [--config \fIfilename\fR] [-i \fIfilename\fR] [--input \fIfilename\fR] [-o \fIfilename\fR] [--output \fIfilename\fR] [-sOhv] [--show-unparsed] [--omit-rc] [--help] ! .SH "Description" .PP Lwatch is a log colorizer. It reads syslog/syslog-ng data --- 58,62 ---- .PP \fBlwatch\fR [-C \fIfilename\fR] [--config \fIfilename\fR] [-i \fIfilename\fR] [--input \fIfilename\fR] [-o \fIfilename\fR] [--output \fIfilename\fR] [-sOhv] [--show-unparsed] [--omit-rc] [--help] ! .SH "DESCRIPTION" .PP Lwatch is a log colorizer. It reads syslog/syslog-ng data *************** *** 76,89 **** you wish. You are able to set a new color for any part (date, host, service, message) using regexp based patterns. ! .SH "Configuration file" ! .PP ! There is no documentation for configuration file as for now. Look at ! provided file, there are a lot of comments there. ! .PP ! I am going to make some changes in configuration file before ! 1.0-stable release. I will also provide docs about how to configure lwatch ! in this release. ! .SH "Command line options" .PP .IP "\fB-C \fIfilename\fR\fP" 10 --- 76,82 ---- you wish. You are able to set a new color for any part (date, host, service, message) using regexp based patterns. ! .SH "COMMAND LINE OPTIONS" .PP + Lwatch accepts some command line options. Command line options have precedence over values from configuration file. .IP "\fB-C \fIfilename\fR\fP" 10 *************** *** 95,99 **** .IP "\fB-o \fIfilename\fR\fP" 10 .IP "\fB--output \fIfilename\fR\fP" 10 ! write colored logs to filename instead of standard output .IP "\fB-s\fP" 10 .IP "\fB--show-unparsed\fP" 10 --- 88,92 ---- .IP "\fB-o \fIfilename\fR\fP" 10 .IP "\fB--output \fIfilename\fR\fP" 10 ! write colored logs to filename instead stdout .IP "\fB-s\fP" 10 .IP "\fB--show-unparsed\fP" 10 *************** *** 108,112 **** .IP "\fB--version\fP" 10 show version and copyright notices ! .SH "Running" .PP Preferred way to run lwatch is to read syslog messages from named fifo or from standard input. --- 101,105 ---- .IP "\fB--version\fP" 10 show version and copyright notices ! .SH "RUNNING" .PP Preferred way to run lwatch is to read syslog messages from named fifo or from standard input. *************** *** 131,135 **** fifo must exist .IP " \(bu" 6 ! proper name must be put in @CONFDIR@/lwatch.conf .PP In syslog-ng you can run lwatch directly from syslog, i.e.: --- 124,128 ---- fifo must exist .IP " \(bu" 6 ! proper name must be put in @CONFDIR@/lwatch.conf or given with -i comand line option .PP In syslog-ng you can run lwatch directly from syslog, i.e.: *************** *** 143,147 **** .fi ! .SH "Copyright" .PP This program is free software; you can redistribute it and/or modify --- 136,150 ---- .fi ! .PP ! Lwatch does not support reading from regular files. If you really need this functionality use following command: ! ! .PP ! .nf ! .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n ! tail -f /path/to/filename | lwatch -i- ! .fi ! It could be subject of change in the future. ! ! .SH "COPYRIGHT" .PP This program is free software; you can redistribute it and/or modify *************** *** 156,158 **** ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ ! .\" created by instant / docbook-to-man, Tue 10 Aug 2004, 14:46 --- 159,164 ---- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ ! .SH "SEE ALSO" ! .PP ! lwatch.conf(5) ! .\" created by instant / docbook-to-man, Tue 10 Aug 2004, 16:10 |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 14:10:05
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14529 Modified Files: README Log Message: Minor changes. Index: README =================================================================== RCS file: /cvsroot/lwatch/files/README,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** README 11 Mar 2004 21:46:00 -0000 1.23 --- README 10 Aug 2004 14:09:52 -0000 1.24 *************** *** 22,26 **** If you want to use CVS snapshot you need autoconf 2.57. ! Automake 1.7 is not necessary. You may safely ignore messages about the lack of it as long as Makefile.am, acinclude.m4 and configure.ac are not modified. --- 22,26 ---- If you want to use CVS snapshot you need autoconf 2.57. ! Automake 1.8 is not necessary. You may safely ignore messages about the lack of it as long as Makefile.am, acinclude.m4 and configure.ac are not modified. |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 14:08:23
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14216 Modified Files: lwatch.1.in lwatch.sgml Log Message: This manual is almost ready. Index: lwatch.1.in =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.1.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** lwatch.1.in 3 Jan 2004 23:05:13 -0000 1.17 --- lwatch.1.in 10 Aug 2004 14:08:09 -0000 1.18 *************** *** 156,158 **** ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ ! .\" created by instant / docbook-to-man, Sat 03 Jan 2004, 23:56 --- 156,158 ---- ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ ! .\" created by instant / docbook-to-man, Tue 10 Aug 2004, 14:46 Index: lwatch.sgml =================================================================== RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** lwatch.sgml 7 Apr 2003 14:17:54 -0000 1.16 --- lwatch.sgml 10 Aug 2004 14:08:09 -0000 1.17 *************** *** 9,13 **** This file is part of the LogWatcher tool. ! Copyright (C) 2002 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or --- 9,13 ---- This file is part of the LogWatcher tool. ! Copyright (C) 2002,2003,2004 Artur Robert Czechowski The LogWatcher is free software; you can redistribute it and/or *************** *** 48,52 **** <refsynopsisdiv> - <!-- <title>Synopsis</title> --> <cmdsynopsis> <command>lwatch</command> --- 48,51 ---- *************** *** 57,64 **** <arg>-o <replaceable>filename</replaceable></arg> <arg>--output <replaceable>filename</replaceable></arg> ! <arg>-<!-- c -->sOhv</arg> ! <!-- ! <arg>- -create-fifo</arg> ! --> <arg>--show-unparsed</arg> <arg>--omit-rc</arg> --- 56,60 ---- <arg>-o <replaceable>filename</replaceable></arg> <arg>--output <replaceable>filename</replaceable></arg> ! <arg>-sOhv</arg> <arg>--show-unparsed</arg> <arg>--omit-rc</arg> *************** *** 68,72 **** <refsect1> ! <title>Description</title> <para>Lwatch is a log colorizer. It reads syslog/syslog-ng data --- 64,68 ---- <refsect1> ! <title>DESCRIPTION</title> <para>Lwatch is a log colorizer. It reads syslog/syslog-ng data *************** *** 88,93 **** </refsect1> <refsect1> ! <title>Configuration file</title> <para>There is no documentation for configuration file as for now. Look at provided file, there are a lot of comments there.</para> --- 84,90 ---- </refsect1> + <!-- Piszemy lwatch.conf(5) <refsect1> ! <title>CONFIGURATION FILE</title> <para>There is no documentation for configuration file as for now. Look at provided file, there are a lot of comments there.</para> *************** *** 96,103 **** in this release.</para> </refsect1> <refsect1> ! <title>Command line options</title> <para> <variablelist> <varlistentry> --- 93,102 ---- in this release.</para> </refsect1> + --> <refsect1> ! <title>COMMAND LINE OPTIONS</title> <para> + Lwatch accepts some command line options. Command line options have precedence over values from configuration file. <variablelist> <varlistentry> *************** *** 119,123 **** <term><option>--output <replaceable>filename</replaceable></option></term> <listitem> ! <para>write colored logs to filename instead of standard output</para> </listitem> </varlistentry> --- 118,122 ---- <term><option>--output <replaceable>filename</replaceable></option></term> <listitem> ! <para>write colored logs to filename instead stdout</para> </listitem> </varlistentry> *************** *** 162,166 **** <refsect1> ! <title>Running</title> <para>Preferred way to run lwatch is to read syslog messages from named fifo or from standard input.</para> <para>If you use syslog you really want to read messages from named fifo. --- 161,165 ---- <refsect1> ! <title>RUNNING</title> <para>Preferred way to run lwatch is to read syslog messages from named fifo or from standard input.</para> <para>If you use syslog you really want to read messages from named fifo. *************** *** 178,182 **** <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf;</para></listitem> </itemizedlist> </para> --- 177,181 ---- <itemizedlist mark="dash" spacing="compact"> <listitem><para>fifo must exist</para></listitem> ! <listitem><para>proper name must be put in &conf; or given with -i comand line option</para></listitem> </itemizedlist> </para> *************** *** 187,194 **** </literallayout> </para> </refsect1> <refsect1> ! <title>Copyright</title> <para>This program is free software; you can redistribute it and/or modify --- 186,199 ---- </literallayout> </para> + + <para> + Lwatch does not support reading from regular files. If you really need this functionality use following command: + <literallayout>tail -f /path/to/filename | lwatch -i-</literallayout> + It could be subject of change in the future. + </para> </refsect1> <refsect1> ! <title>COPYRIGHT</title> <para>This program is free software; you can redistribute it and/or modify *************** *** 205,219 **** </para> - - </refsect1> - <!-- <refsect1> ! <title>See also</title> <para>lwatch.conf(5)</para> </refsect1> - --> </refentry> --- 210,220 ---- </para> </refsect1> <refsect1> ! <title>SEE ALSO</title> <para>lwatch.conf(5)</para> </refsect1> </refentry> |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 12:34:15
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30960 Modified Files: .cvsignore Log Message: Ignore generated files. Index: .cvsignore =================================================================== RCS file: /cvsroot/lwatch/files/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 11 Jan 2004 22:11:16 -0000 1.1 --- .cvsignore 10 Aug 2004 12:34:06 -0000 1.2 *************** *** 1,2 **** ! configure Makefile.in --- 1,6 ---- ! Makefile Makefile.in + autom4te.cache + config.log + config.status + configure |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 12:15:32
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084/src Modified Files: lwatch.conf settings.c settings.h yparse.l Log Message: Configuration file is versioned now. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** settings.c 10 Aug 2004 09:02:10 -0000 1.28 --- settings.c 10 Aug 2004 12:15:20 -0000 1.29 *************** *** 137,141 **** }; int idx,c; - int version=0; /* char *pc; //what I needed it for? */ --- 137,140 ---- *************** *** 254,257 **** --- 253,258 ---- #endif + if(!lw_conf.cfg_ver) fprintf(stderr,"\nWARNING! Not versioned configuration file!\n" + "In the next version it shall be a fatal error.\n\n"); } Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** lwatch.conf 10 Aug 2004 09:02:10 -0000 1.24 --- lwatch.conf 10 Aug 2004 12:15:20 -0000 1.25 *************** *** 5,8 **** --- 5,11 ---- # Format of this file is described in manual FIXME + # This configuration file has syntax version 1. + cfg_ver=1 + # Available colors: # black red green brown blue magenta cyan lightgray darkgray brightred Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** settings.h 10 Aug 2004 09:02:10 -0000 1.11 --- settings.h 10 Aug 2004 12:15:20 -0000 1.12 *************** *** 39,42 **** --- 39,43 ---- char out_file[MAXPATHLEN+1]; int show_unparsed; + int cfg_ver; /* wersja formatu pliku konfiguracyjnego */ #ifdef RESIZE int term_cut; Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** yparse.l 10 Aug 2004 11:24:37 -0000 1.26 --- yparse.l 10 Aug 2004 12:15:20 -0000 1.27 *************** *** 72,76 **** %option noyywrap nounput ! M_KEYWORD input_fifo|input_file|output_file|show_unparsed R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit --- 72,76 ---- %option noyywrap nounput ! M_KEYWORD input_fifo|input_file|output_file|show_unparsed|cfg_ver R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit *************** *** 82,87 **** TEXT [a-zA-Z_0-9/.-]* BOOL yes|no ! %x COLOR REGEXP ERROR SECOND ACTION MULTI TEXT BOOLEAN %% --- 82,88 ---- TEXT [a-zA-Z_0-9/.-]* BOOL yes|no + INTVAL [0-9]* ! %x COLOR REGEXP ERROR SECOND ACTION MULTI TEXT BOOLEAN INTEGER %% *************** *** 127,130 **** --- 128,138 ---- PUSH(BOOLEAN); } + <INITIAL>cfg_ver= { + yyip=&lw_conf.cfg_ver; + #ifdef DEBUG + strcpy(mymsg,"cfg_ver"); + #endif + PUSH(INTEGER); + } <INITIAL>date_color= { PUSH(COLOR); *************** *** 221,224 **** --- 229,243 ---- POP; } + <INTEGER>{INTVAL} { + *yyip=0; + *yyip=strtol(yytext, &yypch, 10); + if(*yypch!='\0') { + die("Error in line %i: '%s' is not valid integer variable.\n",lineno,yytext); + } + #ifdef DEBUG + fprintf(stderr,"Set %s to %s (%i)\n",mymsg,yytext,*yyip); + #endif + POP; + } <MULTI,ACTION>match_service { if(action.match_host) { |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 12:15:32
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084 Modified Files: ChangeLog TODO Log Message: Configuration file is versioned now. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** TODO 10 Aug 2004 08:36:36 -0000 1.32 --- TODO 10 Aug 2004 12:15:19 -0000 1.33 *************** *** 3,7 **** Now (for 0.4): - - versioning of configuration file, throw warning if config file is without version - run as daemon - configure: --with-pcre support --- 3,6 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ChangeLog 12 Mar 2004 00:04:03 -0000 1.22 --- ChangeLog 10 Aug 2004 12:15:19 -0000 1.23 *************** *** 5,8 **** --- 5,10 ---- - --enable-resize allows to cut line length to width of terminal, enabling this option could causes your lwatch to crash (oszer) + - versioning of configuration file, throw warning if config file is + without version 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) *************** *** 10,19 **** - -o means output file, use -O for omit config file (arturcz) - fifo_file in configuration file is deprecated, use input_file ! instead it (arturcz - new option output_file in configuration (arturcz) - new tests in ./configure for getopt_long (arturcz) - handle EOF - reopen fifo, close when input from stdin (arturcz) ! - colors with BOLD atribute available ! - FreeBSD port (arturcz) 0.2: - bugfix: too much manual files installed (arturcz) --- 12,21 ---- - -o means output file, use -O for omit config file (arturcz) - fifo_file in configuration file is deprecated, use input_file ! instead it (arturcz) - new option output_file in configuration (arturcz) - new tests in ./configure for getopt_long (arturcz) - handle EOF - reopen fifo, close when input from stdin (arturcz) ! - colors with BOLD atribute available (arturcz) ! - FreeBSD port (arturcz) 0.2: - bugfix: too much manual files installed (arturcz) |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 11:24:46
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20018 Modified Files: yparse.l Log Message: Dot (.) is a valid character in string parameter. Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** yparse.l 10 Aug 2004 09:02:10 -0000 1.25 --- yparse.l 10 Aug 2004 11:24:37 -0000 1.26 *************** *** 80,84 **** COMMENT #.* RETOKEN |\/ ! TEXT [a-zA-Z_0-9/-]* BOOL yes|no --- 80,84 ---- COMMENT #.* RETOKEN |\/ ! TEXT [a-zA-Z_0-9/.-]* BOOL yes|no |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 09:02:20
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27813/src Modified Files: lwatch.conf settings.c settings.h yparse.l Log Message: Code cleaning: - removed all references to create_fifo - fixed output of lwatch -h when compiled with terminal resizing support - stub for show_configure_options Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** settings.c 12 Jan 2004 21:23:18 -0000 1.27 --- settings.c 10 Aug 2004 09:02:10 -0000 1.28 *************** *** 86,89 **** --- 86,93 ---- } + void show_configure_options() { + printf("\nCompiled with some weird ./configure options\n"); + } + void show_usage() { int i; *************** *** 98,112 **** " -o, --output filename", "\twrite colored logs into filename instead of " DEF_OUT_FILE ",", - /* - " -c, --create-fifo", - "\tcreate fifo if does not exist", - */ " -s, --show-unparsed", ! "\tshows unparsed lines (like `last message repeated X times')", ! " -O, --omit-rc", #ifdef RESIZE " -t, --term-cut", ! "\tCut lines to terminal width", #endif "\tdo not read values from config file", " -h, --help", --- 102,112 ---- " -o, --output filename", "\twrite colored logs into filename instead of " DEF_OUT_FILE ",", " -s, --show-unparsed", ! "\tshow unparsed lines (like `last message repeated X times')", #ifdef RESIZE " -t, --term-cut", ! "\tcut lines to terminal width", #endif + " -O, --omit-rc", "\tdo not read values from config file", " -h, --help", *************** *** 128,132 **** {"input",1,0,'i'}, {"output",1,0,'o'}, - {"create-fifo",0,0,'c'}, {"show-unparsed",0,0,'s'}, {"omit-rc",0,0,'O'}, --- 128,131 ---- *************** *** 138,141 **** --- 137,141 ---- }; int idx,c; + int version=0; /* char *pc; //what I needed it for? */ *************** *** 147,151 **** #endif memset(&lw_conf,0,sizeof(lw_conf)); ! while((c=getopt_long(argc,argv,"vC:f:i:co:Osht",opt,&idx))!=EOF) { switch(c) { case 'C': --- 147,151 ---- #endif memset(&lw_conf,0,sizeof(lw_conf)); ! while((c=getopt_long(argc,argv,"vC:f:i:o:Osht",opt,&idx))!=EOF) { switch(c) { case 'C': *************** *** 183,192 **** } break; - case 'c': - lw_conf.create_fifo=1; - #ifdef DEBUG - fprintf(stderr,"Create fifo if doesn't exist\n"); - #endif - break; case 's': lw_conf.show_unparsed=1; --- 183,186 ---- Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** lwatch.conf 10 Aug 2004 08:32:17 -0000 1.23 --- lwatch.conf 10 Aug 2004 09:02:10 -0000 1.24 *************** *** 28,35 **** output_file=/dev/tty11 - # NOT SUPPORTED IN THIS RELEASE! - # create_fifo=no - # NOT SUPPORTED IN THIS RELEASE! - # What to do with unparsed lines like: # Mar 21 15:45:06 musashi -- MARK -- --- 28,31 ---- Index: settings.h =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** settings.h 11 Jan 2004 23:22:11 -0000 1.10 --- settings.h 10 Aug 2004 09:02:10 -0000 1.11 *************** *** 38,44 **** char in_file[MAXPATHLEN+1]; char out_file[MAXPATHLEN+1]; - int create_fifo; int show_unparsed; int term_cut; }; --- 38,45 ---- char in_file[MAXPATHLEN+1]; char out_file[MAXPATHLEN+1]; int show_unparsed; + #ifdef RESIZE int term_cut; + #endif }; Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** yparse.l 20 Jan 2004 20:55:34 -0000 1.24 --- yparse.l 10 Aug 2004 09:02:10 -0000 1.25 *************** *** 72,76 **** %option noyywrap nounput ! M_KEYWORD input_fifo|input_file|output_file|create_fifo|show_unparsed R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit --- 72,76 ---- %option noyywrap nounput ! M_KEYWORD input_fifo|input_file|output_file|show_unparsed R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight R_KEYWORD match_service|match_host|ignore|exit *************** *** 120,130 **** PUSH(TEXT); } - <INITIAL>create_fifo= { - yyip=&lw_conf.create_fifo; - #ifdef DEBUG - strcpy(mymsg,"create_fifo"); - #endif - PUSH(BOOLEAN); - } <INITIAL>show_unparsed= { yyip=&lw_conf.show_unparsed; --- 120,123 ---- |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 08:36:46
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24335 Modified Files: TODO Log Message: TODO update. Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** TODO 10 Aug 2004 08:22:34 -0000 1.31 --- TODO 10 Aug 2004 08:36:36 -0000 1.32 *************** *** 3,7 **** Now (for 0.4): ! - versioning of configuration file - run as daemon - configure: --with-pcre support --- 3,7 ---- Now (for 0.4): ! - versioning of configuration file, throw warning if config file is without version - run as daemon - configure: --with-pcre support *************** *** 12,15 **** --- 12,16 ---- Later (for 0.5): + - throw error if config file is without version - permanently remove input_fifo - support for growing regular files (like tail -f) |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 08:32:27
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23508 Modified Files: lwatch.conf Log Message: We have changed a default pipe location to /var/lwatch/syslog.fifo in configure.ac 1.40 Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** lwatch.conf 8 Apr 2003 14:03:06 -0000 1.22 --- lwatch.conf 10 Aug 2004 08:32:17 -0000 1.23 *************** *** 21,25 **** # if filename - it should be named fifo, where syslogd logs # - means: read from stdin (via tail -f logfile | lwatch ) ! input_file=/dev/lwatch # remember to configure your syslog # Where to print colored logs? --- 21,25 ---- # if filename - it should be named fifo, where syslogd logs # - means: read from stdin (via tail -f logfile | lwatch ) ! input_file=/var/lwatch/syslog.fifo # remember to configure your syslog # Where to print colored logs? |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 08:22:45
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21992 Modified Files: TODO Log Message: TODO update Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** TODO 12 Mar 2004 00:04:03 -0000 1.30 --- TODO 10 Aug 2004 08:22:34 -0000 1.31 *************** *** 16,20 **** - signal handling (reload configuration, reexec program) - enable cut line to $COLUMNS to fit in xterm (it requires some work ! to make it usable) - dealing with ip's in logs --- 16,20 ---- - signal handling (reload configuration, reexec program) - enable cut line to $COLUMNS to fit in xterm (it requires some work ! to make it usable) (arc: is this feature really needed?) - dealing with ip's in logs |
|
From: Artur R. C. <ar...@us...> - 2004-08-10 07:58:01
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17858 Modified Files: config.guess config.sub Log Message: Update: - config.guess: 2004-07-19 - config.sub: 2004-06-24 Index: config.guess =================================================================== RCS file: /cvsroot/lwatch/files/config.guess,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.guess 9 Aug 2004 00:30:41 -0000 1.5 --- config.guess 10 Aug 2004 07:57:52 -0000 1.6 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2004-03-12' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-07-19' # This file is free software; you can redistribute it and/or modify it *************** *** 54,58 **** Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 54,58 ---- Originally written by Per Bothner. ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 213,216 **** --- 213,219 ---- echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 228,234 **** echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} --- 231,234 ---- *************** *** 308,314 **** echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? --- 308,311 ---- *************** *** 765,769 **** exit 0 ;; *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) --- 762,766 ---- exit 0 ;; *:UNICOS/mp:*:*) ! echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) *************** *** 788,806 **** exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include <features.h> ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! # GNU/KFreeBSD systems have a "k" prefix to indicate we are using ! # FreeBSD's kernel, but not the complete OS. ! case ${LIBC} in gnu) kernel_only='k' ;; esac ! echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 785,789 ---- exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) *************** *** 1097,1103 **** echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1080,1086 ---- echo m68k-diab-dnix exit 0 ;; ! M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1261,1264 **** --- 1244,1254 ---- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac Index: config.sub =================================================================== RCS file: /cvsroot/lwatch/files/config.sub,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.sub 9 Aug 2004 00:30:41 -0000 1.5 --- config.sub 10 Aug 2004 07:57:52 -0000 1.6 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2004-03-12' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. ! timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. *************** *** 71,75 **** GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. --- 71,75 ---- GNU config.sub ($timestamp) ! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. *************** *** 146,150 **** -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis) os= basic_machine=$1 --- 146,150 ---- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ! -apple | -axis | -knuth | -cray) os= basic_machine=$1 *************** *** 301,305 **** | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ --- 301,305 ---- | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ! | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ *************** *** 327,332 **** | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 327,333 ---- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ *************** *** 446,449 **** --- 447,454 ---- os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; cr16c) basic_machine=cr16c-unknown *************** *** 660,667 **** basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k --- 665,668 ---- *************** *** 744,751 **** basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem --- 745,748 ---- *************** *** 1060,1063 **** --- 1057,1063 ---- basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm *************** *** 1375,1378 **** --- 1375,1381 ---- os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf |
|
From: Artur R. C. <ar...@us...> - 2004-08-09 00:38:53
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21171 Modified Files: aclocal.m4 Log Message: Regenerated with aclocal-1.8 Index: aclocal.m4 =================================================================== RCS file: /cvsroot/lwatch/files/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** aclocal.m4 3 Jan 2004 23:05:12 -0000 1.7 --- aclocal.m4 9 Aug 2004 00:38:45 -0000 1.8 *************** *** 1,5 **** ! # generated automatically by aclocal 1.7.9 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation --- 1,5 ---- ! # generated automatically by aclocal 1.8.5 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. [...1103 lines suppressed...] ! # One issue with vendor `install' (even GNU) is that you can't ! # specify the program used to strip binaries. This is especially ! # annoying in cross-compiling environments, where the build's strip ! # is unlikely to handle the host's binaries. ! # Fortunately install-sh will honor a STRIPPROG variable, so we ! # always use install-sh in `make install-strip', and initialize ! # STRIPPROG with the value of the STRIP variable (set by the user). ! AC_DEFUN([AM_PROG_INSTALL_STRIP], ! [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ! # Installed binaries are usually stripped using `strip' when the user ! # run `make install-strip'. However `strip' might not be the right ! # tool to use in cross-compilation environments, therefore Automake ! # will honor the `STRIP' environment variable to overrule this program. ! dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ! if test "$cross_compiling" != no; then ! AC_CHECK_TOOL([STRIP], [strip], :) ! fi ! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ! AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
|
From: Artur R. C. <ar...@us...> - 2004-08-09 00:30:51
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19911 Modified Files: config.guess config.sub Log Message: Update config.{guess,sub} to 2004-03-12 Index: config.guess =================================================================== RCS file: /cvsroot/lwatch/files/config.guess,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.guess 18 Mar 2003 16:34:34 -0000 1.4 --- config.guess 9 Aug 2004 00:30:41 -0000 1.5 *************** *** 2,8 **** # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-03' # This file is free software; you can redistribute it and/or modify it --- 2,8 ---- # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2004-03-12' # This file is free software; you can redistribute it and/or modify it *************** *** 99,118 **** # use `HOST_CC' if defined, but it is deprecated. ! # This shell variable is my proudest work .. or something. --bje ! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; ! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) ! || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; ! dummy=$tmpdir/dummy ; ! files="$dummy.c $dummy.o $dummy.rel $dummy" ; ! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do ! if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; --- 99,121 ---- # use `HOST_CC' if defined, but it is deprecated. ! # Portable tmp directory creation inspired by the Autoconf team. ! set_cc_for_build=' ! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ! : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ! { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ! dummy=$tmp/dummy ; ! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do ! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; *************** *** 121,126 **** ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ; ! unset files' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. --- 124,128 ---- ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. *************** *** 179,183 **** esac # The OS release ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: --- 181,196 ---- esac # The OS release ! # Debian GNU/NetBSD machines have a different userland, and ! # thus, need a distinct triplet. However, they do not need ! # kernel version information, so it can be replaced with a ! # suitable tag, in the style of linux-gnu. ! case "${UNAME_VERSION}" in ! Debian*) ! release='-gnu' ! ;; ! *) ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! ;; ! esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: *************** *** 185,188 **** --- 198,204 ---- echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 191,194 **** --- 207,213 ---- echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} *************** *** 209,212 **** --- 228,234 ---- echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + pegasos:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} *************** *** 224,292 **** echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; alpha:OSF1:*:*) ! if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! fi # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! eval $set_cc_for_build ! cat <<EOF >$dummy.s ! .data ! \$Lformat: ! .byte 37,100,45,37,120,10,0 # "%d-%x\n" ! ! .text ! .globl main ! .align 4 ! .ent main ! main: ! .frame \$30,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main ! EOF ! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null ! if test "$?" = 0 ; then ! case `$dummy` in ! 0-0) ! UNAME_MACHINE="alpha" ! ;; ! 1-0) ! UNAME_MACHINE="alphaev5" ! ;; ! 1-1) ! UNAME_MACHINE="alphaev56" ! ;; ! 1-101) ! UNAME_MACHINE="alphapca56" ! ;; ! 2-303) ! UNAME_MACHINE="alphaev6" ! ;; ! 2-307) ! UNAME_MACHINE="alphaev67" ! ;; ! 2-1307) ! UNAME_MACHINE="alphaev68" ! ;; ! 3-1307) ! UNAME_MACHINE="alphaev7" ! ;; ! esac ! fi ! rm -f $dummy.s $dummy && rmdir $tmpdir ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 246,313 ---- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) ! case $UNAME_RELEASE in ! *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ! ;; ! *5.*) ! UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ! ;; ! esac ! # According to Compaq, /usr/sbin/psrinfo has been available on ! # OSF/1 and Tru64 systems produced since 1995. I hope that ! # covers most systems running today. This code pipes the CPU ! # types through head -n 1, so we only detect the type of CPU 0. ! ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ! case "$ALPHA_CPU_TYPE" in ! "EV4 (21064)") ! UNAME_MACHINE="alpha" ;; ! "EV4.5 (21064)") ! UNAME_MACHINE="alpha" ;; ! "LCA4 (21066/21068)") ! UNAME_MACHINE="alpha" ;; ! "EV5 (21164)") ! UNAME_MACHINE="alphaev5" ;; ! "EV5.6 (21164A)") ! UNAME_MACHINE="alphaev56" ;; ! "EV5.6 (21164PC)") ! UNAME_MACHINE="alphapca56" ;; ! "EV5.7 (21164PC)") ! UNAME_MACHINE="alphapca57" ;; ! "EV6 (21264)") ! UNAME_MACHINE="alphaev6" ;; ! "EV6.7 (21264A)") ! UNAME_MACHINE="alphaev67" ;; ! "EV6.8CB (21264C)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8AL (21264B)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.8CX (21264D)") ! UNAME_MACHINE="alphaev68" ;; ! "EV6.9A (21264/EV69A)") ! UNAME_MACHINE="alphaev69" ;; ! "EV7 (21364)") ! UNAME_MACHINE="alphaev7" ;; ! "EV7.9 (21364A)") ! UNAME_MACHINE="alphaev79" ;; ! esac ! # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. ! echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ! exit 0 ;; ! Alpha*:OpenVMS:*:*) ! echo alpha-hp-vms exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 311,314 **** --- 332,338 ---- echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} *************** *** 328,331 **** --- 352,358 ---- echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in *************** *** 400,403 **** --- 427,433 ---- echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} *************** *** 438,445 **** } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; --- 468,474 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; *************** *** 450,454 **** echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS) echo powerpc-harris-powermax exit 0 ;; --- 479,483 ---- echo powerpc-harris-powermax exit 0 ;; ! Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax exit 0 ;; *************** *** 525,530 **** } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then --- 554,558 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then *************** *** 624,632 **** } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy && rmdir $tmpdir fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 652,670 ---- } EOF ! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; *************** *** 662,667 **** } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir echo unknown-hitachi-hiuxwe2 exit 0 ;; --- 700,704 ---- } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; *************** *** 721,727 **** echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 758,761 ---- *************** *** 730,733 **** --- 764,770 ---- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` *************** *** 736,739 **** --- 773,781 ---- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} *************** *** 757,762 **** EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! rm -f $dummy.c && rmdir $tmpdir ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) --- 799,806 ---- EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! # GNU/KFreeBSD systems have a "k" prefix to indicate we are using ! # FreeBSD's kernel, but not the complete OS. ! case ${LIBC} in gnu) kernel_only='k' ;; esac ! echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) *************** *** 769,774 **** echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:3*) ! echo i386-pc-interix3 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) --- 813,821 ---- echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; ! x86:Interix*:[34]*) ! echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' ! exit 0 ;; ! [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ! echo i${UNAME_MACHINE}-pc-mks exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) *************** *** 776,780 **** # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix exit 0 ;; i*:UWIN*:*) --- 823,827 ---- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i586-pc-interix exit 0 ;; i*:UWIN*:*) *************** *** 788,793 **** --- 835,845 ---- exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix *************** *** 796,802 **** --- 848,860 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 819,824 **** EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ;; ppc:Linux:*:*) --- 877,900 ---- EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) *************** *** 856,859 **** --- 932,938 ---- echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu *************** *** 913,919 **** #endif #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 --- 992,1000 ---- #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 *************** *** 933,936 **** --- 1014,1037 ---- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` *************** *** 967,973 **** fi exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; pc:*:*:*) # Left here for compatibility: --- 1068,1071 ---- *************** *** 996,1002 **** echo m68k-convergent-sysv exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ --- 1094,1103 ---- echo m68k-convergent-sysv exit 0 ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ *************** *** 1015,1021 **** echo m68k-atari-sysv4 exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} --- 1116,1119 ---- *************** *** 1099,1103 **** exit 0 ;; *:Darwin:*:*) ! echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) --- 1197,1205 ---- exit 0 ;; *:Darwin:*:*) ! case `uname -p` in ! *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; ! esac ! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) *************** *** 1112,1116 **** echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; --- 1214,1218 ---- echo i386-pc-qnx exit 0 ;; ! NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *************** *** 1135,1143 **** echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 --- 1237,1240 ---- *************** *** 1158,1166 **** echo pdp10-unknown-its exit 0 ;; ! i*86:XTS-300:*:STOP) ! echo ${UNAME_MACHINE}-unknown-stop exit 0 ;; ! i*86:atheos:*:*) ! echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; esac --- 1255,1263 ---- echo pdp10-unknown-its exit 0 ;; ! SEI:*:*:SEIUX) ! echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; ! *:DragonFly:*:*) ! echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; esac *************** *** 1284,1289 **** EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir # Apollos put the system type in the environment. --- 1381,1385 ---- EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. Index: config.sub =================================================================== RCS file: /cvsroot/lwatch/files/config.sub,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.sub 18 Mar 2003 16:34:39 -0000 1.4 --- config.sub 9 Aug 2004 00:30:41 -0000 1.5 *************** *** 2,8 **** # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # This file is (in principle) common to ALL GNU software. --- 2,8 ---- # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2004-03-12' # This file is (in principle) common to ALL GNU software. *************** *** 119,123 **** maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` --- 119,124 ---- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ ! kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` *************** *** 229,240 **** | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k \ ! | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ --- 230,242 ---- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ ! | ip2k | iq2000 \ ! | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ *************** *** 246,254 **** --- 248,259 ---- | mips64vr5000 | mips64vr5000el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ | openrisc | or32 \ *************** *** 256,264 **** | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ ! | tahoe | thumb | tic80 | tron \ | v850 | v850e \ | we32k \ --- 261,269 ---- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ ! | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ *************** *** 295,299 **** | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ --- 300,304 ---- | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ *************** *** 303,308 **** | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* \ ! | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ --- 308,313 ---- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ ! | ip2k-* | iq2000-* \ ! | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ *************** *** 316,324 **** | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39 | mipstx39el \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ --- 321,332 ---- | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39-* | mipstx39el-* \ ! | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ *************** *** 326,334 **** | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ --- 334,344 ---- | pyramid-* \ | romp-* | rs6000-* \ ! | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* \ ! | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ! | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ *************** *** 354,357 **** --- 364,370 ---- os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe *************** *** 368,371 **** --- 381,390 ---- os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl *************** *** 427,430 **** --- 446,453 ---- os=-unicos ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds *************** *** 433,436 **** --- 456,463 ---- basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 *************** *** 717,720 **** --- 744,751 ---- basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem *************** *** 728,731 **** --- 759,766 ---- os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson *************** *** 759,765 **** basic_machine=i686-pc ;; ! pentiumii | pentium2) basic_machine=i686-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` --- 794,803 ---- basic_machine=i686-pc ;; ! pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` *************** *** 768,774 **** basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumii-* | pentium2-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould --- 806,815 ---- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ! pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould *************** *** 829,832 **** --- 870,877 ---- basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent *************** *** 836,839 **** --- 881,887 ---- os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs *************** *** 902,909 **** os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray --- 950,953 ---- *************** *** 914,925 **** os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; tx39) basic_machine=mipstx39-unknown --- 958,973 ---- os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown *************** *** 935,938 **** --- 983,990 ---- basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd *************** *** 978,985 **** os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; xps | xps100) basic_machine=xps100-honeywell --- 1030,1033 ---- *************** *** 1028,1032 **** basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; --- 1076,1080 ---- basic_machine=we32k-att ;; ! sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; *************** *** 1034,1038 **** basic_machine=sh64-unknown ;; ! sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; --- 1082,1086 ---- basic_machine=sh64-unknown ;; ! sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; *************** *** 1107,1122 **** | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ ! | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) # Remember, each alternative MUST END IN *, to match a version number. ;; --- 1155,1172 ---- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ! | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ! | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ! | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ! | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; *************** *** 1130,1135 **** esac ;; -nto*) ! os=-nto-qnx ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ --- 1180,1187 ---- esac ;; + -nto-qnx*) + ;; -nto*) ! os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ *************** *** 1140,1143 **** --- 1192,1198 ---- os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` *************** *** 1152,1155 **** --- 1207,1213 ---- os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince *************** *** 1173,1176 **** --- 1231,1237 ---- os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd *************** *** 1195,1198 **** --- 1256,1262 ---- os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 *************** *** 1225,1228 **** --- 1289,1298 ---- os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; -none) ;; *************** *** 1256,1259 **** --- 1326,1332 ---- os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) *************** *** 1434,1440 **** --- 1507,1519 ---- vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs |
|
From: <ar...@us...> - 2004-03-12 00:31:05
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv641 Modified Files: ChangeLog TODO Log Message: Update ChangeLog TODO Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 12 Jan 2004 12:49:53 -0000 1.21 --- ChangeLog 12 Mar 2004 00:04:03 -0000 1.22 *************** *** 1,6 **** 0.4: - cleaned code to compile without warnings when -Wall is used, ! at least on x86 ! - input_fifo is obsoleted now, use input_file instead ! - fixed SEGV when run with -O and without -o 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) --- 1,8 ---- 0.4: - cleaned code to compile without warnings when -Wall is used, ! at least on Linux/i386 (arturcz) ! - input_fifo is obsoleted now, use input_file instead (arturcz) ! - fixed SEGV when run with -O and without -o (arturcz) ! - --enable-resize allows to cut line length to width of terminal, ! enabling this option could causes your lwatch to crash (oszer) 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** TODO 11 Mar 2004 22:37:15 -0000 1.29 --- TODO 12 Mar 2004 00:04:03 -0000 1.30 *************** *** 9,13 **** - debug/error messages should be printed to stderr/syslog - more documentation: complete lwatch(1), write lwatch.conf(5), edit INSTALL - - optionaly cut line to $COLUMNS to fit in xterm - option for dumping ./configure flags --- 9,12 ---- *************** *** 16,19 **** --- 15,20 ---- - support for growing regular files (like tail -f) - signal handling (reload configuration, reexec program) + - enable cut line to $COLUMNS to fit in xterm (it requires some work + to make it usable) - dealing with ip's in logs |
|
From: <ar...@us...> - 2004-03-12 00:10:43
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27651 Modified Files: control.h strpcre.c Log Message: The win_width variable is superfluous without --enable-resize Index: control.h =================================================================== RCS file: /cvsroot/lwatch/files/src/control.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** control.h 12 Jan 2004 11:17:55 -0000 1.7 --- control.h 11 Mar 2004 23:43:43 -0000 1.8 *************** *** 48,53 **** #ifdef RESIZE unsigned short int get_term_width(void); #endif extern int loop; - extern unsigned short int win_width; /* Window width */ --- 48,53 ---- #ifdef RESIZE unsigned short int get_term_width(void); + extern unsigned short int win_width; /* Window width */ #endif extern int loop; Index: strpcre.c =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** strpcre.c 2 Feb 2004 23:08:33 -0000 1.26 --- strpcre.c 11 Mar 2004 23:43:43 -0000 1.27 *************** *** 164,167 **** --- 164,168 ---- } + #ifdef RESIZE char* cut_line(char *output, char *input,int real_len) { *************** *** 193,196 **** --- 194,198 ---- return output; } + #endif void showline(char *input) { |
|
From: <ar...@us...> - 2004-03-11 23:51:57
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23820 Modified Files: configure.ac Log Message: Resize support is disabled by default. Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** configure.ac 11 Mar 2004 17:07:04 -0000 1.40 --- configure.ac 11 Mar 2004 23:24:58 -0000 1.41 *************** *** 133,137 **** AC_ARG_ENABLE(resize, AC_HELP_STRING([--enable-resize],[Compile with terminal resizing support]), , ! [enable_resize="yes"]) AC_MSG_RESULT($enable_resize) if test "$enable_resize" = "yes"; then --- 133,137 ---- AC_ARG_ENABLE(resize, AC_HELP_STRING([--enable-resize],[Compile with terminal resizing support]), , ! [enable_resize="no"]) AC_MSG_RESULT($enable_resize) if test "$enable_resize" = "yes"; then |
|
From: <os...@us...> - 2004-01-20 20:55:37
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31675
Modified Files:
yparse.l
Log Message:
Fixed output of debug messages from parser.
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** yparse.l 12 Jan 2004 21:19:41 -0000 1.23
--- yparse.l 20 Jan 2004 20:55:34 -0000 1.24
***************
*** 224,228 ****
}
#ifdef DEBUG
! printf("Set %s to %s (%i)\n",mymsg,yytext,*yyip);
#endif
POP;
--- 224,228 ----
}
#ifdef DEBUG
! fprintf(stderr,"Set %s to %s (%i)\n",mymsg,yytext,*yyip);
#endif
POP;
|
|
From: <os...@us...> - 2004-01-13 14:20:08
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16527
Modified Files:
strpcre.c
Log Message:
Code beat
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** strpcre.c 13 Jan 2004 14:09:58 -0000 1.23
--- strpcre.c 13 Jan 2004 14:20:05 -0000 1.24
***************
*** 168,172 ****
strncpy(output,input,strlen(input));
output[strlen(input)]=0;
- // printf("%d - %d = %d\n",real_len,win_width,to_cut);
if (to_cut<1) return output;
while (to_cut>0) {
--- 168,171 ----
***************
*** 174,183 ****
case '\n':
case '\0': break;
! case '0' ... '9': if (m<2) m++; else {to_cut-=m+1; m=0;}
! break;
case '^': if (m!=2) to_cut-=m+1;
! m=0;
break;
! default: to_cut--; break;
}
n--;
--- 173,184 ----
case '\n':
case '\0': break;
! case '0' ... '9': if (m<2) m++;
! else {to_cut-=m+1; m=0;}
! break;
case '^': if (m!=2) to_cut-=m+1;
! m=0;
break;
! default: to_cut--;
! break;
}
n--;
***************
*** 261,266 ****
MESG_COLOR,mesg_s);
#ifdef RESIZE
! if (lw_conf.term_cut) {cutstr=cut_line(cutstr,cstr,len-hl_num*6-17);
! cprintf(cutstr);} else cprintf(cstr);
free((void*)cutstr);
#else
--- 262,269 ----
MESG_COLOR,mesg_s);
#ifdef RESIZE
! if (lw_conf.term_cut) {
! cutstr=cut_line(cutstr,cstr,len-hl_num*6-17);
! cprintf(cutstr);
! } else cprintf(cstr);
free((void*)cutstr);
#else
|
|
From: <os...@us...> - 2004-01-13 14:10:35
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14614
Modified Files:
acolors.c
Log Message:
Fixed behaviour when atoi returns -1.
Index: acolors.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/acolors.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** acolors.c 10 Nov 2003 01:15:05 -0000 1.10
--- acolors.c 13 Jan 2004 14:10:33 -0000 1.11
***************
*** 118,121 ****
--- 118,122 ----
numer[2]='\0';
val=atoi(numer);
+ if (val<0) val=0;
if(val) {
col_stack[++col_stack_ptr]=val;
|
|
From: <os...@us...> - 2004-01-13 14:10:01
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14450
Modified Files:
strpcre.c
Log Message:
Fixed working without -t.
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** strpcre.c 12 Jan 2004 21:21:29 -0000 1.22
--- strpcre.c 13 Jan 2004 14:09:58 -0000 1.23
***************
*** 261,266 ****
MESG_COLOR,mesg_s);
#ifdef RESIZE
! if (lw_conf.term_cut) cutstr=cut_line(cutstr,cstr,len-hl_num*6-17);
! cprintf(cutstr);
free((void*)cutstr);
#else
--- 261,266 ----
MESG_COLOR,mesg_s);
#ifdef RESIZE
! if (lw_conf.term_cut) {cutstr=cut_line(cutstr,cstr,len-hl_num*6-17);
! cprintf(cutstr);} else cprintf(cstr);
free((void*)cutstr);
#else
|
|
From: <os...@us...> - 2004-01-12 21:23:21
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1:/tmp/cvs-serv26616 Modified Files: settings.c Log Message: Fixed debug message. Index: settings.c =================================================================== RCS file: /cvsroot/lwatch/files/src/settings.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** settings.c 12 Jan 2004 21:19:41 -0000 1.26 --- settings.c 12 Jan 2004 21:23:18 -0000 1.27 *************** *** 278,282 **** paction->serv_color, paction->mesg_color); ! fprintf(stderr,"Highlight: %i\nIgnore: %s\nMatch service: %s\n", paction->highlight_color, paction->ignore?"yes":"no", --- 278,282 ---- paction->serv_color, paction->mesg_color); ! fprintf(stderr,"Highlight: %i\nIgnore: %s\nExit: %s\nMatch service: %s\nMatch host: %s\n", paction->highlight_color, paction->ignore?"yes":"no", |
|
From: <os...@us...> - 2004-01-12 21:21:32
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1:/tmp/cvs-serv26157 Modified Files: strpcre.c Log Message: Term-cutting on actual edge of terminal. :) Index: strpcre.c =================================================================== RCS file: /cvsroot/lwatch/files/src/strpcre.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** strpcre.c 12 Jan 2004 21:19:41 -0000 1.21 --- strpcre.c 12 Jan 2004 21:21:29 -0000 1.22 *************** *** 261,265 **** MESG_COLOR,mesg_s); #ifdef RESIZE ! if (lw_conf.term_cut) cutstr=cut_line(cutstr,cstr,len-hl_num*6-5*3); cprintf(cutstr); free((void*)cutstr); --- 261,265 ---- MESG_COLOR,mesg_s); #ifdef RESIZE ! if (lw_conf.term_cut) cutstr=cut_line(cutstr,cstr,len-hl_num*6-17); cprintf(cutstr); free((void*)cutstr); |
|
From: <os...@us...> - 2004-01-12 21:19:44
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25718
Modified Files:
control.c lwatch.c settings.c strpcre.c yparse.l
Log Message:
Now output non-log messages to stderr.
Index: control.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** control.c 12 Jan 2004 18:42:36 -0000 1.18
--- control.c 12 Jan 2004 21:19:41 -0000 1.19
***************
*** 53,57 ****
retval=wsz.ws_col;
#ifdef DEBUG
! printf("Terminal width=%d\n",retval);
#endif
return retval;
--- 53,57 ----
retval=wsz.ws_col;
#ifdef DEBUG
! fprintf(stderr,"Terminal width=%d\n",retval);
#endif
return retval;
***************
*** 90,94 ****
}
#ifdef DEBUG
! printf("Received signal %i%s\n",i,loop?"":" - exiting");
#endif
if(ex) {
--- 90,94 ----
}
#ifdef DEBUG
! fprintf(stderr,"Received signal %i%s\n",i,loop?"":" - exiting");
#endif
if(ex) {
***************
*** 113,119 ****
i=0;
while(i<n) {
! printf("fd: %i res: %i\n",ufds[i].fd,res);
! printf("watch: %i\n",ufds[i].events);
! printf("return: %i\n",ufds[i++].revents);
}
}
--- 113,119 ----
i=0;
while(i<n) {
! fprintf(stderr,"fd: %i res: %i\n",ufds[i].fd,res);
! fprintf(stderr,"watch: %i\n",ufds[i].events);
! fprintf(stderr,"return: %i\n",ufds[i++].revents);
}
}
Index: lwatch.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** lwatch.c 12 Jan 2004 12:46:22 -0000 1.23
--- lwatch.c 12 Jan 2004 21:19:41 -0000 1.24
***************
*** 73,77 ****
fd=0;
#ifdef DEBUG
! printf("Input from stdin\n");
#endif
} else {
--- 73,77 ----
fd=0;
#ifdef DEBUG
! fprintf(stderr,"Input from stdin\n");
#endif
} else {
***************
*** 81,90 ****
io_check(fd=open(lw_conf.in_file,O_RDONLY),lw_conf.in_file);
#ifdef DEBUG
! printf("Input from %s\n",lw_conf.in_file);
#endif
}
if(strcmp(lw_conf.out_file,"-")==0) {
#ifdef DEBUG
! printf("Output to stdout\n");
#endif
} else {
--- 81,90 ----
io_check(fd=open(lw_conf.in_file,O_RDONLY),lw_conf.in_file);
#ifdef DEBUG
! fprintf(stderr,"Input from %s\n",lw_conf.in_file);
#endif
}
if(strcmp(lw_conf.out_file,"-")==0) {
#ifdef DEBUG
! fprintf(stderr,"Output to stdout\n");
#endif
} else {
***************
*** 92,96 ****
/* io_check(fd=open(lw_conf.out_file,O_WRONLY),lw_conf.out_file); */
#ifdef DEBUG
! printf("Output to %s\n",lw_conf.out_file);
#endif
}
--- 92,96 ----
/* io_check(fd=open(lw_conf.out_file,O_WRONLY),lw_conf.out_file); */
#ifdef DEBUG
! fprintf(stderr,"Output to %s\n",lw_conf.out_file);
#endif
}
***************
*** 110,114 ****
/* from fifo */
#ifdef DEBUG
! printf("syslog closed second end of fifo %s\nTrying to reopen\n",lw_conf.in_file);
#endif
/* trying to reopen or die */
--- 110,114 ----
/* from fifo */
#ifdef DEBUG
! fprintf(stderr,"syslog closed second end of fifo %s\nTrying to reopen\n",lw_conf.in_file);
#endif
/* trying to reopen or die */
***************
*** 118,122 ****
/* from stdin */
#ifdef DEBUG
! printf("end of file on stdin, exitting...\n");
#endif
loop=0;
--- 118,122 ----
/* from stdin */
#ifdef DEBUG
! fprintf(stderr,"end of file on stdin, exitting...\n");
#endif
loop=0;
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** settings.c 12 Jan 2004 18:42:36 -0000 1.25
--- settings.c 12 Jan 2004 21:19:41 -0000 1.26
***************
*** 144,148 ****
no_actions=0;
#ifdef DEBUG
! printf("Parse options\n");
#endif
memset(&lw_conf,0,sizeof(lw_conf));
--- 144,148 ----
no_actions=0;
#ifdef DEBUG
! fprintf(stderr,"Parse options\n");
#endif
memset(&lw_conf,0,sizeof(lw_conf));
***************
*** 155,166 ****
strncpy(lw_conf.conf_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! printf("Configuration file set to: %s\n",lw_conf.conf_file);
#endif
}
break;
case 'f':
! printf("USAGE OF --fifo AND -f IS DEPRECATED.\n");
! printf("PLEASE USE --input OR -i INSTEAD IT.\n");
! printf("OPTIONS --fifo AND -f ARE SUBJECTS TO REMOVE IN NEXT RELEASE.\n");
case 'i':
if(strlen(optarg)>MAXPATHLEN) {
--- 155,166 ----
strncpy(lw_conf.conf_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! fprintf(stderr,"Configuration file set to: %s\n",lw_conf.conf_file);
#endif
}
break;
case 'f':
! fprintf(stderr,"USAGE OF --fifo AND -f IS DEPRECATED.\n");
! fprintf(stderr,"PLEASE USE --input OR -i INSTEAD IT.\n");
! fprintf(stderr,"OPTIONS --fifo AND -f ARE SUBJECTS TO REMOVE IN NEXT RELEASE.\n");
case 'i':
if(strlen(optarg)>MAXPATHLEN) {
***************
*** 169,173 ****
strncpy(lw_conf.in_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! printf("Input file set to: %s\n",lw_conf.in_file);
#endif
}
--- 169,173 ----
strncpy(lw_conf.in_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! fprintf(stderr,"Input file set to: %s\n",lw_conf.in_file);
#endif
}
***************
*** 179,183 ****
strncpy(lw_conf.out_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! printf("Output file set to: %s\n",lw_conf.out_file);
#endif
}
--- 179,183 ----
strncpy(lw_conf.out_file,optarg,MAXPATHLEN);
#ifdef DEBUG
! fprintf(stderr,"Output file set to: %s\n",lw_conf.out_file);
#endif
}
***************
*** 186,190 ****
lw_conf.create_fifo=1;
#ifdef DEBUG
! printf("Create fifo if doesn't exist\n");
#endif
break;
--- 186,190 ----
lw_conf.create_fifo=1;
#ifdef DEBUG
! fprintf(stderr,"Create fifo if doesn't exist\n");
#endif
break;
***************
*** 192,196 ****
lw_conf.show_unparsed=1;
#ifdef DEBUG
! printf("Shows unparsed lines\n");
#endif
break;
--- 192,196 ----
lw_conf.show_unparsed=1;
#ifdef DEBUG
! fprintf(stderr,"Shows unparsed lines\n");
#endif
break;
***************
*** 198,202 ****
omit_config=1;
#ifdef DEBUG
! printf("Omit config file\n");
#endif
break;
--- 198,202 ----
omit_config=1;
#ifdef DEBUG
! fprintf(stderr,"Omit config file\n");
#endif
break;
***************
*** 205,209 ****
lw_conf.term_cut=1;
#ifdef DEBUG
! printf("Term-cut\n");
#endif
break;
--- 205,209 ----
lw_conf.term_cut=1;
#ifdef DEBUG
! fprintf(stderr,"Term-cut\n");
#endif
break;
***************
*** 235,247 ****
strncpy(lw_conf.conf_file,DEF_CONF_FILE,MAXPATHLEN);
#ifdef DEBUG
! printf("Open config file: %s\n",lw_conf.conf_file);
#endif
io_fcheck(yyin=fopen(lw_conf.conf_file,"r"),lw_conf.conf_file);
#ifdef DEBUG
! printf("Parse...\n");
#endif
yylex();
#ifdef DEBUG
! printf("Finished\n");
#endif
fclose(yyin);
--- 235,247 ----
strncpy(lw_conf.conf_file,DEF_CONF_FILE,MAXPATHLEN);
#ifdef DEBUG
! fprintf(stderr,"Open config file: %s\n",lw_conf.conf_file);
#endif
io_fcheck(yyin=fopen(lw_conf.conf_file,"r"),lw_conf.conf_file);
#ifdef DEBUG
! fprintf(stderr,"Parse...\n");
#endif
yylex();
#ifdef DEBUG
! fprintf(stderr,"Finished\n");
#endif
fclose(yyin);
***************
*** 253,257 ****
***************************************/
#ifdef DEBUG
! printf("date: %i, host: %i, serv: %i, mesg: %i\n",
lw_conf.def_date_color,
lw_conf.def_host_color,
--- 253,257 ----
***************************************/
#ifdef DEBUG
! fprintf(stderr,"date: %i, host: %i, serv: %i, mesg: %i\n",
lw_conf.def_date_color,
lw_conf.def_host_color,
***************
*** 271,276 ****
memcpy(&lw_actions[no_actions],paction,sizeof(struct s_action));
#ifdef DEBUG
! printf("vvvvvvvvvvvvvvvv\n");
! printf("RE: %s\ndate: [%i]\nhost: [%i]\nserv: [%i]\nmesg: [%i]\n",
paction->restr,
paction->date_color,
--- 271,276 ----
memcpy(&lw_actions[no_actions],paction,sizeof(struct s_action));
#ifdef DEBUG
! fprintf(stderr,"vvvvvvvvvvvvvvvv\n");
! fprintf(stderr,"RE: %s\ndate: [%i]\nhost: [%i]\nserv: [%i]\nmesg: [%i]\n",
paction->restr,
paction->date_color,
***************
*** 278,282 ****
paction->serv_color,
paction->mesg_color);
! printf("Highlight: %i\nIgnore: %s\nMatch service: %s\n",
paction->highlight_color,
paction->ignore?"yes":"no",
--- 278,282 ----
paction->serv_color,
paction->mesg_color);
! fprintf(stderr,"Highlight: %i\nIgnore: %s\nMatch service: %s\n",
paction->highlight_color,
paction->ignore?"yes":"no",
***************
*** 284,288 ****
paction->match_service?"yes":"no",
paction->match_host?"yes":"no");
! printf("^^^^^^^^^^^^^^^^\n");
#endif
no_actions++;
--- 284,288 ----
paction->match_service?"yes":"no",
paction->match_host?"yes":"no");
! fprintf(stderr,"^^^^^^^^^^^^^^^^\n");
#endif
no_actions++;
***************
*** 292,296 ****
while(no_actions--) {
#ifdef DEBUG
! printf("Freed resources for action [%i]%s\n",
no_actions,lw_actions[no_actions].restr);
#endif
--- 292,296 ----
while(no_actions--) {
#ifdef DEBUG
! fprintf(stderr,"Freed resources for action [%i]%s\n",
no_actions,lw_actions[no_actions].restr);
#endif
***************
*** 302,306 ****
free(lw_actions);
#ifdef DEBUG
! printf("Freed memory for actions\n");
#endif
}
--- 302,306 ----
free(lw_actions);
#ifdef DEBUG
! fprintf(stderr,"Freed memory for actions\n");
#endif
}
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** strpcre.c 12 Jan 2004 21:10:28 -0000 1.20
--- strpcre.c 12 Jan 2004 21:19:41 -0000 1.21
***************
*** 72,80 ****
#ifdef DEBUG
! printf("Compiling pattern: %s\n",re);
#endif
*pre=pcre_compile(re,PCRE_COPT,&re_error,&re_errno,NULL);
if(*pre==NULL) {
! printf("Regexp: %s\nCompile error %s at offset %d\n",
re,re_error,re_errno);
return(0);
--- 72,80 ----
#ifdef DEBUG
! fprintf(stderr,"Compiling pattern: %s\n",re);
#endif
*pre=pcre_compile(re,PCRE_COPT,&re_error,&re_errno,NULL);
if(*pre==NULL) {
! fprintf(stderr,"Regexp: %s\nCompile error %s at offset %d\n",
re,re_error,re_errno);
return(0);
***************
*** 82,86 ****
*prh=pcre_study(*pre,0,&re_error);
if(re_error!=NULL) {
! printf("Regexp: %s\nStuding error %s\n",re,re_error);
return(0);
}
--- 82,86 ----
*prh=pcre_study(*pre,0,&re_error);
if(re_error!=NULL) {
! fprintf(stderr,"Regexp: %s\nStuding error %s\n",re,re_error);
return(0);
}
***************
*** 98,102 ****
}
#ifdef DEBUG
! printf("Parser initialized\n");
#endif
}
--- 98,102 ----
}
#ifdef DEBUG
! fprintf(stderr,"Parser initialized\n");
#endif
}
***************
*** 105,109 ****
free_re(&parser.pre,&parser.prh);
#ifdef DEBUG
! printf("Parser freed\n");
#endif
}
--- 105,109 ----
free_re(&parser.pre,&parser.prh);
#ifdef DEBUG
! fprintf(stderr,"Parser freed\n");
#endif
}
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** yparse.l 11 Jan 2004 21:49:08 -0000 1.22
--- yparse.l 12 Jan 2004 21:19:41 -0000 1.23
***************
*** 203,207 ****
POP;
#ifdef DEBUG
! printf("Set %s to %s[%i]\n",mymsg,yytext,*yyip);
#endif
}
--- 203,207 ----
POP;
#ifdef DEBUG
! fprintf(stderr,"Set %s to %s[%i]\n",mymsg,yytext,*yyip);
#endif
}
***************
*** 213,217 ****
strcpy(yypch,yytext);
#ifdef DEBUG
! printf("Set %s to %s\n",mymsg,yytext);
#endif
}
--- 213,217 ----
strcpy(yypch,yytext);
#ifdef DEBUG
! fprintf(stderr,"Set %s to %s\n",mymsg,yytext);
#endif
}
***************
*** 234,238 ****
action.match_service=1;
#ifdef DEBUG
! printf("Match service instead message\n");
#endif
}
--- 234,238 ----
action.match_service=1;
#ifdef DEBUG
! fprintf(stderr,"Match service instead message\n");
#endif
}
***************
*** 243,247 ****
}
#ifdef DEBUG
! printf("Match hostname instead message\n");
#endif
}
--- 243,247 ----
}
#ifdef DEBUG
! fprintf(stderr,"Match hostname instead message\n");
#endif
}
***************
*** 250,254 ****
action.exit=1;
#ifdef DEBUG
! printf("Ignore RE\n");
#endif
}
--- 250,254 ----
action.exit=1;
#ifdef DEBUG
! fprintf(stderr,"Ignore RE\n");
#endif
}
***************
*** 256,260 ****
action.exit=1;
#ifdef DEBUG
! printf("Exit on action\n");
#endif
}
--- 256,260 ----
action.exit=1;
#ifdef DEBUG
! fprintf(stderr,"Exit on action\n");
#endif
}
|
|
From: <os...@us...> - 2004-01-12 21:10:31
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22964/src
Modified Files:
strpcre.c
Log Message:
Working truncating lines.
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** strpcre.c 12 Jan 2004 18:42:36 -0000 1.19
--- strpcre.c 12 Jan 2004 21:10:28 -0000 1.20
***************
*** 165,176 ****
char* cut_line(char *output, char *input,int real_len)
{
! int to_cut=real_len-win_width;
! printf("%d - %d = %d\n",real_len,win_width,to_cut);
! if (to_cut<1) {output=input; return output;}
strncpy(output,input,strlen(input));
! output[strlen(input)-to_cut+1]=0;
! while (to_cut) {
! to_cut--;
}
return output;
}
--- 165,188 ----
char* cut_line(char *output, char *input,int real_len)
{
! int to_cut=real_len-win_width, n=strlen(input), m=0;
strncpy(output,input,strlen(input));
! output[strlen(input)]=0;
! // printf("%d - %d = %d\n",real_len,win_width,to_cut);
! if (to_cut<1) return output;
! while (to_cut>0) {
! switch (output[n]) {
! case '\n':
! case '\0': break;
! case '0' ... '9': if (m<2) m++; else {to_cut-=m+1; m=0;}
! break;
! case '^': if (m!=2) to_cut-=m+1;
! m=0;
! break;
! default: to_cut--; break;
! }
! n--;
}
+ output[n+1]='\n';
+ output[n+2]=0;
return output;
}
|
