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)
@@ -36,6 +32,7 @@ list(APPEND zoslib_defines
   _OPEN_MSGQ_EXT
   _OPEN_SYS_FILE_EXT=1
   _OPEN_SYS_SOCK_IPV6
+  _Packed=
   PATH_MAX=1024
   _UNIX03_SOURCE
   _UNIX03_THREADS
@@ -53,6 +50,10 @@ 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,8 +82,8 @@ else()
   list(APPEND zoslib_cflags
     -fgnu-keywords
     -m64
-    -march=arch14
-    -mzos-target=zosv2r4
+    -march=z13
+    -mzos-target=zosv2r5
     -fno-short-enums
     -fzos-le-char-mode=ascii)
 
@@ -102,3 +103,17 @@ endif()
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   SET(CMAKE_INSTALL_PREFIX "." CACHE PATH "install path" FORCE)
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+set(ZOSLIB_PC_LIBS "" CACHE STRING "Extra libraries for zoslib.pc Libs line")
+set(ZOSLIB_PC_CFLAGS "" CACHE STRING "Extra CFLAGS for zoslib.pc Cflags line")
+
+configure_file(
+  ${CMAKE_SOURCE_DIR}/zoslib.pc.in
+  ${CMAKE_BINARY_DIR}/zoslib.pc
+  @ONLY
+)
+
+install(
+  FILES ${CMAKE_BINARY_DIR}/zoslib.pc
+  DESTINATION lib/pkgconfig
+)

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/dirent.h

@@ -0,0 +1,42 @@
+
+///////////////////////////////////////////////////////////////////////////////
+// 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_DIRENT_H_
+#define ZOS_DIRENT_H_
+
+#include "zos-macros.h"
+#include <features.h>
+
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_DIRENT)
+/* Modify function names in header to avoid conflict with new prototypes 
+TODO: remove this when LE's fdopendir is fixed */
+
+#undef fdopendir
+#define fdopendir __fdopendir_replaced
+#endif
+#include_next <dirent.h>
+
+#if defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_DIRENT)
+
+#undef fdopendir 
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+int scandir(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

include/error.h

@@ -0,0 +1,28 @@
+///////////////////////////////////////////////////////////////////////////////
+// Licensed Materials - Property of IBM
+// ZOSLIB
+// (C) Copyright IBM Corp. 2020, 2024. All Rights Reserved.
+// US Government Users Restricted Rights - Use, duplication
+// or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ZOS_ERROR_H_
+#define ZOS_ERROR_H_
+
+#include "zos-macros.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__Z_EXPORT void __error(int status, int errnum, const char *format, ...);
+
+#ifdef ZOSLIB_OVERRIDE_CLIB_ERROR
+__Z_EXPORT void error(int status, int errnum, const char *format, ...) __asm("__error");
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ZOS_ERROR_H_

include/fcntl.h

@@ -12,8 +12,6 @@
 #include "zos-macros.h"
 #include <sys/types.h>
 
-#define __XPLAT 1
-
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -53,12 +51,4 @@ __Z_EXPORT extern int creat(const char *filename, mode_t mode) __asm("__creat_as
 
 #endif
 
-#if (__EDC_TARGET < 0x42050000) && defined(ZOSLIB_ENABLE_V2R5_FEATURES)
-#define O_CLOEXEC   0x00001000
-#define O_DIRECT    0x00002000
-#define O_NOFOLLOW  0x00004000
-#define O_DIRECTORY 0x00008000
-#define O_PATH      0x00080000
-#endif
-
 #endif

include/fnmatch.h

@@ -0,0 +1,26 @@
+#ifndef	_FNMATCH_H
+#define	_FNMATCH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define FNM_EXTMATCH 0
+
+#define	FNM_PATHNAME 0x1
+#define	FNM_NOESCAPE 0x2
+#define	FNM_PERIOD   0x4
+#define	FNM_LEADING_DIR	0x8           
+#define	FNM_CASEFOLD	0x10
+#define	FNM_FILE_NAME	FNM_PATHNAME
+
+#define	FNM_NOMATCH 1
+#define FNM_NOSYS   (-1)
+
+int fnmatch(const char *, const char *, int);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/fts.h

@@ -0,0 +1,156 @@
+/*	$NetBSD: fts.h,v 1.19 2009/08/16 19:33:38 christos Exp $	*/
+
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)fts.h	8.3 (Berkeley) 8/14/94
+ */
+
+#ifndef	_FTS_H_
+#define	_FTS_H_
+
+#include "zos-macros.h"
+#include <stdint.h>
+#include <sys/types.h>
+
+#ifndef	__fts_stat_t
+#define	__fts_stat_t	struct stat
+#endif
+#ifndef	__fts_nlink_t
+#define	__fts_nlink_t	nlink_t
+#endif
+#ifndef	__fts_ino_t
+#define	__fts_ino_t	ino_t
+#endif
+#ifndef	__fts_length_t
+#define	__fts_length_t	unsigned int
+#endif
+#ifndef	__fts_number_t
+#define	__fts_number_t	int64_t
+#endif
+#ifndef	__fts_dev_t
+#define	__fts_dev_t	dev_t
+#endif
+#ifndef	__fts_level_t
+#define	__fts_level_t	int
+#endif
+
+typedef struct {
+	struct _ftsent *fts_cur;	/* current node */
+	struct _ftsent *fts_child;	/* linked list of children */
+	struct _ftsent **fts_array;	/* sort array */
+	dev_t fts_dev;			/* starting device # */
+	char *fts_path;			/* path for this descent */
+	int fts_rfd;			/* fd for root */
+	unsigned int fts_pathlen;	/* sizeof(path) */
+	unsigned int fts_nitems;	/* elements in the sort array */
+	int (*fts_compar)		/* compare function */
+		(const struct _ftsent **, const struct _ftsent **);
+
+#define	FTS_COMFOLLOW	0x001		/* follow command line symlinks */
+#define	FTS_LOGICAL	0x002		/* logical walk */
+#define	FTS_NOCHDIR	0x004		/* don't change directories */
+#define	FTS_NOSTAT	0x008		/* don't get stat info */
+#define	FTS_PHYSICAL	0x010		/* physical walk */
+#define	FTS_SEEDOT	0x020		/* return dot and dot-dot */
+#define	FTS_XDEV	0x040		/* don't cross devices */
+#define	FTS_WHITEOUT	0x080		/* return whiteout information */
+#define	FTS_OPTIONMASK	0x0ff		/* valid user option mask */
+
+#define	FTS_NAMEONLY	0x100		/* (private) child names only */
+#define	FTS_STOP	0x200		/* (private) unrecoverable error */
+	int fts_options;		/* fts_open options, global flags */
+} FTS;
+
+typedef struct _ftsent {
+	struct _ftsent *fts_cycle;	/* cycle node */
+	struct _ftsent *fts_parent;	/* parent directory */
+	struct _ftsent *fts_link;	/* next file in directory */
+	__fts_number_t fts_number;      /* local numeric value */
+	void *fts_pointer;	        /* local address value */
+	char *fts_accpath;		/* access path */
+	char *fts_path;			/* root path */
+	int fts_errno;			/* errno for this node */
+	int fts_symfd;			/* fd for symlink */
+	__fts_length_t fts_pathlen;	/* strlen(fts_path) */
+	__fts_length_t fts_namelen;	/* strlen(fts_name) */
+
+	__fts_ino_t fts_ino;		/* inode */
+	__fts_dev_t fts_dev;		/* device */
+	__fts_nlink_t fts_nlink;	/* link count */
+
+#define	FTS_ROOTPARENTLEVEL	-1
+#define	FTS_ROOTLEVEL		 0
+	__fts_level_t fts_level;		/* depth (-1 to N) */
+
+#define	FTS_D		 1		/* preorder directory */
+#define	FTS_DC		 2		/* directory that causes cycles */
+#define	FTS_DEFAULT	 3		/* none of the above */
+#define	FTS_DNR		 4		/* unreadable directory */
+#define	FTS_DOT		 5		/* dot or dot-dot */
+#define	FTS_DP		 6		/* postorder directory */
+#define	FTS_ERR		 7		/* error; errno is set */
+#define	FTS_F		 8		/* regular file */
+#define	FTS_INIT	 9		/* initialized only */
+#define	FTS_NS		10		/* stat(2) failed */
+#define	FTS_NSOK	11		/* no stat(2) requested */
+#define	FTS_SL		12		/* symbolic link */
+#define	FTS_SLNONE	13		/* symbolic link without target */
+#define	FTS_W		14		/* whiteout object */
+	unsigned short fts_info;	/* user flags for FTSENT structure */
+
+#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
+#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
+#define	FTS_ISW		 0x04		/* this is a whiteout object */
+	unsigned short fts_flags;	/* private flags for FTSENT structure */
+
+#define	FTS_AGAIN	 1		/* read node again */
+#define	FTS_FOLLOW	 2		/* follow symbolic link */
+#define	FTS_NOINSTR	 3		/* no instructions */
+#define	FTS_SKIP	 4		/* discard node */
+	unsigned short fts_instr;	/* fts_set() instructions */
+
+	__fts_stat_t *fts_statp;	/* stat(2) information */
+	char fts_name[1];		/* file name */
+} FTSENT;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+__Z_EXPORT FTSENT	*fts_children(FTS *, int);
+__Z_EXPORT int	 fts_close(FTS *);
+__Z_EXPORT FTS	*fts_open(char * const *, int,
+    int (*)(const FTSENT **, const FTSENT **));
+__Z_EXPORT FTSENT	*fts_read(FTS *);
+__Z_EXPORT int	 fts_set(FTS *, FTSENT *, int);
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* !_FTS_H_ */

include/limits.h

@@ -15,4 +15,8 @@
 #define PATH_MAX _XOPEN_PATH_MAX
 #endif
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
 #endif

include/locale.h

@@ -14,7 +14,10 @@
 // For xlclang++, exclude these declarations unless ZOSLIB_OVERRIDE_CLIB_LOCALE
 // is defined even if ZOSLIB_OVERRIDE_CLIB is defined.
 
-#if !defined(__ibmxl__) && (defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_LOCALE))
+#if !defined(__ibmxl__) && \
+    (defined(ZOSLIB_OVERRIDE_CLIB) || defined(ZOSLIB_OVERRIDE_CLIB_LOCALE)) && \
+    (!defined(ZOSLIB_OVERRIDE_CLIB_LOCALE_FORCE) || ZOSLIB_OVERRIDE_CLIB_LOCALE_FORCE == 1)
+
 #include "zos-macros.h"
 
 #undef newlocale
@@ -53,7 +56,8 @@ __Z_EXPORT extern locale_t __c_locale() __asm("__zlc_locale_a");
 __Z_EXPORT extern locale_t newlocale(int category_mask, const char* locale, locale_t base) __asm("__zlnewlocale_a");
 __Z_EXPORT extern void freelocale(locale_t locobj) __asm("__zlfreelocale");
 __Z_EXPORT extern locale_t uselocale(locale_t newloc) __asm("__zluselocale_a");
-
+__Z_EXPORT extern const char *getlocalename_l(int category, locale_t locale);
+__Z_EXPORT extern locale_t duplocale(locale_t old);
 
 #if defined(__cplusplus)
 }

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