Modified: trunk/patches/nfdump-file-list-prune.patch
===================================================================
--- trunk/patches/nfdump-file-list-prune.patch 2013-06-27 08:33:18 UTC (rev 296)
+++ trunk/patches/nfdump-file-list-prune.patch 2013-06-27 11:14:47 UTC (rev 297)
@@ -1,6 +1,6 @@
-diff -ur nfdump-1.6.9/bin/flist.c nfdump-final/bin/flist.c
---- nfdump-1.6.9/bin/flist.c 2011-12-29 15:24:14.000000000 +0000
-+++ nfdump-final/bin/flist.c 2013-06-27 09:25:38.000000000 +0100
+diff -ur nfdump-1.6.9//bin/flist.c nfdump-1.6.9.patched//bin/flist.c
+--- nfdump-1.6.9//bin/flist.c 2011-12-29 15:24:14.000000000 +0000
++++ nfdump-1.6.9.patched//bin/flist.c 2013-06-25 17:47:23.000000000 +0100
@@ -209,6 +209,7 @@
#define AcceptedFormatChar "YymdjHMsUWwuF"
@@ -35,7 +35,7 @@
break;
case FTS_DP:
break;
-@@ -1217,3 +1228,23 @@
+@@ -1217,3 +1228,14 @@
} // End of mkpath
@@ -44,24 +44,15 @@
+{
+ struct tm *start, *end;
+
-+ if(!time_start)
-+ {
-+ time_start = -2147558400;
-+ }
-+ if(!time_end)
-+ {
-+ time_end = 2147483640;
-+ }
-+
+ start = localtime(&time_start);
+ strftime(t_start, 11, "%Y/%m/%d", start);
+
+ end = localtime(&time_end);
+ strftime(t_end, 11, "%Y/%m/%d", end);
+} // End of setupStartEndTime
-diff -ur nfdump-1.6.9/bin/nfdump.c nfdump-final/bin/nfdump.c
---- nfdump-1.6.9/bin/nfdump.c 2013-06-27 09:26:53.000000000 +0100
-+++ nfdump-final/bin/nfdump.c 2013-06-27 09:25:38.000000000 +0100
+diff -ur nfdump-1.6.9//bin/nfdump.c nfdump-1.6.9.patched//bin/nfdump.c
+--- nfdump-1.6.9//bin/nfdump.c 2013-06-25 17:47:37.000000000 +0100
++++ nfdump-1.6.9.patched//bin/nfdump.c 2013-06-25 17:47:23.000000000 +0100
@@ -1025,6 +1025,13 @@
exit(255);
}
@@ -88,19 +79,18 @@
if ( !(flow_stat || element_stat || wfile || quiet ) && record_header ) {
if ( user_format ) {
-diff -ur nfdump-1.6.9/bin/util.c nfdump-final/bin/util.c
---- nfdump-1.6.9/bin/util.c 2013-06-27 09:26:53.000000000 +0100
-+++ nfdump-final/bin/util.c 2013-06-27 09:25:38.000000000 +0100
-@@ -60,6 +60,8 @@
+diff -ur nfdump-1.6.9//bin/util.c nfdump-1.6.9.patched//bin/util.c
+--- nfdump-1.6.9//bin/util.c 2013-06-25 17:47:37.000000000 +0100
++++ nfdump-1.6.9.patched//bin/util.c 2013-06-25 17:47:23.000000000 +0100
+@@ -60,6 +60,7 @@
/* Global vars */
extern char *CurrentIdent;
-+static char time_start[13] = "190101010000";
-+static char time_end[13] = "203701000000";
++static char time_start[13], time_end[13];
enum { NONE, LESS, MORE };
-@@ -345,6 +347,8 @@
+@@ -345,6 +346,8 @@
int ScanTimeFrame(char *tstring, time_t *t_start, time_t *t_end) {
char *p;
@@ -109,7 +99,7 @@
if ( !tstring ) {
fprintf(stderr,"Time Window format error '%s'\n", tstring);
-@@ -384,6 +388,19 @@
+@@ -384,6 +387,19 @@
ParseTime(p, t_end);
}
@@ -129,7 +119,7 @@
return *t_start == 0 || *t_end == 0 ? 0 : 1;
} // End of ScanTimeFrame
-@@ -502,6 +519,21 @@
+@@ -502,6 +518,21 @@
} // End of InitStringlist
void InsertString(stringlist_t *list, char *string) {
@@ -151,9 +141,9 @@
if ( !list->list ) {
list->max_index = list->block_size;
-diff -ur nfdump-1.6.9/bin/util.h nfdump-final/bin/util.h
---- nfdump-1.6.9/bin/util.h 2011-12-29 15:24:14.000000000 +0000
-+++ nfdump-final/bin/util.h 2013-06-27 09:25:39.000000000 +0100
+diff -ur nfdump-1.6.9//bin/util.h nfdump-1.6.9.patched//bin/util.h
+--- nfdump-1.6.9//bin/util.h 2011-12-29 15:24:14.000000000 +0000
++++ nfdump-1.6.9.patched//bin/util.h 2013-06-25 17:47:23.000000000 +0100
@@ -77,6 +77,8 @@
void SetupInputFileSequence(char *multiple_dirs, char *single_file, char *multiple_files);
