[23150] in Source-Commits
/svn/athena r22811 - trunk/athena/lib/zephyr/server
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Thu Apr 3 13:25:02 2008
Date: Thu, 3 Apr 2008 13:24:44 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200804031724.NAA06545@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-04-03 13:24:44 -0400 (Thu, 03 Apr 2008)
New Revision: 22811
Modified:
trunk/athena/lib/zephyr/server/version.c
Log:
From Karl Ramm: In the Zephyr server verison-reporting code, if the
#ifdef checks can't identify the operating system, use uname.
Modified: trunk/athena/lib/zephyr/server/version.c
===================================================================
--- trunk/athena/lib/zephyr/server/version.c 2008-04-03 17:04:12 UTC (rev 22810)
+++ trunk/athena/lib/zephyr/server/version.c 2008-04-03 17:24:44 UTC (rev 22811)
@@ -12,6 +12,8 @@
#include <zephyr/mit-copyright.h>
+#include <sys/utsname.h>
+
#include "zserver.h"
#include "version.h"
@@ -34,6 +36,7 @@
get_version()
{
static char vers_buf[256];
+ struct utsname un;
if (vers_buf[0] == '\0') {
#ifdef DEBUG
@@ -73,11 +76,13 @@
#ifdef NeXT
(void) strcat(vers_buf, "NeXT");
#endif /* NeXT */
+
+ if (vers_buf[strlen(vers_buf) - 1] == '/') {
+ uname(&un);
+ (void) strcat(vers_buf, un.machine);
+ (void) strcat(vers_buf, "-");
+ (void) strcat(vers_buf, un.sysname);
+ }
}
return(vers_buf);
}
-
-
-
-
-
