From 282113ba894449ed17e85b296cf0760d5206ac8d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 19 Nov 2003 18:49:41 +0000 Subject: Don't use safe_new but new throughout. Fix copyright dates throughout. * Makefile.in: Accomodate all new files and name changes. Add a *.d dependency. (sbindir): Add. (etcdir): Drop in favor of more appropriate sysconfdir definition. (sysconfdir): Add. (CXXFLAGS): Add -MMD flag. Add SYSCONFDIR definition. (.SUFFIXES): Add. (install): Add action items. (libclean): New target. (fullclean): Ditto. * bsd_helper.cc: New file. * bsd_helper.h: Ditto. * bsd_log.cc: Ditto. * bsd_log.h: Ditto. * bsd_mutex.cc: Ditto. * bsd_mutex.h: Ditto. * client.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. (client_request::handle_request): Add Message Queue and Semaphore handling. * cygserver.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. Use new debug/log/panic logging functions. (DEF_CONFIG_FILE): New definition for configuration file. Use throughout. (getfunc): Remove. (__cygserver__printf): Remove. (client_request_attach_tty::serve): Return error if impersonation fails. (print_usage): Pump up help message. (print_version): Add output of default configuration file. (main): Accommodate new options. Allow overwrite of threading options from config file. Call several new initialization functions. Drop printing dots. Don't define SIGHANDLE inline. * cygserver.conf: New file. * cygserver_process.h: Rename to process.h. * cygserver_transport.h: Rename to transport.h. * cygserver_transport_pipes.h: Rename to transport_pipes.h. * cygserver_transport_sockets.h: Rename to transport_sockets.h. * msg.cc: Rewrite. * sem.cc: Rewrite. * shm.cc: Rewrite. * sysv_msg.cc: New file, derived from FreeBSD version 1.52. * sysv_sem.cc: New file, derived from FreeBSD version 1.66. * sysv_shm.cc: New file, derived from FreeBSD version 1.89. * threaded_queue.cc: Rearrange to build as less as possible if __INSIDE_CYGWIN__. * transport.cc (transport_layer_base::impersonate_client): Define bool. (transport_layer_base::revert_to_self): Ditto. * transport.h (transport_layer_base::impersonate_client): Declare bool. (transport_layer_base::revert_to_self): Ditto. * transport_pipes.cc (transport_layer_pipes::transport_layer_pipes): Don't call init_security. (init_security): Remove. (transport_layer_pipes::accept): Use global sec_all_nih. (transport_layer_pipes::connect): Ditto. (transport_layer_pipes::impersonate_client): Define bool. (transport_layer_pipes::revert_to_self): Ditt. * transport_pipes.h (transport_layer_pipes::impersonate_client): Declare bool. (transport_layer_pipes::revert_to_self): Ditto. * woutsup.h: Include bsd compatibility headers. (SIGHANDLE): Add definition. (__cygserver__printf): Remove definition. (__noop_printf): Ditto. (debug_printf): Define using debug. (syscall_printf): Define using log. (system_printf): Ditto. Drop all other _printf definitions. --- winsup/cygserver/bsd_log.cc | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 winsup/cygserver/bsd_log.cc (limited to 'winsup/cygserver/bsd_log.cc') diff --git a/winsup/cygserver/bsd_log.cc b/winsup/cygserver/bsd_log.cc new file mode 100644 index 000000000..5cf1c848e --- /dev/null +++ b/winsup/cygserver/bsd_log.cc @@ -0,0 +1,95 @@ +/* bsd_log.cc + + Copyright 2003 Red Hat Inc. + +This file is part of Cygwin. + +This software is a copyrighted work licensed under the terms of the +Cygwin license. Please consult the file "CYGWIN_LICENSE" for +details. */ +#ifdef __OUTSIDE_CYGWIN__ +#include "woutsup.h" +#define _KERNEL 1 +#define __BSD_VISIBLE 1 +#include +#include +#include + +long log_level = 8; /* Illegal value. Don't change! */ +tun_bool_t log_debug = TUN_UNDEF; +tun_bool_t log_syslog = TUN_UNDEF; +tun_bool_t log_stderr = TUN_UNDEF; + +void +loginit (tun_bool_t opt_stderr, tun_bool_t opt_syslog) +{ + if (log_debug == TUN_UNDEF) + TUNABLE_BOOL_FETCH ("kern.log.debug", &log_debug); + if (log_debug == TUN_UNDEF) + log_debug = TUN_FALSE; + + if (opt_stderr != TUN_UNDEF) + log_stderr = opt_stderr; + else + TUNABLE_BOOL_FETCH ("kern.log.stderr", &log_stderr); + if (log_stderr == TUN_UNDEF) + log_stderr = TUN_FALSE; + + if (opt_syslog != TUN_UNDEF) + log_syslog = opt_syslog; + else + TUNABLE_BOOL_FETCH ("kern.log.syslog", &log_syslog); + if (log_syslog == TUN_UNDEF) + log_syslog = TUN_FALSE; + + if (log_level == 8) + TUNABLE_INT_FETCH ("kern.log.level", &log_level); + if (log_level == 8) + log_level = 6; +} + +void +_vlog (const char *file, int line, int level, + const char *fmt, va_list ap) +{ + char buf[16384]; + + if ((level == LOG_DEBUG && log_debug != TUN_TRUE) + || (level != LOG_DEBUG && level >= log_level)) + return; + strcpy (buf, "cygserver: "); + if (file && log_debug == TUN_TRUE) + __small_sprintf (strchr (buf, '\0'), "%s, line %d: ", file, line); + __small_vsprintf (strchr (buf, '\0'), fmt, ap); + if (log_syslog == TUN_TRUE && level != LOG_DEBUG) + syslog (level, buf); + if (log_stderr == TUN_TRUE || level == LOG_DEBUG) + { + fputs (buf, stderr); + fputc ('\n', stderr); + } +} + +void +_log (const char *file, int line, int level, const char *fmt, ...) +{ + va_list ap; + va_start (ap, fmt); + _vlog (file, line, level, fmt, ap); +} + +void +_vpanic (const char *file, int line, const char *fmt, va_list ap) +{ + _vlog (file, line, LOG_EMERG, fmt, ap); + exit (1); +} + +void +_panic (const char *file, int line, const char *fmt, ...) +{ + va_list ap; + va_start (ap, fmt); + _vpanic (file, line, fmt, ap); +} +#endif /* __OUTSIDE_CYGWIN__ */ -- cgit v1.2.3