coming closer to 0.8.1 release

4 files changed, 17 insertions, 22 deletions

diff --git a/INSTALL b/INSTALL
index c3fbc1c2..d75dc528 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,11 +29,12 @@
 5.) YOU NEED TO DECIDE IF YOU WOULD LIKE TO REPLACE THE STANDARD SYSLOGD OR NOT!
     The is important as it influences the names used. If you call
     make install
-    it will install this program under the name of rsyslogd. If you call it with
+    it will install this program under the name of syslogd, but it will save the
+    previous syslogd binary under the name of syslogd-previous. If you call it with
     make install-replace
-    it will replace the existing syslogd, but save the former one under the name
-    of syslogd-previous. If you run install-replace multiple times, your
-    syslogd-previous will be OVERWRITTEN!
+    it will just replace the existing syslogd, but NOT save the former one under
+    the name of syslogd-previous.
+    If you run install multiple times, your syslogd-previous will be OVERWRITTEN!
     In either case, the system startup files will not be touched. If you use
     install-replace, everthing should work as always, but if it doesn't, you've
     probably discovered a beta bug ;) In any case, to use the new features, you 
diff --git a/Makefile b/Makefile
index 0cc0dc2b..44134dad 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,9 @@ CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer
 #CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB
 #LDFLAGS= -s
 
-# Look where your install program is.
-INSTALL = /usr/bin/install
+INSTALL = install
 BINDIR = /usr/sbin
-MANDIR = /usr/man
+MANDIR = /usr/share/man
 
 # Uncommenting the following to use mysql.
 #LIBS = -lmysqlclient #/var/lib/mysql/mysql 
@@ -87,11 +86,11 @@ clobber: clean
 	rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
 
 install-replace: syslogd
-	${INSTALL} -b -m 500 -s syslogd ${BINDIR}/syslogd
+	${INSTALL} -b -m 500 -s syslogd ${DESTDIR}${BINDIR}/syslogd
 
 install_exec: syslogd
-	cp ${BINDIR}/syslogd ${BINDIR}/syslogd-previous
-	${INSTALL} -b -m 500 -s syslogd ${BINDIR}/syslogd
+	cp ${DESTDIR}${BINDIR}/syslogd ${DESTDIR}${BINDIR}/syslogd-previous
+	${INSTALL} -b -m 500 -s syslogd ${DESTDIR}${BINDIR}/syslogd
 
 # man not yet supported ;)
 #install_man:
diff --git a/NEWS b/NEWS
index d0fd293a..8a86d7cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------
+Version 0.8.1
+
+- fixed a nasty memory leak (probably not the last one with this release)
+- some enhancements to Makefile as suggested by Bennett Todd
+---------------------------------------------------------------------------
 Version 0.8.0
 
 Initial testing release.
diff --git a/syslogd.c b/syslogd.c
index 7cee19c8..2c79f4af 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2,13 +2,9 @@
  * TODO:
  * - check if syslogd really needs to be shut down totally if
  *   "syslog" service from etc/services can not be found
- * - check template lins for extra characters and provide 
+ * - check template lines for extra characters and provide 
  *   a warning, if they exists
  * - check that no exit() is used!
- * - make sure that syslogd handles the case that NO template
- *   is specified in an action line (hint: keep action type
- *   to F_UNUSED unless a proper template could be found)
- *   ONLY TO BE DONE FOR MySQL logging, rest is fixed rgerhards 2004-12-02
  * - implement the escape-cc property replacer option
  *
  * \brief This is what will become the rsyslogd daemon.
@@ -1425,7 +1421,7 @@ struct msg* MsgConstruct()
 void MsgDestruct(struct msg * pM)
 {
 	assert(pM != NULL);
-	printf("MsgDestruct\t0x%x, Ref now: %d\n", (int)pM, pM->iRefCount - 1);
+	dprintf("MsgDestruct\t0x%x, Ref now: %d\n", (int)pM, pM->iRefCount - 1);
 	if(--pM->iRefCount == 0)
 	{
 		dprintf("MsgDestruct\t0x%x, RefCount now 0, doing DESTROY\n", (int)pM);
@@ -3855,14 +3851,11 @@ void die(sig)
 	for (lognum = 0; lognum <= nlogs; lognum++) {
 		f = &Files[lognum];
 		/* free iovec if it was allocated */
-printf("free f[%d]->iov %x, max %d\n", lognum, (unsigned) f->f_iov, nlogs);
 		if(f->f_iov != NULL) {
 			if(f->f_bMustBeFreed != NULL) {
-				printf("iov strings delete\n");
 				iovDeleteFreeableStrings(f);
 				free(f->f_bMustBeFreed);
 			}
-			printf("iov delete\n");
 			free(f->f_iov);
 		}
 		/* Now delete cached messages */
@@ -4060,8 +4053,6 @@ void init()
 		Files = NULL;
 	}
 	
-	/* TODO: we need to free the templates!  TODO-URGENT */
-
 #ifdef SYSV
 	lognum = 0;
 #else
@@ -4290,7 +4281,6 @@ void cflineSetTemplateAndIOV(struct filed *f, char *pTemplateName)
 			dprintf("Could not allocate bMustBeFreed memory\n");
 			f->f_type = F_UNUSED;
 		}
-printf("iov %x, MustBeFreed %x\n", f->f_iov, f->f_bMustBeFreed);
 	}
 }