r238@bucket (orig r234): kcr | 2007-12-27 20:06:52 -0500

 if the #if ladder doesn't find anything, fall back to uname.

git-svn-id: svn://svn.1ts.org/debian/trunk@307 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/server/version.c b/zephyr/server/version.c
index 230a66cc01aa3327b830e0f5206ec94e1006bea7..f397f5ff48421d57fd7ee36035ebc5dfa3622e2d 100644 (file)
--- a/zephyr/server/version.c
+++ b/zephyr/server/version.c
@@ -12,6 +12,8 @@
 
 #include <zephyr/mit-copyright.h>
 
+#include <sys/utsname.h>
+
 #include "zserver.h"
 #include "version.h"
 
@@ -34,6 +36,7 @@ char *
 get_version()
 {
   static char vers_buf[256];
+  struct utsname un;
 
   if (vers_buf[0] == '\0') {
 #ifdef DEBUG
@@ -73,11 +76,13 @@ get_version()
 #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);
 }
-
-
-
-
-