mescc: Mes C Library: Support GNU Tar: Add mktime stub, fix localtime stub.

* include/time.h (mktime): Declare.
* lib/stub/mktime.c: New stub.
* lib/libc+gnu.c: Include it.
* lib/stub/localtime.c (localtime): Return pointer to static struct
tm.  Avoids segfaults.

diff --git a/build-aux/configure-lib.sh b/build-aux/configure-lib.sh
index ea9edee063d4b55ea8f9004c5928250db1217b68..575e521213b6a6a1c8ec6480c5291c2b5ad30c21 100644 (file)
--- a/build-aux/configure-lib.sh
+++ b/build-aux/configure-lib.sh
@@ -275,6 +275,7 @@ lib/stub/getlogin.c
 lib/stub/getpwnam.c
 lib/stub/getpwuid.c
 lib/stub/gmtime.c
+lib/stub/mktime.c
 lib/stub/pclose.c
 lib/stub/popen.c
 lib/stub/rand.c

diff --git a/include/time.h b/include/time.h
index dc05b69f87c484a0a8ec027c1b1c5af069aeffb8..60cc0f44ee027e0222b03f3cfb256b4c933c349d 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -59,6 +59,7 @@ struct timespec
 int clock_gettime (clockid_t clk_id, struct timespec *tp);
 struct tm *localtime (time_t const *timep);
 struct tm *gmtime (time_t const *time);
+int mktime (struct tm *broken_time);
 int nanosleep (struct timespec const *requested_time, struct timespec const *remaining);
 time_t time (time_t * tloc);
 

diff --git a/lib/stub/localtime.c b/lib/stub/localtime.c
index 3b060cc24a1a9768ee36dca47f68a38827f24d10..0382678d777baef5f155b8f1604d0e9d1da1b20c 100644 (file)
--- a/lib/stub/localtime.c
+++ b/lib/stub/localtime.c
@@ -1,6 +1,6 @@
 /* -*-comment-start: "//";comment-end:""-*-
  * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ * Copyright © 2017,2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
  *
  * This file is part of GNU Mes.
  *
@@ -31,5 +31,6 @@ localtime (time_t const *timep)
     eputs ("localtime stub\n");
   stub = 1;
   errno = 0;
-  return 0;
+  static struct tm zero = { 0 };
+  return &zero;
 }

diff --git a/lib/stub/mktime.c b/lib/stub/mktime.c
new file mode 100644 (file)
index 0000000..65e49ac
--- /dev/null
+++ b/lib/stub/mktime.c
@@ -0,0 +1,33 @@
+/* -*-comment-start: "//";comment-end:""-*-
+ * GNU Mes --- Maxwell Equations of Software
+ * Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+ *
+ * This file is part of GNU Mes.
+ *
+ * GNU Mes is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * GNU Mes is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mes/lib.h>
+#include <time.h>
+
+int
+mktime (struct tm *broken_time)
+{
+  static int stub = 0;
+  if (__mes_debug () && !stub)
+    eputs ("mktime stub\n");
+  stub = 1;
+  errno = 0;
+  return 0;
+}