Module Name: xsrc
Committed By: tsutsui
Date: Sun Nov 1 11:40:53 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c
Log Message:
Call LogInit() for logging to /var/log/X68k.%s.log as Xorg and Xsun servers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.8 Sat Aug 1 20:09:03 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Sun Nov 1 11:40:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.8 2020/08/01 20:09:03 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.9 2020/11/01 11:40:53 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -75,9 +75,35 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
static int nscreens;
+/* default log file paths */
+#ifndef DEFAULT_LOGDIR
+#define DEFAULT_LOGDIR "/var/log"
+#endif
+#ifndef DEFAULT_LOGPREFIX
+#define DEFAULT_LOGPREFIX "X68K."
+#endif
+
void
OsVendorInit(void)
{
+ static int inited;
+
+ if (!inited) {
+ const char *logfile;
+ char *lf;
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+ logfile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
+ if (asprintf(&lf, "%s%%s" LOGSUFFIX, logfile) == -1)
+ FatalError("Cannot allocate space for the log file name\n");
+ LogInit(lf, LOGOLDSUFFIX);
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+ free(lf);
+
+ inited = 1;
+ }
}
#ifdef GLXEXT
@@ -178,6 +204,7 @@ AbortDDX(enum ExitCode error)
fb = x68kGetFbProcRec(i);
(*fb->close)(screen);
}
+ LogClose(error);
}
/*-------------------------------------------------------------------------
