Merge branch 'master' of github.com:john30/ebusd

john30 · Dec 17, 2016 · 8dce270 · 8dce270
2 parents a2770f5 + 538af10
commit 8dce270
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/make_debian.sh b/make_debian.sh
@@ -27,7 +27,7 @@ PACKAGE="${RELEASE}_${ARCH}.deb"
 rm -rf "$BUILD"
 mkdir -p "$BUILD" || exit 1
 cd "$BUILD" || exit 1
-(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1
+(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* "--exclude=*.o" "--exclude=*.a" .| tar xf -) || exit 1
 
 echo
 echo "*************"

diff --git a/make_freetz.sh b/make_freetz.sh
@@ -28,7 +28,7 @@ export PATH=$PATH:/usr/mipsel-linux-uclibc/bin
 rm -rf "$BUILD"
 mkdir -p "$BUILD" || exit 1
 cd "$BUILD" || exit 1
-(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1
+(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* "--exclude=*.o" "--exclude=*.a" .| tar xf -) || exit 1
 
 echo
 echo "*************"

diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp
@@ -59,9 +59,13 @@ MainLoop::MainLoop(const struct options opt, Device *device, MessageMap* message
 	m_device->setListener(this);
 	if (opt.dumpFile[0]) {
 		m_dumpFile = new RotateFile(opt.dumpFile, opt.dumpSize);
+	} else {
+		m_dumpFile = NULL;
 	}
 	if (opt.logRawFile[0] && strcmp(opt.logRawFile, opt.logFile)!=0) {
 		m_logRawFile = new RotateFile(opt.logRawFile, opt.logRawSize, true);
+	} else {
+		m_logRawFile = NULL;
 	}
 	m_logRawEnabled = opt.logRaw;
 	// create BusHandler