diff options
| -rw-r--r-- | MANIFEST | 3 | ||||
| -rw-r--r-- | vos/Changes | 5 | ||||
| -rw-r--r-- | vos/syslog.h | 75 | ||||
| -rw-r--r-- | vos/vos.c | 232 |
4 files changed, 314 insertions, 1 deletions
@@ -3639,7 +3639,8 @@ vms/writemain.pl Generate perlmain.c from miniperlmain.c+extensions vos/Changes Changes made to port Perl to the VOS operating system vos/compile_full_perl.cm VOS command macro to build "full" Perl vos/configure_full_perl.sh VOS shell script to configure "full" perl before building -vos/make_full_perl.sh VOS shell script to build and test "full" perl +vos/make_full_perl.sh VOS shell script to build and test "full" perl +vos/syslog.h syslog header for VOS vos/vos.c VOS emulations for missing POSIX functions vos/vosish.h VOS-specific header file warnings.h The warning numbers diff --git a/vos/Changes b/vos/Changes index 3426d20c94..2d49a3c885 100644 --- a/vos/Changes +++ b/vos/Changes @@ -1,6 +1,11 @@ This file documents the changes made to port Perl to the Stratus VOS operating system. +For 5.10.0: + Added support for the syslog family of functions to vos.c. + This allows the source code to be built on versions of VOS + that do not support the syslog functions. + For 5.9.0: Removed support for building (mini) perl on VOS using custom VOS command macros. Henceforth, perl must be built diff --git a/vos/syslog.h b/vos/syslog.h new file mode 100644 index 0000000000..1916fc1b34 --- /dev/null +++ b/vos/syslog.h @@ -0,0 +1,75 @@ +/* Beginning of modification history */ +/* Written 02-08-13 by PG */ +/* End of modification history */ + +/* This header conforms to IEEE Std 1003.1-2001 */ + +#ifndef _INCLUDED_SYSLOG_H +#define _INCLUDED_SYSLOG_H + +/* values of the "logopt" option of openlog */ + +#define LOG_PID 1 +#define LOG_CONS 2 +#define LOG_NDELAY 4 +#define LOG_ODELAY 8 +#define LOG_NOWAIT 16 + +/* values of the "facility" argument of openlog + and of the "priority" argument of syslog */ + +#define LOG_KERN 0 +#define LOG_USER (1<<3) +#define LOG_MAIL (2<<3) +#define LOG_NEWS (3<<3) +#define LOG_UUCP (4<<3) +#define LOG_DAEMON (5<<3) +#define LOG_AUTH (6<<3) +#define LOG_CRON (7<<3) +#define LOG_LPR (8<<3) +#define LOG_LOCAL0 (9<<3) +#define LOG_LOCAL1 (10<<3) +#define LOG_LOCAL2 (11<<3) +#define LOG_LOCAL3 (12<<3) +#define LOG_LOCAL4 (13<<3) +#define LOG_LOCAL5 (14<<3) +#define LOG_LOCAL6 (15<<3) +#define LOG_LOCAL7 (16<<3) + +/* macro for constructing "maskpri" arg to setlogmask */ + +#define LOG_MASK(p) (1 << (p)) + +/* values of the "priority" argument of syslog */ + +#define LOG_EMERG 0 +#define LOG_ALERT 1 +#define LOG_CRIT 2 +#define LOG_ERR 3 +#define LOG_WARNING 4 +#define LOG_NOTICE 5 +#define LOG_INFO 6 +#define LOG_DEBUG 7 + +#undef __P +#ifdef __PROTOTYPES__ +#define __P(args) args +#else +#define __P(args) () +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +extern void closelog __P((void)); +extern void openlog __P((const char *ident, int logopt, + int facility)); +extern int setlogmask __P((int maskpri)); +extern void syslog __P((int priority, const char * message, ...)); + +#ifdef __cplusplus +} +#endif + +#endif /* _INCLUDED_SYSLOG_H */ @@ -4,13 +4,20 @@ add socketpair() dummy. */ /* Modified 02-04-24 by Paul Green (Paul.Green@stratus.com) to have pow(0,0) return 1, avoiding c-1471. */ +/* Modified 06-09-25 by Paul Green (Paul.Green@stratus.com) to + add syslog entries. */ /* End of modification history */ #include <errno.h> #include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <sys/types.h> #include <unistd.h> +#include "vos/syslog.h" + /* VOS doesn't supply a truncate function, so we build one up from the available POSIX functions. */ @@ -56,3 +63,228 @@ double x, y; return(s_crt_pow(&x,&y)); } + +/* entries */ + +extern void s$log_system_message ( +/* char_varying (256) *message_text, + char_varying (66) *module_name, + short int *error_code */ ); + +/* constants */ + +#define ALL_PRIORITIES 255 /* 8 priorities, all enabled */ +#define BUFFER_LEN 256 +#define IDENT_LEN 64 +#define MSG_LEN 256 +#define PATH_LEN 257 + +/* static */ + +int vos_syslog_facility = LOG_USER>>3; +int vos_syslog_fd = -1; +int vos_syslog_logopt = 0; +char vos_syslog_ident[IDENT_LEN] = ""; +int vos_syslog_ident_len = 0; +int vos_syslog_mask = ALL_PRIORITIES; +char vos_syslog_path[PATH_LEN] = "/Stratus/Green/build_farm/build_farm.syslog"; + +char vos_syslog_facility_name [17][10] = { + "[KERN] ", /* LOG_KERN */ + "[USER] ", /* LOG_USER */ + "[MAIL] ", /* LOG_MAIL */ + "[NEWS] ", /* LOG_NEWS */ + "[UUCP] ", /* LOG_UUCP */ + "[DAEMON] ", /* LOG_DAEMON */ + "[AUTH] ", /* LOG_AUTH */ + "[CRON] ", /* LOG_CRON */ + "[LPR] ", /* LOG_LPR */ + "[LOCAL0] ", /* LOG_LOCAL0 */ + "[LOCAL1] ", /* LOG_LOCAL1 */ + "[LOCAL2] ", /* LOG_LOCAL2 */ + "[LOCAL3] ", /* LOG_LOCAL3 */ + "[LOCAL4] ", /* LOG_LOCAL4 */ + "[LOCAL5] ", /* LOG_LOCAL5 */ + "[LOCAL6] ", /* LOG_LOCAL6 */ + "[LOCAL7] "}; /* LOG_LOCAL7 */ + +/* syslog functions */ + +static void open_syslog (void) +{ + if (vos_syslog_fd >= 0) + return; + + vos_syslog_fd = open (vos_syslog_path, O_RDWR | O_CREAT | O_APPEND, 0777); + if (vos_syslog_fd < 0) + fprintf (stderr, "Unable to open %s (errno=%d, os_errno=%d)\n", + vos_syslog_path, errno, os_errno); +} + +void closelog (void) +{ + if (vos_syslog_fd >= 0) + close (vos_syslog_fd); + + vos_syslog_facility = LOG_USER>>3; + vos_syslog_fd = -1; + vos_syslog_logopt = 0; + vos_syslog_ident[0] = '\0'; + vos_syslog_ident_len = 0; + vos_syslog_mask = ALL_PRIORITIES; + return; +} + +void openlog (const char *ident, int logopt, int facility) +{ +int n; + + if (ident != NULL) + { + strncpy (vos_syslog_ident, ident, sizeof (vos_syslog_ident)); + n = IDENT_LEN - + strnlen (vos_syslog_ident, sizeof (vos_syslog_ident)); + strncat (vos_syslog_ident, ": ", n); + vos_syslog_ident_len = strnlen (vos_syslog_ident, + sizeof (vos_syslog_ident)); + } + + vos_syslog_logopt = logopt; + vos_syslog_facility = facility>>3; + + if ((logopt & LOG_NDELAY) == LOG_NDELAY) + open_syslog (); + + return; +} + +int setlogmask (int maskpri) +{ +int old_mask; + + old_mask = vos_syslog_mask; + + if (maskpri > 0) + vos_syslog_mask = maskpri; + + return old_mask; +} + +void syslog (int priority, const char *format, ...) +{ +va_list ap; +int bare_facility; +int bare_priority; +int buffer_n; +char buffer[BUFFER_LEN]; +short int code; +char_varying(MSG_LEN) message; +char_varying(66) module_name; +int n; +int pid_n; +char pid_string[32]; +int r; +int user_n; +char user_string[256]; + + /* Calculate priority and facility value. */ + + bare_priority = priority & 3; + bare_facility = priority >> 3; + + /* If the priority is not set in the mask, do not log the + message. */ + + if ((vos_syslog_mask & LOG_MASK(bare_priority)) == 0) + return; + + /* Output facility name. */ + + if (bare_facility == 0) + bare_facility = vos_syslog_facility; + + strcpy (buffer, vos_syslog_facility_name[bare_facility]); + + /* Output priority value. */ + + /* TBD */ + + /* Output identity string. */ + + buffer_n = BUFFER_LEN - strlen (buffer); + strncat (buffer, vos_syslog_ident, buffer_n); + + /* Output process ID. */ + + if ((vos_syslog_logopt & LOG_PID) == LOG_PID) + { + pid_n = snprintf (pid_string, sizeof (pid_string), + "PID=0x%x ", getpid ()); + if (pid_n) + { + buffer_n = BUFFER_LEN - strlen (buffer); + strncat (buffer, pid_string, buffer_n); + } + } + + /* Output formatted message. */ + + va_start (ap, format); + user_n = vsnprintf (user_string, sizeof (user_string), format, ap); + va_end (ap); + + /* Ensure string ends in a newline. */ + + if (user_n > 0) + { + if (user_n >= sizeof (user_string)) + user_n = sizeof (user_string) - 1; + + /* arrays are zero-origin.... */ + + if (user_string [user_n-1] != '\n') + { + user_string [user_n-1] = '\n'; + user_string [user_n++] = '\0'; + } + } + else + { + user_string [0] = '\n'; + user_string [1] = '\0'; + user_n = 1; + } + + buffer_n = BUFFER_LEN - strnlen (buffer, sizeof (buffer)); + strncat (buffer, user_string, buffer_n); + + /* If the log is not open, try to open it now. */ + + if (vos_syslog_fd < 0) + open_syslog (); + + /* Try to write the message to the syslog file. */ + + if (vos_syslog_fd < 0) + r = -1; + else + { + buffer_n = strnlen (buffer, sizeof (buffer)); + r = write (vos_syslog_fd, buffer, buffer_n); + } + + /* If we were unable to write to the log and if LOG_CONS is + set, send it to the console. */ + + if (r < 0) + if ((vos_syslog_logopt & LOG_CONS) == LOG_CONS) + { + strcpy_vstr_nstr (&message, "syslog: "); + n = MSG_LEN - sizeof ("syslog: "); + strncat_vstr_nstr (&message, buffer, n); + strcpy_vstr_nstr (&module_name, ""); + s$log_system_message (&message, &module_name, &code); + } + + return; +} |