Some more glibc patches made by Michael Alan Dorman <mdorman@debian.org>.

This commit is contained in:
Joey Schulze 1997-06-15 17:14:04 +00:00
parent dd5def6ac9
commit af05ec876f
3 changed files with 33 additions and 2 deletions

10
klogd.c
View File

@ -167,6 +167,9 @@
* an unknown amount and overrun a buffer.
* I turned these routines into a little parsing state machine that
* should not have these problems.
*
* Sun Jun 15 16:23:29 MET DST 1997: Michael Alan Dorman
* Some more glibc patches made by <mdorman@debian.org>.
*/
@ -176,7 +179,9 @@
#include <errno.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
#if !defined(__GLIBC__)
#include <linux/time.h>
#endif /* __GLIBC__ */
#include <stdarg.h>
#include <paths.h>
#include <stdlib.h>
@ -187,9 +192,12 @@
#define __LIBRARY__
#include <linux/unistd.h>
#ifndef __alpha__
#if !defined(__GLIBC__)
# define __NR_ksyslog __NR_syslog
_syscall3(int,ksyslog,int, type, char *, buf, int, len);
#else
#include <sys/klog.h>
#define ksyslog klogctl
#endif
#define LOG_BUFFER_SIZE 4096

View File

@ -46,6 +46,9 @@
*
* An informative message is printed indicating the number of kernel
* modules and the number of symbols loaded from these modules.
*
* Sun Jun 15 16:23:29 MET DST 1997: Michael Alan Dorman
* Some more glibc patches made by <mdorman@debian.org>.
*/
@ -57,8 +60,12 @@
#include <errno.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
#if !defined(__GLIBC__)
#include <linux/time.h>
#include <linux/module.h>
#else /* __GLIBC__ */
#include <sys/module.h>
#endif /* __GLIBC__ */
#include <stdarg.h>
#include <paths.h>
@ -66,6 +73,7 @@
#include "ksyms.h"
#if !defined(__GLIBC__)
/*
* The following bit uses some kernel/library magic to product what
* looks like a function call to user level code. This function is
@ -78,7 +86,9 @@
_syscall1(int, getsyms, struct kernel_sym *, syms);
#undef __LIBRARY__
extern int getsyms(struct kernel_sym *);
#else /* __GLIBC__ */
#define getsyms get_kernel_syms
#endif /* __GLIBC__ */
/* Variables static to this module. */
struct sym_table

View File

@ -313,6 +313,9 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
* Tue Jun 10 12:51:41 MET DST 1997: Martin Schulze
* Removed sleep(10) from parent process. This has caused a slow
* startup in former times - and I don't see any reason for this.
*
* Sun Jun 15 16:23:29 MET DST 1997: Michael Alan Dorman
* Some more glibc patches made by <mdorman@debian.org>.
*/
@ -594,7 +597,9 @@ int NoHops = 1; /* Can we bounce syslog messages through an
intermediate host. */
extern int errno, sys_nerr;
#if !defined(__GLIBC__)
extern char *sys_errlist[];
#endif /* __GLIBC__ */
extern char *ctime(), *index();
/* Function prototypes. */
@ -618,6 +623,9 @@ void die(int sig);
void init();
void cfline(char *line, register struct filed *f);
int decode(char *name, struct code *codetab);
#if defined(__GLIBC__)
#define dprintf mydprintf
#endif /* __GLIBC__ */
static void dprintf(char *, ...);
static void allocate_log(void);
void sighup_handler();
@ -629,7 +637,12 @@ int main(argc, argv)
{
register int i;
register char *p;
#if !defined(__GLIBC__)
int len, num_fds;
#else /* __GLIBC__ */
size_t len;
int num_fds;
#endif /* __GLIBC__ */
fd_set unixm, readfds;
int fd;