Various enhancements for zopen tools

CMakeLists.txt

@@ -9,11 +9,7 @@
 cmake_minimum_required(VERSION 3.24)
 project(libzoslib CXX C ASM)
 
-if(${CMAKE_C_COMPILER} MATCHES xlclang)
-  include_directories(BEFORE include)
-else()
-  include_directories(BEFORE include include/c++/v1)
-endif()
+include_directories(BEFORE include)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
@@ -53,6 +49,11 @@ if(ZOSLIB_GENERIC)
        ZOSLIB_GENERIC)
 endif()
 
+if(ZOSLIB_QUICK_STARTUP)
+  list(APPEND zoslib_defines
+       ZOSLIB_QUICK_STARTUP)
+endif()
+
 
 if(DEFINED ENV{BUILD_VERSION})
   list(APPEND zoslib_defines BUILD_VERSION="$ENV{BUILD_VERSION}")
@@ -81,7 +82,7 @@ else()
   list(APPEND zoslib_cflags
     -fgnu-keywords
     -m64
-    -march=arch14
+    -march=arch10
     -mzos-target=zosv2r4
     -fno-short-enums
     -fzos-le-char-mode=ascii)

README.md

@@ -52,7 +52,8 @@ ZOSLIB is supported on the following hardware:
 * CMake 3.24.2-zos+
 * GNU Make 4.3+
 * IBM XL C/C++ V2.3.1 for z/OS V2.3 web deliverable (xlclang/xlcang++) or
-  IBM Open XL C/C++ 2.0 (clang/clang++)
+  IBM C/C++ for Open Enterprise Languages on z/OS 2.0.0 (clang/clang++) or
+  IBM Open XL C/C++ 2.1 for z/OS, version 2.1 (ibm-clang64/ibm-clang++64)
 * Git
 * Ninja (optional)
 

include/netinet/in_systm.h

@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2024. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_IN_SYSTM_H_
+#define ZOS_IN_SYSTM_H_
+
+#include <stdint.h>
+
+// Network types
+typedef uint16_t n_short; 
+typedef uint32_t n_long;
+typedef uint32_t n_time;
+
+#endif 

include/paths.h

@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2024. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_PATHS_H_
+
+#define _PATH_BSHELL        "/bin/sh"
+
+#endif

include/pthread.h

@@ -0,0 +1,55 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2021. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_PTHREAD_H_
+#define ZOS_PTHREAD_H_
+
+#define __XPLAT 1
+#include "zos-macros.h"
+#include <sys/types.h>
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+__Z_EXPORT int __pthread_create_extended(pthread_t *thread,
+                          const pthread_attr_t *attr,
+                          void *(*start_routine)(void *),
+                          void *arg); 
+#if defined(__cplusplus)
+}
+#endif
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD)
+#define pthread_create __pthread_create_replaced
+#endif
+
+#include_next <pthread.h>
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD)
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#undef pthread_create 
+__Z_EXPORT int pthread_create(pthread_t *thread,
+                          const pthread_attr_t *attr,
+                          void *(*start_routine)(void *),
+                          void *arg) asm("__pthread_create_extended");
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_PTHREAD) */
+
+#ifndef PTHREAD_RWLOCK_INITIALIZER
+#define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER_NP
+#endif
+
+#endif

include/pty.h

@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+//// Licensed Materials - Property of IBM
+//// ZOSLIB
+//// (C) Copyright IBM Corp. 2022. All Rights Reserved.
+//// US Government Users Restricted Rights - Use, duplication
+//// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+/////////////////////////////////////////////////////////////////////////////////
+//
+#ifndef ZOS_PTY_H
+#define ZOS_PTY_H
+
+#include "zos-macros.h"
+#include <termios.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Create pseudo tty master slave pair with NAME and set terminal
+   attributes according to TERMP and WINP and return handles for both
+   ends in AMASTER and ASLAVE.  */
+__Z_EXPORT extern int openpty (int *__amaster, int *__aslave, char *__name,
+                    const struct termios *__termp,
+                    const struct winsize *__winp);
+
+/* Create child process and establish the slave pseudo terminal as the
+   child's controlling terminal.  */
+__Z_EXPORT extern int forkpty (int *__amaster, char *__name,
+                    const struct termios *__termp,
+                    const struct winsize *__winp);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/stdio.h

