From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Tue, 30 Jun 2009 07:41:08 +0000 (+0000)
Subject: Patch #2657320 applied.
X-Git-Tag: v2_2_6~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed1ac52fb9ea03c487397a62cae3443112e6c929;p=thirdparty%2Fsarg.git

Patch #2657320 applied.
Fix #else #if into #elif.
---

diff --git a/log.c b/log.c
index e837f68..beb8bbf 100644
--- a/log.c
+++ b/log.c
@@ -108,6 +108,7 @@ int main(argc,argv)
    int  dns=0;
    int  fuser=0;
    int  idata=0;
+   int  mindate=0;
    int  narq=0;
    int  iarq=0;
    int  exstring=0;
@@ -658,7 +659,7 @@ int main(argc,argv)
    if (strlen(Ulimit) > 0) {
 #if defined(RLIMIT_NOFILE)
       getrlimit (RLIMIT_NOFILE, &rl);
-#else #if defined(RLIMIT_OFILE)
+#elif defined(RLIMIT_OFILE)
       getrlimit (RLIMIT_OFILE, &rl);
 #endif
       l1 = rl.rlim_cur;
@@ -669,7 +670,7 @@ int main(argc,argv)
          rl.rlim_max = atol(Ulimit);
  #if defined(RLIMIT_NOFILE)
          if(setrlimit (RLIMIT_NOFILE, &rl) == -1) {
- #else #if defined(RLIMIT_OFILE)
+ #elif defined(RLIMIT_OFILE)
          if(setrlimit (RLIMIT_OFILE, &rl) == -1) {
  #endif
             sprintf(msg,"setrlimit error - %s\n",strerror(errno));
@@ -1454,8 +1455,9 @@ int main(argc,argv)
                  }
               }
        
-              if(!totper && !sarglog){
-	         totper++;
+              if((!totper || idata<mindate) && !sarglog){
+	             totper++;
+                 mindate=idata;
                  sprintf(period,"%s-",tbuf);
                  sprintf(per_hour,"%s-",tbuf2);
                  if(strlen(date)>0)