ehm

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index 3793a2ae79bb9240109d3a41d5c708ab5dbc622c..af2b718b35d83ab90cc0eeb4eb02de4ff81895c0 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -33,7 +33,7 @@
 \r
 #include "cll1-0.6.h"\r
 \r
-const char *version = "0.8.1-a"; \r
+const char *version = "0.8.1-b"; \r
 \r
 /* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */\r
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
@@ -641,12 +641,13 @@ struct IpLog
 \r
 void parse_ip_log(int argc, char **argv) \r
 {\r
- char *month, *year, *str, *name, *ptr, *ptr2;\r
+ char *month, *year, *str, *name, *ptr, *ptr2, *filename;\r
  long traffic, traffic_month, total=0, guaranted;\r
  int col, col2, y_ok, m_ok, accept_month, i=1, any_month=0;\r
  char mstr[4], ystr[5];\r
  FILE *f; \r
  string(str,STRLEN);\r
+ string(filename,STRLEN);\r
 \r
  if(argv[1][1]=='l') /* -l */\r
  {\r
@@ -690,14 +691,15 @@ void parse_ip_log(int argc, char **argv)
  input(str,STRLEN) \r
  {\r
   if(strstr(str,".log"))\r
-   {\r
+  {\r
     ptr=strrchr(str,'\n');\r
     if(ptr) *ptr='\0';\r
-    printf("Parsing %s ...",str);\r
+    sprintf(filename,"%s/%s",log_dir,str);\r
+    printf("Parsing %s ...",filename);\r
     accept_month=0;\r
     traffic_month=0;\r
     guaranted = 0;\r
-    parse(str)\r
+    parse(filename)\r
     {\r
      y_ok=m_ok=0;  \r
      valid_columns(ptr,_,'\t',col) switch(col)\r
@@ -741,7 +743,7 @@ void parse_ip_log(int argc, char **argv)
     }\r
     else\r
      puts(" no records.");\r
-   }\r
+  }\r
  }\r
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
  printf("Writing %s ...",str);\r