From 23968b1f758ae3a1a1cfb6ea2a8eb28cb7aa1ebf Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 28 Jun 2005 13:20:11 +0000
Subject: some printf format changes for off_t plus makefile updates...

---
 Makefile  | 15 ++++++++++-----
 NEWS      |  3 +++
 syslogd.c |  4 ++--
 version.h |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 898d1b99..57c5d504 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,17 @@ CC= gcc
 #LDFLAGS= -g -Wall -fno-omit-frame-pointer
 #CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer
 
+# uncomment the following line if you would like
+# to DISABLE large file support (or if your compiler
+# does not provide this feature)
+NOLARGEFILE = -DNOLARGEFILE
+
 # the next two lines are essentially the same, but -DWITH_DB
 # enables the MySQL code. By default, that one is commented out
 # change the comment chars to activate it if you need MySQL!
 # In this case, also look down further to uncomment the libs
-#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
-CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB -I/usr/local/include
+#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce $(NOLARGEFILE)
+CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB -I/usr/local/include $(NOLARGEFILE)
 LDFLAGS= -s
 
 INSTALL = install
@@ -66,7 +71,7 @@ syslogd: syslogd.o pidfile.o template.o stringbuf.o srUtils.o outchannel.o
 syslog_tst: syslog_tst.o
 	${CC} ${LDFLAGS} -o syslog_tst syslog_tst.o
 
-tsyslogd: syslogd.c version.h template.o outchannel.o stringbuf.o srUtils.o
+tsyslogd: syslogd.c syslogd.h version.h template.o outchannel.o stringbuf.o srUtils.o
 	$(CC) $(CFLAGS) -g -DTESTING $(SYSLOGD_FLAGS) -o tsyslogd syslogd.c pidfile.o template.o outchannel.o stringbuf.o srUtils.o $(LIBS)
 
 srUtils.o: srUtils.c srUtils.h liblogging-stub.h
@@ -78,10 +83,10 @@ stringbuf.o: stringbuf.c stringbuf.h liblogging-stub.h
 template.o: template.c template.h stringbuf.h liblogging-stub.h
 	${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c template.c
 
-outchannel.o: outchannel.c outchannel.h stringbuf.h liblogging-stub.h
+outchannel.o: outchannel.c outchannel.h stringbuf.h liblogging-stub.h syslogd.h
 	${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c outchannel.c
 
-syslogd.o: syslogd.c version.h template.h outchannel.h
+syslogd.o: syslogd.c version.h template.h outchannel.h syslogd.h
 	${CC} ${CFLAGS} ${SYSLOGD_FLAGS} $(DEB) -c syslogd.c
 
 syslog.o: syslog.c
diff --git a/NEWS b/NEWS
index 2906aa2a..51f04b52 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 Version 0.9.1 (RGer)
 - fixed code so that it compiles without errors under FreeBSD
 - removed now unused function "allocate_log()" from syslogd.c
+- changed the make file so that it contains more defines for
+  different environments (in the long term, we need a better
+  system for disabling/enabling features...)
 
 ---------------------------------------------------------------------------
 Version 0.9.0 (RGer)
diff --git a/syslogd.c b/syslogd.c
index 612a11a2..41637fa9 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3026,14 +3026,14 @@ again:
 				/* didn't work out, so disable... */
 				f->f_type = F_UNUSED;
 				snprintf(errMsg, sizeof(errMsg),
-					 "no longer writing to file %s; grown beyond configured file size of %llu bytes, actual size %llu - configured command did not resolve situation\n",
+					 "no longer writing to file %s; grown beyond configured file size of %lld bytes, actual size %lld - configured command did not resolve situation\n",
 					 f->f_un.f_fname, f->f_sizeLimit, actualFileSize);
 				errno = 0;
 				logerror(errMsg);
 				return;
 			} else {
 				snprintf(errMsg, sizeof(errMsg),
-					 "file %s had grown beyond configured file size of %llu bytes, actual size was %llu - configured command resolved situation\n",
+					 "file %s had grown beyond configured file size of %lld bytes, actual size was %lld - configured command resolved situation\n",
 					 f->f_un.f_fname, f->f_sizeLimit, actualFileSize);
 				errno = 0;
 				logerror(errMsg);
diff --git a/version.h b/version.h
index 0dc5cae9..95d17d2b 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
 #define VERSION "0.9"
-#define PATCHLEVEL "0"
+#define PATCHLEVEL "1"
-- 
cgit