From 31473b7107617f08cea7d7efdf5e0cfc1dfa8e83 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 16 Nov 1999 16:03:21 +0000
Subject: Works now.

Removed times() since the version in the C Library support code is
fine.
---
 c/src/exec/libcsupport/src/utsname.c | 31 ++++++++++++-------------------
 c/src/exec/posix/src/utsname.c       | 31 ++++++++++++-------------------
 c/src/lib/libc/utsname.c             | 31 ++++++++++++-------------------
 3 files changed, 36 insertions(+), 57 deletions(-)

(limited to 'c/src')

diff --git a/c/src/exec/libcsupport/src/utsname.c b/c/src/exec/libcsupport/src/utsname.c
index 7cd9fae002..7da5f9380d 100644
--- a/c/src/exec/libcsupport/src/utsname.c
+++ b/c/src/exec/libcsupport/src/utsname.c
@@ -5,10 +5,15 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <errno.h>
 #include <sys/utsname.h>
 
+
 #include <rtems/system.h>
 #include <rtems/score/object.h>
+#include <rtems/sptables.h>
+
+#include <rtems/posix/seterr.h>
 
 /*PAGE
  *
@@ -27,30 +32,18 @@ int uname(
           machine = sun4m
   */
 
+  if ( !name )
+    set_errno_and_return_minus_one( EFAULT );
+
   strcpy( name->sysname, "RTEMS" );
 
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
+  sprintf( name->nodename, "Node %d", _Objects_Local_node );
 
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "4.0.0+" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
+  strcpy( name->release, RTEMS_VERSION );
 
+  strcpy( name->version, "" );
+ 
   sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
 
   return 0;
 }
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/c/src/exec/posix/src/utsname.c b/c/src/exec/posix/src/utsname.c
index 7cd9fae002..7da5f9380d 100644
--- a/c/src/exec/posix/src/utsname.c
+++ b/c/src/exec/posix/src/utsname.c
@@ -5,10 +5,15 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <errno.h>
 #include <sys/utsname.h>
 
+
 #include <rtems/system.h>
 #include <rtems/score/object.h>
+#include <rtems/sptables.h>
+
+#include <rtems/posix/seterr.h>
 
 /*PAGE
  *
@@ -27,30 +32,18 @@ int uname(
           machine = sun4m
   */
 
+  if ( !name )
+    set_errno_and_return_minus_one( EFAULT );
+
   strcpy( name->sysname, "RTEMS" );
 
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
+  sprintf( name->nodename, "Node %d", _Objects_Local_node );
 
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "4.0.0+" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
+  strcpy( name->release, RTEMS_VERSION );
 
+  strcpy( name->version, "" );
+ 
   sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
 
   return 0;
 }
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
diff --git a/c/src/lib/libc/utsname.c b/c/src/lib/libc/utsname.c
index 7cd9fae002..7da5f9380d 100644
--- a/c/src/lib/libc/utsname.c
+++ b/c/src/lib/libc/utsname.c
@@ -5,10 +5,15 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <errno.h>
 #include <sys/utsname.h>
 
+
 #include <rtems/system.h>
 #include <rtems/score/object.h>
+#include <rtems/sptables.h>
+
+#include <rtems/posix/seterr.h>
 
 /*PAGE
  *
@@ -27,30 +32,18 @@ int uname(
           machine = sun4m
   */
 
+  if ( !name )
+    set_errno_and_return_minus_one( EFAULT );
+
   strcpy( name->sysname, "RTEMS" );
 
-  sprintf( name->nodename, "Node %d\n", _Objects_Local_node );
+  sprintf( name->nodename, "Node %d", _Objects_Local_node );
 
-  /* XXX release string is in BAD format for this routine!!! */ 
-  strcpy( name->release, "4.0.0+" );
- 
-  /* XXX does this have any meaning for RTEMS */
-   
-  strcpy( name->release, "" );
+  strcpy( name->release, RTEMS_VERSION );
 
+  strcpy( name->version, "" );
+ 
   sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME );
 
   return 0;
 }
-
-/*PAGE
- *
- *  4.5.2 Get Process Times, P1003.1b-1993, p. 92
- */
-
-clock_t times(
-  struct tms   *buffer
-)
-{
-  return POSIX_NOT_IMPLEMENTED();
-}
-- 
cgit v1.2.3