From: Frédéric Marchal Date: Thu, 25 Jun 2009 07:33:08 +0000 (+0000) Subject: Changed Pedro's address in headers. X-Git-Tag: v2_2_6~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c37945eda29a3def656e991587127c376e4edd05;p=thirdparty%2Fsarg.git Changed Pedro's address in headers. Changed the line ending of the files that ended with CRLF to the unix standard. --- diff --git a/DONATIONS b/DONATIONS index a5eb96c..a098f76 100644 --- a/DONATIONS +++ b/DONATIONS @@ -1,3 +1,3 @@ -If you like SARG and want to contribute, please go to http://sarg.sourceforge.net +If you like SARG please contribute, go to http://sarg.sourceforge.net Thank you diff --git a/auth.c b/auth.c index 7aad8ba..332c6b1 100644 --- a/auth.c +++ b/auth.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/authfail.c b/authfail.c index d3b0c63..0950520 100644 --- a/authfail.c +++ b/authfail.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/charset.c b/charset.c index 4a08deb..8d1f6cd 100644 --- a/charset.c +++ b/charset.c @@ -1,66 +1,66 @@ -/* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg.sourceforge.net - * - * SARG donations: - * please look at http://sarg.sourceforge.net/donations.php - * --------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * - */ - -#include "include/conf.h" - -void ccharset() -{ - - if(strcmp(CharSet,"Latin2") == 0) - strcpy(CharSet,"ISO-8859-2"); - - if(strcmp(CharSet,"Latin3") == 0) - strcpy(CharSet,"ISO-8859-3"); - - if(strcmp(CharSet,"Latin4") == 0) - strcpy(CharSet,"ISO-8859-4"); - - if(strcmp(CharSet,"Cyrillic") == 0) - strcpy(CharSet,"ISO-8859-5"); - - if(strcmp(CharSet,"Arabic") == 0) - strcpy(CharSet,"ISO-8859-6"); - - if(strcmp(CharSet,"Greek") == 0) - strcpy(CharSet,"ISO-8859-7"); - - if(strcmp(CharSet,"Hebrew") == 0) - strcpy(CharSet,"ISO-8859-8"); - - if(strcmp(CharSet,"Latin5") == 0) - strcpy(CharSet,"ISO-8859-9"); - - if(strcmp(CharSet,"Latin6") == 0) - strcpy(CharSet,"ISO-8859-10"); - - if(strcmp(CharSet,"Windows-1251") == 0) - strcpy(CharSet,"Windows-1251"); - - if(strcmp(CharSet,"Koi8-r") == 0) - strcpy(CharSet,"KOI8-R"); - - return; - -} +/* + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net + * + * SARG donations: + * please look at http://sarg.sourceforge.net/donations.php + * --------------------------------------------------------------------- + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#include "include/conf.h" + +void ccharset() +{ + + if(strcmp(CharSet,"Latin2") == 0) + strcpy(CharSet,"ISO-8859-2"); + + if(strcmp(CharSet,"Latin3") == 0) + strcpy(CharSet,"ISO-8859-3"); + + if(strcmp(CharSet,"Latin4") == 0) + strcpy(CharSet,"ISO-8859-4"); + + if(strcmp(CharSet,"Cyrillic") == 0) + strcpy(CharSet,"ISO-8859-5"); + + if(strcmp(CharSet,"Arabic") == 0) + strcpy(CharSet,"ISO-8859-6"); + + if(strcmp(CharSet,"Greek") == 0) + strcpy(CharSet,"ISO-8859-7"); + + if(strcmp(CharSet,"Hebrew") == 0) + strcpy(CharSet,"ISO-8859-8"); + + if(strcmp(CharSet,"Latin5") == 0) + strcpy(CharSet,"ISO-8859-9"); + + if(strcmp(CharSet,"Latin6") == 0) + strcpy(CharSet,"ISO-8859-10"); + + if(strcmp(CharSet,"Windows-1251") == 0) + strcpy(CharSet,"Windows-1251"); + + if(strcmp(CharSet,"Koi8-r") == 0) + strcpy(CharSet,"KOI8-R"); + + return; + +} diff --git a/convlog.c b/convlog.c index f0deeda..ab1e3e7 100644 --- a/convlog.c +++ b/convlog.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/css.c b/css.c index cd7c3aa..4469190 100644 --- a/css.c +++ b/css.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/dansguardian_log.c b/dansguardian_log.c index 920e464..ce690b8 100644 --- a/dansguardian_log.c +++ b/dansguardian_log.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/dansguardian_report.c b/dansguardian_report.c index 3c1b18d..d87b8e9 100644 --- a/dansguardian_report.c +++ b/dansguardian_report.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/datafile.c b/datafile.c index d324365..e2b2ef3 100644 --- a/datafile.c +++ b/datafile.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/decomp.c b/decomp.c index a4a5c7e..db59cf2 100644 --- a/decomp.c +++ b/decomp.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/denied.c b/denied.c index b0fbafd..651f634 100644 --- a/denied.c +++ b/denied.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/download.c b/download.c index 0610ccc..72506a1 100644 --- a/download.c +++ b/download.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/email.c b/email.c index 98f3e85..1606799 100644 --- a/email.c +++ b/email.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/exclude.c b/exclude.c index 50ff23f..d1ff83d 100644 --- a/exclude.c +++ b/exclude.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/getconf.c b/getconf.c index 140da75..0718add 100644 --- a/getconf.c +++ b/getconf.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/grepday.c b/grepday.c index 4043d26..5e53679 100644 --- a/grepday.c +++ b/grepday.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/index.c b/index.c index ff2bc73..32e39f3 100644 --- a/index.c +++ b/index.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/indexonly.c b/indexonly.c index 7ea5577..507392d 100644 --- a/indexonly.c +++ b/indexonly.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/ip2name.c b/ip2name.c index debdd02..8465861 100644 --- a/ip2name.c +++ b/ip2name.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/language.c b/language.c index 268ef1a..9604af4 100644 --- a/language.c +++ b/language.c @@ -1,55 +1,55 @@ -/* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 - * SARG Squid Analysis Report Generator http://sarg.sourceforge.net - * - * SARG donations: - * please look at http://sarg.sourceforge.net/donations.php - * --------------------------------------------------------------------- - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * - */ - -#include "include/conf.h" - -void language_load(char *language) -{ - - FILE *fp_text; - int record=0; - - sprintf(warea,"%s/languages/%s",SYSCONFDIR,language); - - if((fp_text=fopen(warea,"r"))==NULL) { - fprintf(stderr, "SARG: (language) Cannot open language file: %s\n",warea); - exit(1); - } - - while(fgets(buf,MAXLEN,fp_text)!=NULL) { - getword(warea,buf,'"'); - getword(warea,buf,'"'); - strcpy(text[record],warea); - - if(langcode) - printf("%d %s\n",record,warea); - - record++; - } - - fclose(fp_text); - - return; -} +/* + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 + * SARG Squid Analysis Report Generator http://sarg.sourceforge.net + * + * SARG donations: + * please look at http://sarg.sourceforge.net/donations.php + * --------------------------------------------------------------------- + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#include "include/conf.h" + +void language_load(char *language) +{ + + FILE *fp_text; + int record=0; + + sprintf(warea,"%s/languages/%s",SYSCONFDIR,language); + + if((fp_text=fopen(warea,"r"))==NULL) { + fprintf(stderr, "SARG: (language) Cannot open language file: %s\n",warea); + exit(1); + } + + while(fgets(buf,MAXLEN,fp_text)!=NULL) { + getword(warea,buf,'"'); + getword(warea,buf,'"'); + strcpy(text[record],warea); + + if(langcode) + printf("%d %s\n",record,warea); + + record++; + } + + fclose(fp_text); + + return; +} diff --git a/lastlog.c b/lastlog.c index 56c0a1c..e2ec99c 100644 --- a/lastlog.c +++ b/lastlog.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/log.c b/log.c index f92f8f8..e6d84d5 100644 --- a/log.c +++ b/log.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/repday.c b/repday.c index e9cb490..02562e6 100644 --- a/repday.c +++ b/repday.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/report.c b/report.c index 5cc52ec..116b2fa 100644 --- a/report.c +++ b/report.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/siteuser.c b/siteuser.c index 7c193e8..52cb2bd 100644 --- a/siteuser.c +++ b/siteuser.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/smartfilter.c b/smartfilter.c index 66cea12..c38c9ac 100644 --- a/smartfilter.c +++ b/smartfilter.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/sort.c b/sort.c index 48e936f..736968b 100644 --- a/sort.c +++ b/sort.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/splitlog.c b/splitlog.c index 6eaa1da..6dbb5e3 100644 --- a/splitlog.c +++ b/splitlog.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/squidguard_log.c b/squidguard_log.c index 54808b1..bf5eb11 100644 --- a/squidguard_log.c +++ b/squidguard_log.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/squidguard_report.c b/squidguard_report.c index ca6c4e6..6bd0426 100644 --- a/squidguard_report.c +++ b/squidguard_report.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/topsites.c b/topsites.c index 11c6e8c..0cf74a0 100644 --- a/topsites.c +++ b/topsites.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/topuser.c b/topuser.c index 36b1c07..55a9795 100644 --- a/topuser.c +++ b/topuser.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/totday.c b/totday.c index 4d01338..476593f 100644 --- a/totday.c +++ b/totday.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/totger.c b/totger.c index 6c4130f..a6fed1b 100644 --- a/totger.c +++ b/totger.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/usage.c b/usage.c index 2b19c1d..cadea24 100644 --- a/usage.c +++ b/usage.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/useragent.c b/useragent.c index 1457521..bbb7a53 100644 --- a/useragent.c +++ b/useragent.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: diff --git a/util.c b/util.c index 77067bf..0eace43 100644 --- a/util.c +++ b/util.c @@ -1,6 +1,6 @@ /* - * AUTHOR: Pedro Lineu Orso orso@penguintech.com.br - * 1998, 2005 + * AUTHOR: Pedro Lineu Orso pedro.orso@gmail.com + * 1998, 2008 * SARG Squid Analysis Report Generator http://sarg.sourceforge.net * * SARG donations: