emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace version.h with auto-generated version from configure script

Browse Source 
Also, remove DEBRELEASE, no longer a package with Debian focus, and add
'v' before version number in logs/usage text.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2018-08-02 23:02:49 +02:00
parent 363b9a2201
commit e6a88e13ed
3 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/klogd.c
View File

@ -273,7 +273,7 @@
#ifndef TESTING #ifndef TESTING
#include "pidfile.h" #include "pidfile.h"
#endif #endif
#include "version.h" #include "config.h"
#define __LIBRARY__ #define __LIBRARY__
#include <linux/unistd.h> #include <linux/unistd.h>
@ -481,8 +481,8 @@ static void ChangeLogging(void)
Terminate(); Terminate();
/* Indicate that something is happening. */ /* Indicate that something is happening. */
Syslog(LOG_INFO, "klogd %s.%s, ---------- state change ----------\n", \ Syslog(LOG_INFO, "klogd v%s, ---------- state change ----------\n",
VERSION, PATCHLEVEL); PACKAGE_VERSION);
/* Reload symbols. */ /* Reload symbols. */
if ( reload_symbols > 0 ) if ( reload_symbols > 0 )
@ -552,13 +552,8 @@ static enum LOGSRC GetKernelLogSrc(void)
{ {
/* Initialize kernel logging. */ /* Initialize kernel logging. */
ksyslog(1, NULL, 0); ksyslog(1, NULL, 0);
#ifdef DEBRELEASE Syslog(LOG_INFO, "klogd v%s, log source = ksyslog "
Syslog(LOG_INFO, "klogd %s.%s#%s, log source = ksyslog " "started.", PACKAGE_VERSION);
"started.", VERSION, PATCHLEVEL, DEBRELEASE);
#else
Syslog(LOG_INFO, "klogd %s.%s, log source = ksyslog "
"started.", VERSION, PATCHLEVEL);
#endif
return(kernel); return(kernel);
} }
@ -574,13 +569,8 @@ static enum LOGSRC GetKernelLogSrc(void)
kmsg = fileno(stdin); kmsg = fileno(stdin);
#endif #endif
#ifdef DEBRELEASE Syslog(LOG_INFO, "klogd v%s, log source = %s started.",
Syslog(LOG_INFO, "klogd %s.%s#%s, log source = %s started.", \ VERSION, _PATH_KLOG);
VERSION, PATCHLEVEL, DEBRELEASE, _PATH_KLOG);
#else
Syslog(LOG_INFO, "klogd %s.%s, log source = %s started.", \
VERSION, PATCHLEVEL, _PATH_KLOG);
#endif
return(proc); return(proc);
} }
@ -1028,7 +1018,7 @@ int main(argc, argv)
use_syscall = 1; use_syscall = 1;
break; break;
case 'v': case 'v':
printf("klogd %s.%s\n", VERSION, PATCHLEVEL); printf("klogd v%s\n", VERSION);
exit (1); exit (1);
case 'x': case 'x':
symbol_lookup = 0; symbol_lookup = 0;

22
src/syslogd.c
View File

@ -563,7 +563,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
#ifndef TESTING #ifndef TESTING
#include "pidfile.h" #include "pidfile.h"
#endif #endif
#include "version.h" #include "config.h"
#if defined(__linux__) #if defined(__linux__)
#include <paths.h> #include <paths.h>
@ -979,7 +979,7 @@ int main(argc, argv)
StripDomains = crunch_list(optarg); StripDomains = crunch_list(optarg);
break; break;
case 'v': case 'v':
printf("syslogd %s.%s\n", VERSION, PATCHLEVEL); printf("syslogd v%s\n", VERSION);
exit (0); exit (0);
case '?': case '?':
default: default:
@ -2747,23 +2747,13 @@ void init()
} }
if ( AcceptRemote ) if ( AcceptRemote )
#ifdef DEBRELEASE logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \ ": restart (remote reception)." , LocalHostName,
": restart (remote reception)." , LocalHostName, \
ADDDATE); ADDDATE);
#else
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
": restart (remote reception)." , LocalHostName, \
ADDDATE);
#endif
else else
#ifdef DEBRELEASE logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \
": restart." , LocalHostName, ADDDATE); ": restart." , LocalHostName, ADDDATE);
#else
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
": restart." , LocalHostName, ADDDATE);
#endif
(void) signal(SIGHUP, sighup_handler); (void) signal(SIGHUP, sighup_handler);
dprintf("syslogd: restarted.\n"); dprintf("syslogd: restarted.\n");
} }

2
version.h
View File

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