Changeset 2227

Timestamp:

Jul 7, 2005, 5:27:06 AM (20 years ago)

Author:

bird

Message:

Changed utimes() to allow NULL pointer parameter. Please note that BSD will crash in if you try it there.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/sys/times.h (modified) (1 diff, 1 prop)
• src/lib/time/times.c (modified) (1 diff, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -1 +1 @@
 /* $Id$ */
+
+2005-07-06: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o Changed utimes() to allow NULL pointer parameter.
+          Please note that BSD will crash in if you try it there.
 
 2005-07-05: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/include/sys/times.h

@@ -1 +1 @@
 /* sys/times.h (emx+gcc) */
+/** @file
+ * EMX
+ * @changed bird: corrected prototype, added BSD type blocker and use BSD style C++ wrappers.
+ */
 
 #ifndef _SYS_TIMES_H
 #define _SYS_TIMES_H
 
-#if defined (__cplusplus)
-extern "C" {
-#endif
+#include <sys/cdefs.h>
+#include <sys/_types.h>
 
-#if !defined (_CLOCK_T)
+__BEGIN_DECLS
+#if !defined (_CLOCK_T) && !defined(_CLOCK_T_DECLARED)
+typedef __clock_t clock_t;
+#define _CLOCK_T_DECLARED
 #define _CLOCK_T
-typedef long clock_t;
 #endif
 
 struct tms
 {
-  clock_t tms_utime;
-  clock_t tms_stime;
-  clock_t tms_cutime;
-  clock_t tms_cstime;
+    clock_t tms_utime;
+    clock_t tms_stime;
+    clock_t tms_cutime;
+    clock_t tms_cstime;
 };
 
-long times (struct tms *);
-
-#if defined (__cplusplus)
-}
-#endif
+clock_t times(struct tms *);
+__END_DECLS
 
 #endif /* not _SYS_TIMES_H */

trunk/src/emx/src/lib/time/times.c

@@ -8 +8 @@
 /* Note: return value overflows */
 
-long _STD(times) (struct tms *buffer)
+clock_t _STD(times) (struct tms *buffer)
 {
   struct timeval tv;
-
-  buffer->tms_utime = clock ();  /* clock () * HZ / CLOCKS_PER_SEC */
-  buffer->tms_stime = 0;
-  buffer->tms_cutime = 0;
-  buffer->tms_cstime = 0;
+  if (buffer)
+    {
+      buffer->tms_utime = clock ();  /* clock () * HZ / CLOCKS_PER_SEC */
+      buffer->tms_stime = 0;
+      buffer->tms_cutime = 0;
+      buffer->tms_cstime = 0;
+    }
   if (gettimeofday (&tv, NULL) != 0)
     return -1;