SOURCES: sarg-font.patch, sarg-quiet.patch - 2.2.5

[areq]

Author: areq                         Date: Fri Aug 22 15:57:39 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.2.5

---- Files affected:
SOURCES:
   sarg-font.patch (1.3 -> 1.4) , sarg-quiet.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/sarg-font.patch
diff -u SOURCES/sarg-font.patch:1.3 SOURCES/sarg-font.patch:1.4
--- SOURCES/sarg-font.patch:1.3	Mon Jan  9 22:07:29 2006
+++ SOURCES/sarg-font.patch	Fri Aug 22 17:57:33 2008
@@ -1,11 +1,11 @@
 --- sarg-2.1.orig/grepday.c	2006-01-04 22:47:25.000000000 +0100
 +++ sarg-2.1/grepday.c	2006-01-09 21:59:28.000000000 +0100
-@@ -36,7 +36,7 @@
- int silver;
+@@ -37,7 +37,7 @@
  int black;
  int x1;
--char *font1 = SYSCONFDIR"/fonts/FreeSans.ttf";
+ //char *font1 = SYSCONFDIR"/fonts/FreeSans.ttf";
+-char *font1 = SYSCONFDIR"/fonts/DejaVuSans.ttf";
 +char *font1 = "/usr/share/fonts/TTF/luxisr.ttf";
  char s[15];
  
- #ifdef HAVE_ICONV_H
+ #if defined(HAVE_GD) && defined(HAVE_ICONV_H) && defined(gdFTEX_Unicode)

================================================================
Index: SOURCES/sarg-quiet.patch
diff -u SOURCES/sarg-quiet.patch:1.2 SOURCES/sarg-quiet.patch:1.3
--- SOURCES/sarg-quiet.patch:1.2	Thu Feb 24 20:47:29 2005
+++ SOURCES/sarg-quiet.patch	Fri Aug 22 17:57:34 2008
@@ -41,16 +41,14 @@
        arq[strlen(arq)-2]='\0';
 --- 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);
+@@ -778,8 +778,10 @@
  
--      printf("SARG: Records in file: %d, reading: %3.2f%%\r",recs1,(float) 0);
--      fflush( stdout ) ;
+       while( fgets(bufz,sizeof(bufz),fp_in) != NULL ) recs1++;
+       rewind(fp_in);
 +      if (debug) {
-+	printf("SARG: Records in file: %d, reading: %3.2f%%\r",recs1,perc);
-+	fflush (stdout);
+       printf("SARG: Records in file: " OFFSET_STRING ", reading: %3.2f%%\r",recs1,(float) 0);
+       fflush( stdout ) ;
 +      }
     }
     
-     
+    while(fgets(bufz,sizeof(bufz),fp_in)!=NULL) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/sarg-font.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/sarg-quiet.patch?r1=1.2&r2=1.3&f=u