Changeset 3248 in kBuild for trunk/src/kmk

Timestamp:

Dec 26, 2018 4:05:33 AM (6 years ago)

Author:

bird

Message:

kmkbuiltin: Darwin build fixes

Location:

trunk/src/kmk/kmkbuiltin

Files:

• getopt_r.h (modified) (1 diff)
• strlcpy.c (modified) (2 diffs)
• touch.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/getopt_r.h

@@ -33 +33 @@
 #ifndef INCLUDED_GETOPT_R_H
 #define INCLUDED_GETOPT_R_H 1
+
+#include <stddef.h>
 
 #ifdef  __cplusplus

trunk/src/kmk/kmkbuiltin/strlcpy.c

@@ -37 +37 @@
 #include <string.h>
 
+/* This trick is for bootstrap.gmk. */
+#if defined(__DARWIN_C_LEVEL) && defined(__DARWIN_C_FULL)
+# define SKIP_STRLCPY
+#endif
+#ifndef SKIP_STRLCPY
+
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
@@ -69 +75 @@
         return(s - src - 1);    /* count does not include NUL */
 }
+
+#endif /* !SKIP_STRLCPY */

trunk/src/kmk/kmkbuiltin/touch.c

@@ -69 +69 @@
 /** Checks an alleged digit. */
 #define IS_DIGIT(chDigit, uMax)          ( ((unsigned)(chDigit) - (unsigned)'0') <= (unsigned)(uMax) )
+
+/* Missing config.h bits for high res timestamp. */
+#if FILE_TIMESTAMP_HI_RES
+# ifndef ST_ATIM_NSEC
+#  define ST_ATIM_NSEC st_atim.tv_nsec
+# endif
+# ifndef ST_MTIM_NSEC
+#  define ST_MTIM_NSEC st_mtim.tv_nsec
+# endif
+#endif
 
 
@@ -694 +704 @@
                         pThis->NewMTime.tv_sec  = St.st_mtime;
 #if FILE_TIMESTAMP_HI_RES
-                        pThis->NewATime.tv_usec = St.st_atim.tv_nsec / 1000;
-                        pThis->NewMTime.tv_usec = St.st_mtim.tv_nsec / 1000;
+                        pThis->NewATime.tv_usec = St.ST_ATIM_NSEC / 1000;
+                        pThis->NewMTime.tv_usec = St.ST_MTIM_NSEC / 1000;
 #else
                         pThis->NewATime.tv_usec = 0;
@@ -840 +850 @@
     aTimes[1].tv_sec  = St.st_mtime;
 #if FILE_TIMESTAMP_HI_RES
-    aTimes[0].tv_usec = St.st_atim.tv_nsec / 1000;
-    aTimes[1].tv_usec = St.st_mtim.tv_nsec / 1000;
+    aTimes[0].tv_usec = St.ST_ATIM_NSEC / 1000;
+    aTimes[1].tv_usec = St.ST_MTIM_NSEC / 1000;
 #else
     aTimes[0].tv_usec = 0;