@@ -10,6 +10,7 @@
 #define ZOS_STDIO_H_
 
 #include "zos-macros.h"
+#include <sys/types.h>
 
 #define __XPLAT 1
 
@@ -39,6 +40,9 @@ extern "C" {
 #endif
 
 __Z_EXPORT extern FILE *fopen(const char *filename, const char *mode) __asm("__fopen_ascii");
+__Z_EXPORT ssize_t getline(char **lineptr, size_t *n, FILE *stream);
+__Z_EXPORT ssize_t getdelim(char **lineptr, size_t *n, int delimiter, FILE *stream);
+__Z_EXPORT int vasprintf(char **strp, const char *fmt, va_list ap);
 
 #if defined(__cplusplus)
 }

include/stdlib.h

@@ -34,6 +34,10 @@ __Z_EXPORT int __mkstemp_ascii(char*);
 #define realpath __realpath_replaced
 #undef mkstemp
 #define mkstemp __mkstemp_replaced
+#undef malloc
+#define malloc __malloc_replaced
+#undef free
+#define free __free_replaced
 #endif
 
 #if defined(ZOSLIB_OVERRIDE_CLIB_GETENV) && defined(__NATIVE_ASCII_F)
@@ -46,6 +50,11 @@ __Z_EXPORT int __mkstemp_ascii(char*);
 
 #if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_STDLIB)
 
+#undef realpath
+#undef mkstemp
+#undef malloc
+#undef free
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -55,6 +64,8 @@ extern "C" {
  */
 #undef realpath
 __Z_EXPORT char *realpath(const char * __restrict__, char * __restrict__) __asm("__realpath_extended");
+__Z_EXPORT void* malloc(size_t size) __asm("__zoslib_malloc");
+__Z_EXPORT void free(void* ptr) __asm("__zoslib_free");
 
 #ifdef __NATIVE_ASCII_F
 /**
@@ -104,6 +115,9 @@ extern "C" {
  */
 __Z_EXPORT int getloadavg(double loadavg[], int nelem);
 __Z_EXPORT const char * getprogname(void);
+__Z_EXPORT int mkostemp(char *, int flags);
+__Z_EXPORT int mkstemps(char *, int suffixlen);
+__Z_EXPORT int mkostemps(char *, int suffixlen, int flags);
 #if defined(__cplusplus)
 }
 #endif
@@ -124,6 +138,8 @@ __Z_EXPORT char *mkdtemp(char *);
 #endif
 
 #if defined(__cplusplus)
+__Z_EXPORT void __zoslib_free(void* ptr);
+__Z_EXPORT void* __zoslib_malloc(size_t size);
 }
 #endif
 

include/string.h

@@ -24,6 +24,9 @@ __Z_EXPORT char *strndup(const char *s, size_t n);
 __Z_EXPORT char *strsignal(int );
 __Z_EXPORT const char *sigdescr_np(int);
 __Z_EXPORT const char *sigabbrev_np(int);
+__Z_EXPORT void *memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen);
+__Z_EXPORT int strverscmp(const char *l0, const char *r0);
+__Z_EXPORT char *strcasestr(const char *haystack, const char *needle);
 
 // Linux includes strings.h in string.h, this avoids the 
 // warning - implicitly declaring library function 'strcasecmp'

include/sys/param.h

@@ -9,5 +9,12 @@
 #ifndef ZOS_SYS_PARAM_H_
 #define ZOS_SYS_PARAM_H_
 
