rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 18:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

some printf format changes for off_t plus makefile updates...

Browse Source
This commit is contained in:
Rainer Gerhards 2005-06-28 13:20:11 +00:00
parent f2fc13115a
commit 23968b1f75
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -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

3
NEWS
View File

@ -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)

4
syslogd.c
View File

@ -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);

2
version.h
View File

@ -1,2 +1,2 @@
#define VERSION "0.9"
#define PATCHLEVEL "0"
#define PATCHLEVEL "1"