Version 1.4

CHANGES

@@ -1,3 +1,12 @@
+1.4 / 26-Mar-04
+
+ - Fix: major output problems when compiled with some compilers
+        (thanks to DukePyrolator for reporting this bug and 
+         Juha / vlu for testing the patch)
+ - Fix: month rotation if database isn't updated every day
+ - Minor non-visible fixes and code cleanup
+
+
 1.3 / 8-Mar-04
 
  - Fix: support for 64bit counters

INSTALL

@@ -1,4 +1,4 @@
-(Updated 8.3.2003 based on version 1.3)
+(Updated 26.3.2003 based on version 1.4)
 
 'I don't read manuals' install
 ::::::::::::::::::::::::::::::

UNINSTALL

@@ -0,0 +1,3 @@
+
+Run 'make uninstall' and follow the instructions.
+

UPGRADE

@@ -1,8 +1,8 @@
-(Updated 29.2.2004 based on version 1.3)
+(Updated 26.3.2004 based on version 1.4)
 
 This file will try to explain how vnStat is supposed to be upgraded 
 from version 1.0. The makefile should handle upgrades from version 1.1
-to 1.3 without user interaction. But for those still using 1.0, please
+to 1.4 without user interaction. But for those still using 1.0, please
 read the instructions once before executing step by step.
 
 But once again to make this clear:

src/Makefile

@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -O2 -Wall
+CFLAGS = -O2
 OBJS = proc.o db.o misc.o
 OBJS64 = proc64.o db.o misc.o
 
@@ -23,8 +23,8 @@ proc.o: proc.c proc.h vnstat.h db.h
 proc64.o: proc.c proc.h vnstat.h db.h
 	$(CC) $(CFLAGS) -c proc.c -o proc64.o -DBLIMIT
 
-db.o: db.c db.h vnstat.h
-	$(CC) -O2 -c db.c
+db.o: db.c db.h proc.h vnstat.h
+	$(CC) $(CFLAGS) -c db.c
 
 misc.o: misc.c misc.h
 	$(CC) $(CFLAGS) -c misc.c

src/db.c

@@ -1,5 +1,6 @@
 #include "vnstat.h"
 #include "db.h"
+#include "proc.h"
 
 int dmonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 
@@ -118,11 +119,14 @@ void showdb(int qmode)
 	struct tm *d;
 	char datebuff[16];
 	char daytemp[128];
-	uint64_t e_rx, e_tx, t_rx, t_tx, t_rxk, t_txk;
+	uint64_t e_rx, e_tx, t_rx, t_tx;
+	int t_rxk, t_txk;
 	time_t current, yesterday;
 
 	current=time(NULL);
 	yesterday=current-86400;
+
+	e_rx=e_tx=t_rx=t_tx=t_rxk=t_txk=0;
 
 	if (data.totalrx+data.totaltx==0 && (data.totalrxk/(float)10+data.totaltxk/(float)10)==0) {
 
@@ -336,8 +340,8 @@ void showdb(int qmode)
 			printf("active;%d\n", data.active);
 			printf("interface;%s\n", data.interface);
 			printf("nick;%s\n", data.nick);
-			printf("created;%d\n", data.created);
-			printf("updated;%d\n", data.lastupdated);
+			printf("created;%d\n", (int)data.created);
+			printf("updated;%d\n", (int)data.lastupdated);
 
 			printf("totalrx;%Lu\n", data.totalrx);
 			printf("totaltx;%Lu\n", data.totaltx);
@@ -348,18 +352,18 @@ void showdb(int qmode)
 			printf("btime;%Lu\n", data.btime);
 
 			for (i=0;i<=29;i++) {
-				printf("d;%d;%d;%Lu;%Lu;%d;%d;%d\n",i, data.day[i].date, data.day[i].rx, data.day[i].tx, data.day[i].rxk, data.day[i].txk, data.day[i].used);
+				printf("d;%d;%d;%Lu;%Lu;%d;%d;%d\n",i, (int)data.day[i].date, data.day[i].rx, data.day[i].tx, data.day[i].rxk, data.day[i].txk, data.day[i].used);
 			}
 
 			for (i=0;i<=11;i++) {
-				printf("m;%d;%d;%Lu;%Lu;%d;%d;%d\n",i, data.month[i].month, data.month[i].rx, data.month[i].tx, data.month[i].rxk, data.month[i].txk, data.month[i].used);
+				printf("m;%d;%d;%Lu;%Lu;%d;%d;%d\n",i, (int)data.month[i].month, data.month[i].rx, data.month[i].tx, data.month[i].rxk, data.month[i].txk, data.month[i].used);
 			}
 
 			for (i=0;i<=9;i++) {
-				printf("t;%d;%d;%Lu;%Lu;%d;%d;%d\n",i,data.top10[i].date, data.top10[i].rx, data.top10[i].tx, data.top10[i].rxk, data.top10[i].txk, data.top10[i].used);
+				printf("t;%d;%d;%Lu;%Lu;%d;%d;%d\n",i,(int)data.top10[i].date, data.top10[i].rx, data.top10[i].tx, data.top10[i].rxk, data.top10[i].txk, data.top10[i].used);
 			}
 			for (i=0;i<=23;i++) {
-				printf("h;%d;%d;%Lu;%Lu\n",i,data.hour[i].date, data.hour[i].rx, data.hour[i].tx);
+				printf("h;%d;%d;%Lu;%Lu\n",i,(int)data.hour[i].date, data.hour[i].rx, data.hour[i].tx);
 			}			
 
 		/* multiple dbs at one time */
@@ -658,7 +662,7 @@ void cleanhours(void)
 			data.hour[i].rx=0;
 			data.hour[i].tx=0;
 			if (debug) {
-				printf("Hour %d (%d) cleaned.\n",i, data.hour[i].date);
+				printf("Hour %d (%d) cleaned.\n",i, (int)data.hour[i].date);
 			}
 		}
 	}
@@ -672,7 +676,7 @@ void cleanhours(void)
 			data.hour[hour].rx=0;
 			data.hour[hour].tx=0;
 			if (debug) {
-				printf("Current hour %d (%d) cleaned.\n",hour, data.hour[i].date);
+				printf("Current hour %d (%d) cleaned.\n",hour, (int)data.hour[i].date);
 			}
 			data.hour[hour].date=current;
 	}
@@ -1025,6 +1029,6 @@ void showint(uint64_t mb, int kb, int len)
 	if ((flen+3<=len) && (kb!=-1) && (mb<1000) && (kB!=0)) {	
 		printf("%'*Lu.%02d", len-3, mb, kB);
 	} else {
-		printf("%'*Lu", len);
+		printf("%'*Lu", len, mb);
 	}
 }

src/proc.c

@@ -181,7 +181,7 @@ void parseproc(int newdb)
 
 	/* rotate months in database if needed */
 	d=localtime(&data.month[0].month);
-	if ((d->tm_mon!=month) && (day==atoi(MONTHROTATE)))
+	if ((d->tm_mon!=month) && (day>=atoi(MONTHROTATE)))
 		rotatemonths();
 
 }

src/vnstat.h

@@ -41,7 +41,7 @@
 #define DBVERSION 3
 
 /* version string */
-#define VNSTATVERSION "1.3"
+#define VNSTATVERSION "1.4"
 
 #ifdef BLIMIT
 /* 64 bit limit */