+// Could be defined in resolv.h
+#ifndef MAXHOSTNAMELEN
+  #define MAXHOSTNAMELEN 64
+#endif
+
+#define MAXNAMLEN 255
+#define MAXPATHLEN 4096
 
 #endif

include/sys/signalfd.h

@@ -0,0 +1,65 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2022. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_SYS_SIGNALFD_H
+#define ZOS_SYS_SIGNALFD_H
+
+#include <stdint.h>
+#include <signal.h>
+
+/* Flags for signalfd.  */
+enum {
+  SFD_CLOEXEC = 02000000,
+#define SFD_CLOEXEC SFD_CLOEXEC
+  SFD_NONBLOCK = 00004000
+#define SFD_NONBLOCK SFD_NONBLOCK
+};
+
+
+struct signalfd_siginfo {
+  uint32_t ssi_signo;
+  int32_t ssi_errno;
+  int32_t ssi_code;
+  uint32_t ssi_pid;
+  uint32_t ssi_uid;
+  int32_t ssi_fd;
+  uint32_t ssi_tid;
+  uint32_t ssi_band;
+  uint32_t ssi_overrun;
+  uint32_t ssi_trapno;
+  int32_t ssi_status;
+  uint32_t ssi_int;
+  uint64_t ssi_ptr;
+  uint64_t ssi_utime;
+  uint64_t ssi_stime;
+  uint64_t ssi_addr;
+  /*
+   * Pad strcture to 128 bytes. Remember to update the
+   * pad size when you add new members. We use a fixed
+   * size structure to avoid compatibility problems with
+   * future versions, and we leave extra space for additional
+   * members. We use fixed size members because this strcture
+   * comes out of a read(2) and we really don't want to have
+   * a compat on read(2).
+   */
+  uint8_t __pad[48];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__Z_EXPORT extern int signalfd(int fd, const sigset_t *mask, int flags);
+
+__Z_EXPORT int signalfd_close(int fd);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/sys/time.h

@@ -65,4 +65,32 @@ __Z_EXPORT int lutimes(const char *filename, const struct timeval tv[2]);
 
 #endif
 
+/* Convenience macros for operations on timevals.
+   NOTE: `timercmp' does not work for >= or <=.  */
+#define timerisset(tvp)        ((tvp)->tv_sec || (tvp)->tv_usec)
+#define timerclear(tvp)        ((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#define timercmp(a, b, CMP)                                                  \
+  (((a)->tv_sec == (b)->tv_sec)                                               \
+   ? ((a)->tv_usec CMP (b)->tv_usec)                                          \
+   : ((a)->tv_sec CMP (b)->tv_sec))
+#define timeradd(a, b, result)                                               \
+  do {                                                                        \
+    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;                             \
+    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;                          \
+    if ((result)->tv_usec >= 1000000)                                         \
+      {                                                                       \
+        ++(result)->tv_sec;                                                   \
+        (result)->tv_usec -= 1000000;                                         \
+      }                                                                       \
+  } while (0)
+#define timersub(a, b, result)                                               \
+  do {                                                                        \
+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;                             \
+    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;                          \
+    if ((result)->tv_usec < 0) {                                              \
+      --(result)->tv_sec;                                                     \
+      (result)->tv_usec += 1000000;                                           \
+    }                                                                         \
+  } while (0)
+
 #endif

include/termios.h

@@ -0,0 +1,26 @@
+///////////////////////////////////////////////////////////////////////////////
+//// Licensed Materials - Property of IBM
+//// ZOSLIB
+//// (C) Copyright IBM Corp. 2022. All Rights Reserved.
+//// US Government Users Restricted Rights - Use, duplication
+//// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+/////////////////////////////////////////////////////////////////////////////////
+//
+#ifndef ZOS_TERMIOS_H
+#define ZOS_TERMIOS_H
+
+#include "zos-macros.h"
+
+#include_next <termios.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__Z_EXPORT void cfmakeraw(struct termios *termios_p);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif