summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bushnell <thomas@gnu.org>1996-10-26 01:09:12 +0000
committerThomas Bushnell <thomas@gnu.org>1996-10-26 01:09:12 +0000
commitff2e700e59fcd512876b6a0f9056cabeac49d3d3 (patch)
tree5ba55c55f4b9226a1909a691c995027c0d223daf
parent5717a89bc7af7ccbd2f104551876291338f7888c (diff)
Fri Oct 25 20:30:22 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* host.c: Include <version.h>. Thu Oct 24 16:13:40 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * host.c (initialize_version_info): Construct UNAME_INFO.machine with a dash instead of a slash so that it can be used as a file name component. * host.c (initialize_version_info): Copy our version into element 0 of server_versions, not element 1. Use HURD_VERSION instead of OUR_VERSION. Use literal "proc" instead of OUR_SERVER_NAME. * proc.h (OUR_SERVER_NAME, OUR_VERSION): Delete macro.
-rw-r--r--proc/ChangeLog15
-rw-r--r--proc/host.c7
-rw-r--r--proc/proc.h4
3 files changed, 19 insertions, 7 deletions
diff --git a/proc/ChangeLog b/proc/ChangeLog
index 9745ce63..d0eef9af 100644
--- a/proc/ChangeLog
+++ b/proc/ChangeLog
@@ -1,3 +1,18 @@
+Fri Oct 25 20:30:22 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * host.c: Include <version.h>.
+
+Thu Oct 24 16:13:40 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * host.c (initialize_version_info): Construct UNAME_INFO.machine
+ with a dash instead of a slash so that it can be used as a file
+ name component.
+
+ * host.c (initialize_version_info): Copy our version into element
+ 0 of server_versions, not element 1. Use HURD_VERSION instead of
+ OUR_VERSION. Use literal "proc" instead of OUR_SERVER_NAME.
+ * proc.h (OUR_SERVER_NAME, OUR_VERSION): Delete macro.
+
Thu Sep 12 16:33:49 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* Makefile (HURDLIBS): New variable.
diff --git a/proc/host.c b/proc/host.c
index ab6ca059..fbbe1317 100644
--- a/proc/host.c
+++ b/proc/host.c
@@ -31,6 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <hurd/exec.h>
#include <unistd.h>
#include <assert.h>
+#include <version.h>
#include "proc.h"
#include "process_S.h"
@@ -397,7 +398,7 @@ initialize_version_info (void)
err = host_info (mach_host_self (), HOST_BASIC_INFO, (int *) &info, &n);
assert (! err);
- snprintf (uname_info.machine, sizeof uname_info.machine, "%s/%s",
+ snprintf (uname_info.machine, sizeof uname_info.machine, "%s-%s",
mach_cpu_types[info.cpu_type],
mach_cpu_subtypes[info.cpu_type][info.cpu_subtype]);
@@ -417,8 +418,8 @@ initialize_version_info (void)
kernel_name = strdup (p ? kv : "mach");
kernel_version = strdup (p ? p + 1 : kv);
- server_versions[1].name = strdup (OUR_SERVER_NAME);
- server_versions[1].version = strdup (OUR_VERSION);
+ server_versions[0].name = strdup ("proc");
+ server_versions[0].version = strdup (HURD_VERSION);
nserver_versions = 1;
diff --git a/proc/proc.h b/proc/proc.h
index 30886487..8a84ddc7 100644
--- a/proc/proc.h
+++ b/proc/proc.h
@@ -143,10 +143,6 @@ mach_port_t generic_port; /* messages not related to a specific proc */
struct mutex global_lock;
-/* Our name for version system */
-#define OUR_SERVER_NAME "proc"
-#define OUR_VERSION "0.0"
-
extern inline void
process_drop (struct proc *p)
{