Changeset 769

Timestamp:

01/06/10 19:52:19 (2 months ago)

Author:

PavelVinogradov

Message:

Partial merge of [366] from branches/1.2.x

Location:

branches/1.1.x

Files:

• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)
• demon.c (modified) (4 diffs)
• logtool.c (modified) (4 diffs)

branches/1.1.x/configure

@@ -5664 +5664 @@
 fi
 MYSQLLIBS="-L$DST_MYSQL_LIBS -lmysqlclient"
-CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
+CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 
 ####
@@ -5762 +5762 @@
 fi
 PCRELIBS="-L$DST_PCRE_LIBS -lpcre"
-CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
+#CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
 
 echo "#include \"$DST_PCRE_INC/pcre.h\"" >pcre.h

branches/1.1.x/configure.in

@@ -175 +175 @@
 fi
 MYSQLLIBS="-L$DST_MYSQL_LIBS -lmysqlclient"
-CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
+CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64"
 
 ####
@@ -245 +245 @@
 fi
 PCRELIBS="-L$DST_PCRE_LIBS -lpcre"
-CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
+#CFLAGS="-O2 -Wall -D_BSD_SOURCE=1 -D_GNU_SOURCE=1"
 
 echo "#include \"$DST_PCRE_INC/pcre.h\"" >pcre.h

branches/1.1.x/demon.c

@@ -20 +20 @@
 
 int EMPTY;
-long ENDVALUE;
-long NEWENDVALUE;
+//long ENDVALUE;
+size_t ENDVALUE;
+size_t NEWENDVALUE;
 
 int RIPC;
@@ -91 +92 @@
 
 
-long GetNewEndValue()
+size_t GetNewEndValue()
 {
-  long value;
-  FILE *finp;
+  struct stat st;
 
   trim(&path[0]);
   sprintf(&path[0],"%s/%s",conf.logdir,conf.logfile);
-  if((finp=fopen( &path[0], "rb" ))==NULL)
-    {
-         printf("Don't open file %s/%s\n",conf.logdir,conf.logfile);
-         return(0);
-    }
-  fseek(finp,0,SEEK_END);
-  value=ftell(finp);
-  fclose(finp);
-  return(value);
+  lstat(&path[0],&st);
+  return(st.st_size);
 }
 
@@ -146 +139 @@
   
   int userflag=0;
-  double ENDVALUE2;
+  size_t ENDVALUE2;
 
   sprintf(&path[0],"%s/%s",conf.logdir,conf.logfile);
@@ -857 +850 @@
       if(DEBUG>0)
         {
-          printf("Reading file: start=%ld length=%ld\n",ENDVALUE,NEWENDVALUE);
+          printf("Reading file: start=%lu length=%lu\n",ENDVALUE,NEWENDVALUE);
         }
 

branches/1.1.x/logtool.c

@@ -112 +112 @@
           return(-1);
         }  
+//  if((int)str[10]!=0x2E && (int)str[14]!=0x20 && (int)str[21]!=0x20)
     }  
   if(strlen(str)<60)
@@ -307 +308 @@
                 }        
         }
-  } else {
+  } 
+  else 
+  {
         /* If user ask https page, we get url like: domain.name:443 */
         if ( pcre_exec(re, NULL, url, strlen(url), 0, 0, re_ovector, 30) >= 0 ) {
@@ -318 +321 @@
                         if (url[i] == ':')
                         { /* We found :<port>. Stop parse */
-                                break;
                         } else {
                                 DNS.url[count]=url[i];
@@ -334 +336 @@
         }
   }
-  
   /**  ÉÝÅÍ × ÓÐÉÓËÅ ÌÏËÁÌØÎÙÈ ÈÏÓÔÏ× **/
   /* ÐÏÌÕÞÁÅÍ ÄÏÍÅÎÎÏÅ ÉÍÑ*/