Author: mwinkler Date: Thu Feb 24 19:47:34 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 2.0.4
---- Files affected:
SOURCES:
sarg-font.patch (1.1 -> 1.2) , sarg-paths.patch (1.1 -> 1.2) ,
sarg-quiet.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/sarg-font.patch
diff -u SOURCES/sarg-font.patch:1.1 SOURCES/sarg-font.patch:1.2
--- SOURCES/sarg-font.patch:1.1 Tue Nov 2 14:46:32 2004
+++ SOURCES/sarg-font.patch Thu Feb 24 20:47:28 2005
@@ -1,12 +1,11 @@
-diff -dur sarg-2.0.1.org/grepday.c sarg-2.0.1/grepday.c
---- sarg-2.0.1.org/grepday.c 2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/grepday.c 2004-10-29 21:14:16.962246365 +0200
-@@ -235,7 +235,7 @@
- return;
- }
-
-- sprintf(font1,"%s/fonts/Verdana.TTF",SYSCONFDIR);
-+ strcpy(font1,"/usr/share/fonts/TTF/luxisr.ttf");
-
- im = gdImageCreate(720, 480);
+--- sarg-2.0.4-orig/grepday.c 2005-02-24 13:35:33.000000000 +0100
++++ sarg-2.0.4/grepday.c 2005-02-24 20:27:35.000000000 +0100
+@@ -33,7 +33,7 @@
+ int silver;
+ int black;
+ int x1;
+-char *font1 = SYSCONFDIR"/fonts/Verdana.TTF";
++char *font1 = "/usr/share/fonts/TTF/luxisr.ttf";
+ char s[15];
+ void *bar(long long int *n)
================================================================
Index: SOURCES/sarg-paths.patch
diff -u SOURCES/sarg-paths.patch:1.1 SOURCES/sarg-paths.patch:1.2
--- SOURCES/sarg-paths.patch:1.1 Tue Nov 2 16:03:40 2004
+++ SOURCES/sarg-paths.patch Thu Feb 24 20:47:29 2005
@@ -10,15 +10,14 @@
if((fp_text=fopen(warea,"r"))==NULL) {
fprintf(stderr, "SARG: (language) Cannot open language file:
%s\n",warea);
-diff -dur sarg-2.0.1.orig/util.c sarg-2.0.1/util.c
---- sarg-2.0.1.orig/util.c 2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/util.c 2004-11-02 15:24:52.599711855 +0100
-@@ -545,7 +545,7 @@
- sprintf(wdir,"date >%s/%s",dirname2,"date");
+--- sarg-2.0.4-orig/util.c 2005-02-21 19:13:21.000000000 +0100
++++ sarg-2.0.4/util.c 2005-02-24 20:30:50.000000000 +0100
+@@ -678,7 +678,7 @@
+ sprintf(wdir,"date >%s/%s",dirname,"date");
system(wdir);
- sprintf(per2,"%s/images",SYSCONFDIR);
+ sprintf(per2,"%s/images","/usr/share/sarg");
+
dirp = opendir(per2);
- while ((direntp = readdir( dirp )) != NULL ){
- if(strncmp(direntp->d_name,".",1) == 0)
+ if(dirp==NULL) {
================================================================
Index: SOURCES/sarg-quiet.patch
diff -u SOURCES/sarg-quiet.patch:1.1 SOURCES/sarg-quiet.patch:1.2
--- SOURCES/sarg-quiet.patch:1.1 Thu Nov 4 10:36:55 2004
+++ SOURCES/sarg-quiet.patch Thu Feb 24 20:47:29 2005
@@ -1,6 +1,5 @@
-diff -dur sarg-2.0.1.orig/decomp.c sarg-2.0.1/decomp.c
---- sarg-2.0.1.orig/decomp.c 2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/decomp.c 2004-11-04 09:58:26.994384347 +0100
+--- sarg-2.0.4-orig/decomp.c 2005-02-21 19:13:21.000000000 +0100
++++ sarg-2.0.4/decomp.c 2005-02-24 20:37:41.000000000 +0100
@@ -34,8 +34,10 @@
}
@@ -40,19 +39,18 @@
sprintf(cmd,"uncompress %s",arq);
system(cmd);
arq[strlen(arq)-2]='\0';
-diff -dur sarg-2.0.1.orig/log.c sarg-2.0.1/log.c
---- sarg-2.0.1.orig/log.c 2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/log.c 2004-11-04 09:59:07.549405284 +0100
-@@ -717,8 +717,10 @@
- if(strcmp(ShowReadStatistics,"yes") == 0) {
- perc=recs2 * 100;
- perc=perc / recs1;
-- printf("SARG: Records in file: %d, reading: %3.2f%%\r",recs1,perc);
-- fflush (stdout);
-+ if (debug) {
-+ printf("SARG: Records in file: %d, reading:
%3.2f%%\r",recs1,perc);
-+ fflush (stdout);
-+ }
- }
- if(!bufz[0]) continue;
- if(strstr(bufz,"HTTP/0.0") != 0) continue;
+--- sarg-2.0.4-orig/log.c 2005-02-22 15:06:18.000000000 +0100
++++ sarg-2.0.4/log.c 2005-02-24 20:38:42.000000000 +0100
+@@ -765,8 +765,10 @@
+ recs1++;
+ rewind(fp_in);
+
+- printf("SARG: Records in file: %d, reading: %3.2f%%\r",recs1,(float) 0);
+- fflush( stdout ) ;
++ if (debug) {
++ printf("SARG: Records in file: %d, reading: %3.2f%%\r",recs1,perc);
++ fflush (stdout);
++ }
+ }
+
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/sarg-font.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/sarg-paths.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/sarg-quiet.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
