diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 2ae69053..b24a75af 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -31,6 +31,7 @@ AR := ppc-amigaos-ar -q LD := ppc-amigaos-ld RANLIB := ppc-amigaos-ranlib STRIP := ppc-amigaos-strip +RANLIB := ppc-amigaos-ranlib HOST_CXX := g++ # On AmigaOS use native commands @@ -100,13 +101,11 @@ SHARED := $(if $(SHARED),$(SHARED),yes) STATIC := $(if $(STATIC),$(STATIC),yes) LARGEDATA := -OPTIONS += $(LARGEDATA) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__CLIB2__ -Wa,-mregnames -fno-builtin -nostdlib -D_GNU_SOURCE -D_XOPEN_SOURCE -D_USE_GNU -pipe +OPTIONS += $(LARGEDATA) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__CLIB2__ -Wa,-mregnames -fno-builtin -nostdlib -D_GNU_SOURCE -D_XOPEN_SOURCE -D_USE_GNU -pipe -Ttext=0x00000000 OPTIMIZE := -O3 -mregnames -mmultiple -mupdate -mstrict-align -PROFILE_P := STABS := DLIBS := -PLIBS := ifndef DEBUG OPTIMIZE += $(STABS) -DNDEBUG @@ -115,14 +114,9 @@ else DLIBS += $(BUILD_DIR)/lib/libdebug.a endif -ifdef PROFILE - PROFILE_P := -pg -Ttext=0x00000000 - PLIBS += $(BUILD_DIR)/lib/libprofile.a $(BUILD_DIR)/lib/libm.a -endif - -CFLAGS := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES) $(PROFILE_P) -D__USE_INLINE__ -CFLAGS_N := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES) $(PROFILE_P) -AFLAGS := -Wa,-mregnames -mstrict-align $(PROFILE_P) +CFLAGS := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES) -D__USE_INLINE__ +CFLAGS_N := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES) +AFLAGS := -Wa,-mregnames -mstrict-align -Ttext=0x00000000 ifdef SPE CC := ppc-amigaos-gcc-6.4.0 @@ -155,7 +149,6 @@ include libc.gmk include libm.gmk include libamiga.gmk include libdebug.gmk -include libprofile.gmk include libpthread.gmk include libcrypt.gmk include librt.gmk @@ -206,13 +199,11 @@ clean: # Update the version numbers bound to the individual libraries version: $(COPY) c.lib_rev.rev amiga/amiga.lib_rev.rev - $(COPY) c.lib_rev.rev profile/profile.lib_rev.rev $(COPY) c.lib_rev.rev math/m.lib_rev.rev $(COPY) c.lib_rev.rev math/crypt.lib_rev.rev $(COPY) c.lib_rev.rev math/pthread.lib_rev.rev bumprev amiga.lib bumprev c.lib - bumprev profile.lib bumprev m.lib bumprev crypt.lib bumprev pthread.lib @@ -220,7 +211,7 @@ version: # Shared clib2.library rules clib2.library.debug: $(OBJ_C_LIB) - $(VERBOSE)$(CC) -o $(BUILD_DIR)/$@ $(CFLAGS) $(BUILD_DIR)/shared/shared_library/clib2.o $(BUILD_DIR)/shared/shared_library/math.o $(OBJ_C_LIB) $(DLIBS) $(PLIBS) -Wl,--cref,-M,-Map=$(BUILD_DIR)/$@.map -nostartfiles -nostdlib + $(VERBOSE)$(CC) -o $(BUILD_DIR)/$@ $(CFLAGS) $(BUILD_DIR)/shared/shared_library/clib2.o $(BUILD_DIR)/shared/shared_library/math.o $(OBJ_C_LIB) $(BUILD_DIR)/lib/libc.a $(DLIBS) -Wl,--cref,-M,-Map=$(BUILD_DIR)/$@.map -nostartfiles -nostdlib clib2.library: clib2.library.debug cp $(BUILD_DIR)/$< $(BUILD_DIR)/$@ @@ -364,8 +355,10 @@ compile-tests: install: $(DELETE) $(INSTALL_PREFIX)/include/* $(DELETE) $(INSTALL_PREFIX)/lib/* + $(DELETE) $(INSTALL_PREFIX)/clib2.library* $(COPY) $(OUTPUT_LIB)/* $(INSTALL_PREFIX)/lib/ $(COPY) libs/libauto.a $(INSTALL_PREFIX)/lib/ + $(COPY) $(BUILD_DIR)/clib2.library* $(INSTALL_PREFIX) $(COPY) $(LIB_ROOT)/library/include/* $(INSTALL_PREFIX)/include/ release: @@ -390,11 +383,11 @@ release: dpkg: -$(DELETE) $(DPKG_LIB) -$(DELETE) $(DPKG_LIB).deb - -$(MAKEDIR) $(DPKG_LIB)/usr/ppc-amigaos/SDK/clib2/lib - -$(MAKEDIR) $(DPKG_LIB)/usr/ppc-amigaos/SDK/clib2/include + -$(MAKEDIR) $(DPKG_LIB)$(INSTALL_PREFIX)/lib + -$(MAKEDIR) $(DPKG_LIB)$(INSTALL_PREFIX)/include -$(MAKEDIR) $(DPKG_LIB)/DEBIAN - -$(COPY) libs/libauto.a $(DPKG_LIB)/usr/ppc-amigaos/SDK/clib2/lib/ - -$(COPY) $(OUTPUT_LIB)/* $(DPKG_LIB)/usr/ppc-amigaos/SDK/clib2/lib/ - -$(COPY) $(LIB_ROOT)/library/include/* $(DPKG_LIB)/usr/ppc-amigaos/SDK/clib2/include/ + -$(COPY) libs/libauto.a $(DPKG_LIB)$(INSTALL_PREFIX)/lib/ + -$(COPY) $(OUTPUT_LIB)/* $(DPKG_LIB)$(INSTALL_PREFIX)/lib/ + -$(COPY) $(LIB_ROOT)/library/include/* $(DPKG_LIB)$(INSTALL_PREFIX)/include/ -$(COPY) misc/control $(DPKG_LIB)/DEBIAN/ dpkg --build $(DPKG_LIB) diff --git a/README.md b/README.md index b0a4fdfd..03e122c0 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - C runtime library for AmigaOS4 + runtime library for AmigaOS4 [![Build Status](https://travis-ci.com/afxgroup/clib2.svg?branch=master)](https://travis-ci.org/afxgroup/clib2) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) diff --git a/libc.gmk b/libc.gmk index e55388b7..9454db89 100755 --- a/libc.gmk +++ b/libc.gmk @@ -82,6 +82,9 @@ C_ENVZ := \ envz/envz_remove.o \ envz/envz_strip.o +C_FTS := \ + fts/fts.o + C_ICONV := \ iconv/iconv.o \ iconv/iconv_close.o \ @@ -925,6 +928,7 @@ C_LIBRARY := \ $(C_DIRENT) \ $(C_DEBUG) \ $(C_ENVZ) \ + $(C_FTS) \ $(C_ICONV) \ $(C_INTTYPES) \ $(C_LOCALE) \ @@ -950,6 +954,10 @@ C_LIBRARY := \ C_LIB := \ c.lib_rev.o \ + profile/_mcount.o \ + profile/profil.o \ + profile/gmon.o \ + profile/mcount.o \ shared_library/stubs.o \ unistd/getopt.o \ unistd/getopt_long.o @@ -982,6 +990,11 @@ $(OUT_SHARED)/%.o : $(LIB_DIR)/%.c $(VERBOSE)$(COMPILE_SHARED) endif +$(OUT_STATIC)/profile/%.o : $(LIB_DIR)/profile/%.S + $(VERBOSE)$(COMPILE_REG) +$(OUT_SHARED)/profile/%.o : $(LIB_DIR)/profile/%.S + $(VERBOSE)$(COMPILE_REG) + $(OUTPUT_LIB)/libc.a : $(SOURCES_STATIC) $(VERBOSE)@$(MAKELIB) $(OUTPUT_LIB)/libc.so : $(SOURCES_SHARED) diff --git a/libprofile.gmk b/libprofile.gmk deleted file mode 100755 index 86e5e56e..00000000 --- a/libprofile.gmk +++ /dev/null @@ -1,57 +0,0 @@ -# -# $Id: libprofile.gmk,v 1.1 2006-09-17 17:37:27 clib2devs Exp $ -# - -OUT_STATIC := $(BUILD_DIR)/obj/libprofile -OUT_SHARED := $(BUILD_DIR)/obj.shared/libprofile - -ifeq ($(SHARED),yes) - LIBS += $(OUTPUT_LIB)/libprofile.so -endif -ifeq ($(STATIC),yes) - LIBS += $(OUTPUT_LIB)/libprofile.a -endif - -PROFILE_LIB = \ - profile/_mcount.o \ - profile/profil.o \ - profile/gmon.o \ - profile/mcount.o - -SOURCES_SHARED = $(addprefix $(OUT_SHARED)/, $(PROFILE_LIB)) -SOURCES_STATIC = $(addprefix $(OUT_STATIC)/, $(PROFILE_LIB)) - -# Dependencies to rebuild if the library version changes - -$(OUT_STATIC)/profile.lib_rev.o : $(LIB_DIR)/profile/profile.lib_rev.c $(LIB_DIR)/profile/profile.lib_rev.h -$(OUT_SHARED)/profile.lib_rev.o : $(LIB_DIR)/profile/profile.lib_rev.c $(LIB_DIR)/profile/profile.lib_rev.h - -$(OUT_STATIC)/%.o : AFLAGS += $(LARGEDATA) -$(OUT_SHARED)/%.o : AFLAGS += $(PIC) $(LARGEDATA) - -$(OUT_STATIC)/%.o : $(LIB_DIR)/%.S - $(VERBOSE)$(ASSEMBLE) - -$(OUT_SHARED)/%.o : $(LIB_DIR)/%.S - $(VERBOSE)$(ASSEMBLE) - -$(OUT_STATIC)/%.o : CFLAGS += $(LARGEDATA) -$(OUT_SHARED)/%.o : CFLAGS += $(PIC) $(LARGEDATA) - -ifdef SPE -$(OUT_STATIC)/%.o : $(LIB_DIR)/%.c - $(VERBOSE)$(COMPILE_SPE) -$(OUT_SHARED)/%.o : $(LIB_DIR)/%.c - $(VERBOSE)$(COMPILE_SHARED_SPE) -else -$(OUT_STATIC)/%.o : $(LIB_DIR)/%.c - $(VERBOSE)$(COMPILE) -$(OUT_SHARED)/%.o : $(LIB_DIR)/%.c - $(VERBOSE)$(COMPILE_SHARED) -endif - -$(OUTPUT_LIB)/libprofile.a : $(SOURCES_STATIC) - $(VERBOSE)$(MAKELIB) - -$(OUTPUT_LIB)/libprofile.so : $(OUTPUT_LIB)/libc.so $(SOURCES_SHARED) - $(VERBOSE)$(MAKESHARED) diff --git a/library/fts/fts.c b/library/fts/fts.c new file mode 100644 index 00000000..4ceadf0a --- /dev/null +++ b/library/fts/fts.c @@ -0,0 +1,1205 @@ +/* + * $Id: fts.c,v 1.0 2023-09-10 12:04:22 clib2devs Exp $ +*/ + +#ifndef _STDLIB_HEADERS_H +#include "stdlib_headers.h" +#endif /* _STDLIB_HEADERS_H */ + +#ifndef _STRING_HEADERS_H +#include "string_headers.h" +#endif /* _STRING_HEADERS_H */ + +#ifndef _DIRENT_HEADERS_H +#include "dirent_headers.h" +#endif /* _DIRENT_HEADERS_H */ + +#include +#include +#include + +static FTSENT *fts_alloc(FTS *, const char *, size_t); +static FTSENT *fts_build(FTS *, int); +static void fts_free(FTSENT *); +static void fts_lfree(FTSENT *); +static void fts_load(FTS *, FTSENT *); +static size_t fts_maxarglen(char *const *); +static size_t fts_pow2(size_t); +static int fts_palloc(FTS *, size_t); +static void fts_padjust(FTS *, FTSENT *); +static FTSENT *fts_sort(FTS *, FTSENT *, size_t); +static unsigned short fts_stat(FTS *, FTSENT *, int); +static int fts_safe_changedir(const FTS *, const FTSENT *, int, const char *); +static const char *currdir(); +static const char *parentdir(); + +#if defined(ALIGNBYTES) && defined(ALIGN) +#define FTS_ALLOC_ALIGNED 1 +#else +#undef FTS_ALLOC_ALIGNED +#endif + +#ifndef ftsent_namelen_truncate +#define ftsent_namelen_truncate(a) \ + ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a)) +#endif +#ifndef ftsent_pathlen_truncate +#define ftsent_pathlen_truncate(a) \ + ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a)) +#endif +#ifndef fts_pathlen_truncate +#define fts_pathlen_truncate(a) \ + ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a)) +#endif +#ifndef fts_nitems_truncate +#define fts_nitems_truncate(a) \ + ((a) > UINT_MAX ? UINT_MAX : (unsigned int)(a)) +#endif + +#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) + +#define CLR(opt) (sp->fts_options &= ~(opt)) +#define ISSET(opt) (sp->fts_options & (opt)) +#define SET(opt) (sp->fts_options |= (opt)) + +#define CHDIR(sp, path) (!ISSET(FTS_NOCHDIR) && chdir(path)) +#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd)) + +/* fts_build flags */ +#define BCHILD 1 /* fts_children */ +#define BNAMES 2 /* fts_children, names only */ +#define BREAD 3 /* fts_read */ + +#ifndef DTF_HIDEW +#undef FTS_WHITEOUT +#endif + +static const char * +currdir() { + struct _clib2 *__clib2 = __CLIB2; + if (__clib2->__unix_path_semantics) + return "."; + else + return "CURRDIR:"; +} + +static const char * +parentdir() { + struct _clib2 *__clib2 = __CLIB2; + if (__clib2->__unix_path_semantics) + return ".."; + else + return "/"; +} + +FTS * +fts_open(char *const *argv, int options, int (*compar)(const FTSENT **, const FTSENT **)) { + FTS *sp; + FTSENT *p, *root; + size_t nitems; + FTSENT *parent, *tmp = NULL; /* pacify gcc */ + size_t len; + struct _clib2 *__clib2 = __CLIB2; + + assert(argv != NULL); + + /* Options check. */ + if (options & ~FTS_OPTIONMASK) { + errno = EINVAL; + return (NULL); + } + + /* Allocate/initialize the stream */ + if ((sp = malloc(sizeof(FTS))) == NULL) + return (NULL); + memset(sp, 0, sizeof(FTS)); + sp->fts_compar = compar; + sp->fts_options = options; + + /* Logical walks turn on NOCHDIR; symbolic links are too hard. */ + if (ISSET(FTS_LOGICAL)) + SET(FTS_NOCHDIR); + + /* + * Start out with 1K of path space, and enough, in any case, + * to hold the user's paths. + */ + if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN))) + goto mem1; + + /* Allocate/initialize root's parent. */ + if ((parent = fts_alloc(sp, "", 0)) == NULL) + goto mem2; + parent->fts_level = FTS_ROOTPARENTLEVEL; + + /* Allocate/initialize root(s). */ + for (root = NULL, nitems = 0; *argv; ++argv, ++nitems) { + /* Don't allow zero-length paths. */ + if ((len = strlen(*argv)) == 0) { + errno = ENOENT; + goto mem3; + } + + if ((p = fts_alloc(sp, *argv, len)) == NULL) + goto mem3; + p->fts_level = FTS_ROOTLEVEL; + p->fts_parent = parent; + p->fts_accpath = p->fts_name; + + p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW)); + + /* Command-line "." and ".." are real directories. */ + if (__clib2->__unix_path_semantics) { + if (p->fts_info == FTS_DOT) + p->fts_info = FTS_D; + } + + /* + * If comparison routine supplied, traverse in sorted + * order; otherwise traverse in the order specified. + */ + if (compar) { + p->fts_link = root; + root = p; + } else { + p->fts_link = NULL; + if (root == NULL) + tmp = root = p; + else { + tmp->fts_link = p; + tmp = p; + } + } + } + if (compar && nitems > 1) + root = fts_sort(sp, root, nitems); + + /* + * Allocate a dummy pointer and make fts_read think that we've just + * finished the node before the root(s); set p->fts_info to FTS_INIT + * so that everything about the "current" node is ignored. + */ + if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL) + goto mem3; + sp->fts_cur->fts_link = root; + sp->fts_cur->fts_info = FTS_INIT; + + /* + * If using chdir(2), grab a file descriptor pointing to dot to ensure + * that we can get back here; this could be avoided for some paths, + * but almost certainly not worth the effort. Slashes, symbolic links, + * and ".." are all fairly nasty problems. Note, if we can't get the + * descriptor we run anyway, just more slowly. + */ + + if (!ISSET(FTS_NOCHDIR)) { + if ((sp->fts_rfd = open(currdir(), O_RDONLY | O_CLOEXEC, 0)) == -1) + SET(FTS_NOCHDIR); + } + + if (nitems == 0) + fts_free(parent); + + return (sp); + +mem3: + fts_lfree(root); + fts_free(parent); +mem2: + free(sp->fts_path); +mem1: + free(sp); + return (NULL); +} + +static void +fts_load(FTS *sp, FTSENT *p) { + size_t len; + char *cp; + struct _clib2 *__clib2 = __CLIB2; + + assert(sp != NULL); + assert(p != NULL); + + /* + * Load the stream structure for the next traversal. Since we don't + * actually enter the directory until after the preorder visit, set + * the fts_accpath field specially so the chdir gets done to the right + * place and the user can access the first node. From fts_open it's + * known that the path will fit. + */ + len = p->fts_pathlen = p->fts_namelen; + memmove(sp->fts_path, p->fts_name, len + 1); + if (__clib2->__unix_path_semantics) { + if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) { + len = strlen(++cp); + memmove(p->fts_name, cp, len + 1); + p->fts_namelen = ftsent_namelen_truncate(len); + } + } + p->fts_accpath = p->fts_path = sp->fts_path; + sp->fts_dev = p->fts_dev; +} + +int +fts_close(FTS *sp) { + FTSENT *freep, *p; + int saved_errno = 0; + + assert(sp != NULL); + + /* + * This still works if we haven't read anything -- the dummy structure + * points to the root list, so we step through to the end of the root + * list which has a valid parent pointer. + */ + if (sp->fts_cur) { + if (sp->fts_cur->fts_flags & FTS_SYMFOLLOW) + (void) close(sp->fts_cur->fts_symfd); + for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { + freep = p; + p = p->fts_link ? p->fts_link : p->fts_parent; + fts_free(freep); + } + fts_free(p); + } + + /* Free up child linked list, sort array, path buffer. */ + if (sp->fts_child) + fts_lfree(sp->fts_child); + if (sp->fts_array) + free(sp->fts_array); + free(sp->fts_path); + + /* Return to original directory, save errno if necessary. */ + if (!ISSET(FTS_NOCHDIR)) { + if (fchdir(sp->fts_rfd) == -1) + saved_errno = errno; + (void) close(sp->fts_rfd); + } + + /* Free up the stream pointer. */ + free(sp); + if (saved_errno) { + errno = saved_errno; + return -1; + } + + return 0; +} + +#if !defined(__FTS_COMPAT_TAILINGSLASH) + +/* + * Special case of "/" at the end of the path so that slashes aren't + * appended which would cause paths to be written as "....//foo". + */ +#define NAPPEND(p) \ + (p->fts_path[p->fts_pathlen - 1] == '/' \ + ? p->fts_pathlen - 1 : p->fts_pathlen) + +#else /* !defined(__FTS_COMPAT_TAILINGSLASH) */ + +/* + * compatibility with the old behaviour. + * + * Special case a root of "/" so that slashes aren't appended which would + * cause paths to be written as "//foo". + */ + +#define NAPPEND(p) \ + (p->fts_level == FTS_ROOTLEVEL && p->fts_pathlen == 1 && \ + p->fts_path[0] == '/' ? 0 : p->fts_pathlen) + +#endif /* !defined(__FTS_COMPAT_TAILINGSLASH) */ + +FTSENT * +fts_read(FTS *sp) { + FTSENT *p, *tmp; + int instr; + char *t; + int saved_errno; + + assert(sp != NULL); + + /* If finished or unrecoverable error, return NULL. */ + if (sp->fts_cur == NULL || ISSET(FTS_STOP)) + return (NULL); + + /* Set current node pointer. */ + p = sp->fts_cur; + + /* Save and zero out user instructions. */ + instr = p->fts_instr; + p->fts_instr = FTS_NOINSTR; + + /* Any type of file may be re-visited; re-stat and re-turn. */ + if (instr == FTS_AGAIN) { + p->fts_info = fts_stat(sp, p, 0); + return (p); + } + + /* + * Following a symlink -- SLNONE test allows application to see + * SLNONE and recover. If indirecting through a symlink, have + * keep a pointer to current location. If unable to get that + * pointer, follow fails. + */ + if (instr == FTS_FOLLOW && (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { + p->fts_info = fts_stat(sp, p, 1); + if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { + if ((p->fts_symfd = open(currdir(), O_RDONLY | O_CLOEXEC, 0)) == -1) { + p->fts_errno = errno; + p->fts_info = FTS_ERR; + } else + p->fts_flags |= FTS_SYMFOLLOW; + } + return (p); + } + + /* Directory in pre-order. */ + if (p->fts_info == FTS_D) { + /* If skipped or crossed mount point, do post-order visit. */ + if (instr == FTS_SKIP || (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) { + if (p->fts_flags & FTS_SYMFOLLOW) + (void) close(p->fts_symfd); + if (sp->fts_child) { + fts_lfree(sp->fts_child); + sp->fts_child = NULL; + } + p->fts_info = FTS_DP; + return (p); + } + + /* Rebuild if only read the names and now traversing. */ + if (sp->fts_child && ISSET(FTS_NAMEONLY)) { + CLR(FTS_NAMEONLY); + fts_lfree(sp->fts_child); + sp->fts_child = NULL; + } + + /* + * Cd to the subdirectory. + * + * If have already read and now fail to chdir, whack the list + * to make the names come out right, and set the parent errno + * so the application will eventually get an error condition. + * Set the FTS_DONTCHDIR flag so that when we logically change + * directories back to the parent we don't do a chdir. + * + * If haven't read do so. If the read fails, fts_build sets + * FTS_STOP or the fts_info field of the node. + */ + if (sp->fts_child) { + + if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) { + p->fts_errno = errno; + p->fts_flags |= FTS_DONTCHDIR; + for (p = sp->fts_child; p; p = p->fts_link) + p->fts_accpath = p->fts_parent->fts_accpath; + } + } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) { + if (ISSET(FTS_STOP)) + return (NULL); + return (p); + } + p = sp->fts_child; + sp->fts_child = NULL; + goto name; + } + +next: + /* Move to the next node on this level. */ + tmp = p; + + /* + * We are going to free sp->fts_cur, set it to NULL so + * that fts_close() does not attempt to free it again + * if we exit without setting it to a new value because + * FCHDIR() failed below. + */ + assert(tmp == sp->fts_cur); + sp->fts_cur = NULL; + + if ((p = p->fts_link) != NULL) { + fts_free(tmp); + + /* + * If reached the top, return to the original directory, and + * load the paths for the next root. + */ + if (p->fts_level == FTS_ROOTLEVEL) { + if (FCHDIR(sp, sp->fts_rfd)) { + SET(FTS_STOP); + return (NULL); + } + fts_load(sp, p); + return (sp->fts_cur = p); + } + + /* + * User may have called fts_set on the node. If skipped, + * ignore. If followed, get a file descriptor so we can + * get back if necessary. + */ + if (p->fts_instr == FTS_SKIP) + goto next; + if (p->fts_instr == FTS_FOLLOW) { + p->fts_info = fts_stat(sp, p, 1); + if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { + if ((p->fts_symfd = open(currdir(), O_RDONLY | O_CLOEXEC, 0)) == -1) { + p->fts_errno = errno; + p->fts_info = FTS_ERR; + } else + p->fts_flags |= FTS_SYMFOLLOW; + } + p->fts_instr = FTS_NOINSTR; + } + +name: + t = sp->fts_path + NAPPEND(p->fts_parent); + if (p->fts_parent->fts_path[p->fts_parent->fts_pathlen - 1] != ':') { + *t++ = '/'; + } + memmove(t, p->fts_name, (size_t)(p->fts_namelen + 1)); + return (sp->fts_cur = p); + } + + /* Move up to the parent node. */ + p = tmp->fts_parent; + fts_free(tmp); + + if (p->fts_level == FTS_ROOTPARENTLEVEL) { + /* + * Done; free everything up and set errno to 0 so the user + * can distinguish between error and EOF. + */ + fts_free(p); + errno = 0; + return (sp->fts_cur = NULL); + } + + /* NUL terminate the pathname. */ + sp->fts_path[p->fts_pathlen] = '\0'; + + /* + * Return to the parent directory. If at a root node or came through + * a symlink, go back through the file descriptor. Otherwise, cd up + * one directory. + */ + + if (p->fts_level == FTS_ROOTLEVEL) { + if (FCHDIR(sp, sp->fts_rfd)) { + SET(FTS_STOP); + return (NULL); + } + } else if (p->fts_flags & FTS_SYMFOLLOW) { + if (FCHDIR(sp, p->fts_symfd)) { + saved_errno = errno; + (void) close(p->fts_symfd); + errno = saved_errno; + SET(FTS_STOP); + return (NULL); + } + (void) close(p->fts_symfd); + } else if (!(p->fts_flags & FTS_DONTCHDIR) && fts_safe_changedir(sp, p->fts_parent, -1, parentdir())) { + SET(FTS_STOP); + return (NULL); + } + p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; + return (sp->fts_cur = p); +} + +/* + * Fts_set takes the stream as an argument although it's not used in this + * implementation; it would be necessary if anyone wanted to add global + * semantics to fts using fts_set. An error return is allowed for similar + * reasons. + */ +/* ARGSUSED */ +int +fts_set(FTS *sp, FTSENT *p, int instr) { + + assert(sp != NULL); + assert(p != NULL); + + if (instr && instr != FTS_AGAIN && instr != FTS_FOLLOW && + instr != FTS_NOINSTR && instr != FTS_SKIP) { + errno = EINVAL; + return (1); + } + p->fts_instr = instr; + return (0); +} + +FTSENT * +fts_children(FTS *sp, int instr) { + FTSENT *p; + int fd; + + assert(sp != NULL); + + if (instr && instr != FTS_NAMEONLY) { + errno = EINVAL; + return (NULL); + } + + /* Set current node pointer. */ + p = sp->fts_cur; + + /* + * Errno set to 0 so user can distinguish empty directory from + * an error. + */ + errno = 0; + + /* Fatal errors stop here. */ + if (ISSET(FTS_STOP)) + return (NULL); + + /* Return logical hierarchy of user's arguments. */ + if (p->fts_info == FTS_INIT) + return (p->fts_link); + + /* + * If not a directory being visited in pre-order, stop here. Could + * allow FTS_DNR, assuming the user has fixed the problem, but the + * same effect is available with FTS_AGAIN. + */ + if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */) + return (NULL); + + /* Free up any previous child list. */ + if (sp->fts_child) + fts_lfree(sp->fts_child); + + if (instr == FTS_NAMEONLY) { + SET(FTS_NAMEONLY); + instr = BNAMES; + } else + instr = BCHILD; + + /* + * If using chdir on a relative path and called BEFORE fts_read does + * its chdir to the root of a traversal, we can lose -- we need to + * chdir into the subdirectory, and we don't know where the current + * directory is, so we can't get back so that the upcoming chdir by + * fts_read will work. + */ + if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' || ISSET(FTS_NOCHDIR)) + return (sp->fts_child = fts_build(sp, instr)); + + if ((fd = open(currdir(), O_RDONLY | O_CLOEXEC, 0)) == -1) + return (sp->fts_child = NULL); + + sp->fts_child = fts_build(sp, instr); + if (fchdir(fd)) { + (void) close(fd); + return (NULL); + } + (void) close(fd); + return (sp->fts_child); +} + +/* + * This is the tricky part -- do not casually change *anything* in here. The + * idea is to build the linked list of entries that are used by fts_children + * and fts_read. There are lots of special cases. + * + * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is + * set and it's a physical walk (so that symbolic links can't be directories), + * we can do things quickly. First, if it's a 4.4BSD file system, the type + * of the file is in the directory entry. Otherwise, we assume that the number + * of subdirectories in a node is equal to the number of links to the parent. + * The former skips all stat calls. The latter skips stat calls in any leaf + * directories and for any files after the subdirectories in the directory have + * been found, cutting the stat calls by about 2/3. + */ +static FTSENT * +fts_build(FTS *sp, int type) { + struct dirent *dp; + FTSENT *p, *head; + size_t nitems; + FTSENT *cur, *tail; + DIR *dirp; + void *oldaddr; + size_t dnamlen; + int cderrno, descend, level, nlinks, saved_errno, nostat, doadjust; + size_t len, maxlen; +#ifdef FTS_WHITEOUT + int oflag; +#endif + char *cp = NULL; /* pacify gcc */ + + assert(sp != NULL); + + /* Set current node pointer. */ + cur = sp->fts_cur; + + /* + * Open the directory for reading. If this fails, we're done. + * If being called from fts_read, set the fts_info field. + */ +#ifdef FTS_WHITEOUT + if (ISSET(FTS_WHITEOUT)) + oflag = DTF_NODUP|DTF_REWIND; + else + oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND; +#else +#define __opendir2(path, flag) opendir(path) +#endif + if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) { + if (type == BREAD) { + cur->fts_info = FTS_DNR; + cur->fts_errno = errno; + } + return (NULL); + } + + /* + * Nlinks is the number of possible entries of type directory in the + * directory if we're cheating on stat calls, 0 if we're not doing + * any stat calls at all, -1 if we're doing stats on everything. + */ + if (type == BNAMES) { + nlinks = 0; + nostat = 1; + } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) { + nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2); + nostat = 1; + } else { + nlinks = -1; + nostat = 0; + } + +#if 0 + (void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink); + (void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n", + ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT)); +#endif + /* + * If we're going to need to stat anything or we want to descend + * and stay in the directory, chdir. If this fails we keep going, + * but set a flag so we don't chdir after the post-order visit. + * We won't be able to stat anything, but we can still return the + * names themselves. Note, that since fts_read won't be able to + * chdir into the directory, it will have to return different path + * names than before, i.e. "a/b" instead of "b". Since the node + * has already been visited in pre-order, have to wait until the + * post-order visit to return the error. There is a special case + * here, if there was nothing to stat then it's not an error to + * not be able to stat. This is all fairly nasty. If a program + * needed sorted entries or stat information, they had better be + * checking FTS_NS on the returned nodes. + */ + cderrno = 0; + if (nlinks || type == BREAD) { + if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { + if (nlinks && type == BREAD) + cur->fts_errno = errno; + cur->fts_flags |= FTS_DONTCHDIR; + descend = 0; + cderrno = errno; + } else + descend = 1; + } else + descend = 0; + + /* + * Figure out the max file name length that can be stored in the + * current path -- the inner loop allocates more path as necessary. + * We really wouldn't have to do the maxlen calculations here, we + * could do them in fts_read before returning the path, but it's a + * lot easier here since the length is part of the dirent structure. + * + * If not changing directories set a pointer so that can just append + * each new name into the path. + */ + len = NAPPEND(cur); + if (ISSET(FTS_NOCHDIR)) { + cp = sp->fts_path + len; + if (sp->fts_path[len - 1] != ':') + *cp++ = '/'; + } + if (sp->fts_path[len - 1] != ':') + len++; + maxlen = sp->fts_pathlen - len; + +#if defined(__FTS_COMPAT_LEVEL) + if (cur->fts_level == SHRT_MAX) { + (void)closedir(dirp); + cur->fts_info = FTS_ERR; + SET(FTS_STOP); + errno = ENAMETOOLONG; + return (NULL); + } +#endif + + level = cur->fts_level + 1; + //("level+ %d\n", level); + + /* Read the directory, attaching each entry to the `link' pointer. */ + doadjust = 0; + for (head = tail = NULL, nitems = 0; (dp = readdir(dirp)) != NULL;) { + + if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) + continue; + + dnamlen = dp->d_namlen; + if ((p = fts_alloc(sp, dp->d_name, dnamlen)) == NULL) + goto mem1; + if (dnamlen >= maxlen) { /* include space for NUL */ + oldaddr = sp->fts_path; + if (fts_palloc(sp, dnamlen + len + 1)) { + /* + * No more memory for path or structures. Save + * errno, free up the current structure and the + * structures already allocated. + */ +mem1: + saved_errno = errno; + if (p) + fts_free(p); + fts_lfree(head); + (void) closedir(dirp); + errno = saved_errno; + cur->fts_info = FTS_ERR; + SET(FTS_STOP); + return (NULL); + } + /* Did realloc() change the pointer? */ + if (oldaddr != sp->fts_path) { + doadjust = 1; + if (ISSET(FTS_NOCHDIR)) + cp = sp->fts_path + len; + } + maxlen = sp->fts_pathlen - len; + } + +#if defined(__FTS_COMPAT_LENGTH) + if (len + dnamlen >= USHRT_MAX) { + /* + * In an FTSENT, fts_pathlen is an unsigned short + * so it is possible to wraparound here. + * If we do, free up the current structure and the + * structures already allocated, then error out + * with ENAMETOOLONG. + */ + fts_free(p); + fts_lfree(head); + (void)closedir(dirp); + cur->fts_info = FTS_ERR; + SET(FTS_STOP); + errno = ENAMETOOLONG; + return (NULL); + } +#endif + p->fts_level = level; + p->fts_pathlen = ftsent_pathlen_truncate(len + dnamlen); + p->fts_parent = sp->fts_cur; + +#ifdef FTS_WHITEOUT + if (dp->d_type == DT_WHT) + p->fts_flags |= FTS_ISW; +#endif + + if (cderrno) { + if (nlinks) { + p->fts_info = FTS_NS; + p->fts_errno = cderrno; + } else + p->fts_info = FTS_NSOK; + p->fts_accpath = cur->fts_accpath; + } else if (nlinks == 0 || (nostat && dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)) { + p->fts_accpath = ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; + p->fts_info = FTS_NSOK; + } else { + /* Build a file name for fts_stat to stat. */ + if (ISSET(FTS_NOCHDIR)) { + p->fts_accpath = p->fts_path; + memmove(cp, p->fts_name, (size_t)(p->fts_namelen + 1)); + } else + p->fts_accpath = p->fts_name; + /* Stat it. */ + p->fts_info = fts_stat(sp, p, 0); + + /* Decrement link count if applicable. */ + if (nlinks > 0 && (p->fts_info == FTS_D || p->fts_info == FTS_DC || p->fts_info == FTS_DOT)) + --nlinks; + } + + /* We walk in directory order so "ls -f" doesn't get upset. */ + p->fts_link = NULL; + if (head == NULL) + head = tail = p; + else { + tail->fts_link = p; + tail = p; + } + ++nitems; + } + (void) closedir(dirp); + + /* + * If had to realloc the path, adjust the addresses for the rest + * of the tree. + */ + if (doadjust) + fts_padjust(sp, head); + + /* + * If not changing directories, reset the path back to original + * state. + */ + if (ISSET(FTS_NOCHDIR)) { + if (len == sp->fts_pathlen || nitems == 0) + --cp; + *cp = '\0'; + } + + /* + * If descended after called from fts_children or after called from + * fts_read and nothing found, get back. At the root level we use + * the saved fd; if one of fts_open()'s arguments is a relative path + * to an empty directory, we wind up here with no other way back. If + * can't get back, we're done. + */ + + if (descend && (type == BCHILD || !nitems) && (cur->fts_level == FTS_ROOTLEVEL ? FCHDIR(sp, sp->fts_rfd) : fts_safe_changedir(sp, cur->fts_parent, -1, parentdir()))) { + cur->fts_info = FTS_ERR; + SET(FTS_STOP); + return (NULL); + } + + /* If didn't find anything, return NULL. */ + if (!nitems) { + if (type == BREAD) + cur->fts_info = FTS_DP; + return (NULL); + } + + /* Sort the entries. */ + if (sp->fts_compar && nitems > 1) + head = fts_sort(sp, head, nitems); + return (head); +} + +static unsigned short +fts_stat(FTS *sp, FTSENT *p, int follow) { + FTSENT *t; + dev_t dev; + __fts_ino_t ino; + __fts_stat_t *sbp, sb; + int saved_errno; + + assert(sp != NULL); + assert(p != NULL); + + /* If user needs stat info, stat buffer already allocated. */ + sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; + +#ifdef FTS_WHITEOUT + /* check for whiteout */ + if (p->fts_flags & FTS_ISW) { + if (sbp != &sb) { + memset(sbp, '\0', sizeof (*sbp)); + sbp->st_mode = S_IFWHT; + } + return (FTS_W); + } +#endif + + /* + * If doing a logical walk, or application requested FTS_FOLLOW, do + * a stat(2). If that fails, check for a non-existent symlink. If + * fail, set the errno from the stat call. + */ + if (ISSET(FTS_LOGICAL) || follow) { + if (stat(p->fts_accpath, sbp)) { + saved_errno = errno; + if (!lstat(p->fts_accpath, sbp)) { + errno = 0; + return (FTS_SLNONE); + } + p->fts_errno = saved_errno; + goto err; + } + } else if (lstat(p->fts_accpath, sbp)) { + p->fts_errno = errno; +err: + memset(sbp, 0, sizeof(*sbp)); + return (FTS_NS); + } + + if (S_ISDIR(sbp->st_mode)) { + /* + * Set the device/inode. Used to find cycles and check for + * crossing mount points. Also remember the link count, used + * in fts_build to limit the number of stat calls. It is + * understood that these fields are only referenced if fts_info + * is set to FTS_D. + */ + dev = p->fts_dev = sbp->st_dev; + ino = p->fts_ino = sbp->st_ino; + p->fts_nlink = sbp->st_nlink; + + if (ISDOT(p->fts_name)) + return (FTS_DOT); + + /* + * Cycle detection is done by brute force when the directory + * is first encountered. If the tree gets deep enough or the + * number of symbolic links to directories is high enough, + * something faster might be worthwhile. + */ + for (t = p->fts_parent; + t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent) + if (ino == t->fts_ino && dev == t->fts_dev) { + p->fts_cycle = t; + return (FTS_DC); + } + return (FTS_D); + } + if (S_ISLNK(sbp->st_mode)) + return (FTS_SL); + if (S_ISREG(sbp->st_mode)) + return (FTS_F); + return (FTS_DEFAULT); +} + +static FTSENT * +fts_sort(FTS *sp, FTSENT *head, size_t nitems) { + FTSENT **ap, *p; + + assert(sp != NULL); + assert(head != NULL); + + /* + * Construct an array of pointers to the structures and call qsort(3). + * Reassemble the array in the order returned by qsort. If unable to + * sort for memory reasons, return the directory entries in their + * current order. Allocate enough space for the current needs plus + * 40 so don't realloc one entry at a time. + */ + if (nitems > sp->fts_nitems) { + FTSENT **new; + + new = realloc(sp->fts_array, sizeof(FTSENT * ) * (nitems + 40)); + if (new == 0) + return (head); + sp->fts_array = new; + sp->fts_nitems = fts_nitems_truncate(nitems + 40); + } + for (ap = sp->fts_array, p = head; p; p = p->fts_link) + *ap++ = p; + qsort((void *) sp->fts_array, nitems, sizeof(FTSENT * ), + (int (*)(const void *, const void *)) sp->fts_compar); + for (head = *(ap = sp->fts_array); --nitems; ++ap) + ap[0]->fts_link = ap[1]; + ap[0]->fts_link = NULL; + return (head); +} + +static FTSENT * +fts_alloc(FTS *sp, const char *name, size_t namelen) { + FTSENT *p; +#if defined(FTS_ALLOC_ALIGNED) + size_t len; +#endif + + assert(sp != NULL); + assert(name != NULL); + +#if defined(FTS_ALLOC_ALIGNED) + /* + * The file name is a variable length array and no stat structure is + * necessary if the user has set the nostat bit. Allocate the FTSENT + * structure, the file name and the stat structure in one chunk, but + * be careful that the stat structure is reasonably aligned. Since the + * fts_name field is declared to be of size 1, the fts_name pointer is + * namelen + 2 before the first possible address of the stat structure. + */ + len = sizeof(FTSENT) + namelen; + if (!ISSET(FTS_NOSTAT)) + len += sizeof(*(p->fts_statp)) + ALIGNBYTES; + if ((p = malloc(len)) == NULL) + return (NULL); + + if (!ISSET(FTS_NOSTAT)) + p->fts_statp = (__fts_stat_t *)ALIGN( + (unsigned long)(p->fts_name + namelen + 2)); +#else + if ((p = malloc(sizeof(FTSENT) + namelen)) == NULL) + return (NULL); + + if (!ISSET(FTS_NOSTAT)) + if ((p->fts_statp = malloc(sizeof(*(p->fts_statp)))) == NULL) { + free(p); + return (NULL); + } +#endif + + if (ISSET(FTS_NOSTAT)) + p->fts_statp = NULL; + + /* Copy the name plus the trailing NULL. */ + memmove(p->fts_name, name, namelen + 1); + + p->fts_namelen = ftsent_namelen_truncate(namelen); + p->fts_path = sp->fts_path; + p->fts_errno = 0; + p->fts_flags = 0; + p->fts_instr = FTS_NOINSTR; + p->fts_number = 0; + p->fts_pointer = NULL; + return (p); +} + +static void +fts_free(FTSENT *p) { +#if !defined(FTS_ALLOC_ALIGNED) + if (p->fts_statp) + free(p->fts_statp); +#endif + free(p); +} + +static void +fts_lfree(FTSENT *head) { + FTSENT *p; + + /* XXX: head may be NULL ? */ + + /* Free a linked list of structures. */ + while ((p = head) != NULL) { + head = head->fts_link; + fts_free(p); + } +} + +static size_t +fts_pow2(size_t x) { + + x--; + x |= x >> 1; + x |= x >> 2; + x |= x >> 4; + x |= x >> 8; + x |= x >> 16; +#if LONG_BIT > 32 + x |= x>>32; +#endif +#if LONG_BIT > 64 + x |= x>>64; +#endif + x++; + return (x); +} + +/* + * Allow essentially unlimited paths; find, rm, ls should all work on any tree. + * Most systems will allow creation of paths much longer than MAXPATHLEN, even + * though the kernel won't resolve them. Round up the new size to a power of 2, + * so we don't realloc the path 2 bytes at a time. + */ +static int +fts_palloc(FTS *sp, size_t size) { + char *new; + + assert(sp != NULL); + +#ifdef __FTS_COMPAT_LENGTH + /* Protect against fts_pathlen overflow. */ + if (size > USHRT_MAX + 1) { + errno = ENAMETOOLONG; + return (1); + } +#endif + size = fts_pow2(size); + new = realloc(sp->fts_path, size); + if (new == 0) + return (1); + sp->fts_path = new; + sp->fts_pathlen = fts_pathlen_truncate(size); + return (0); +} + +/* + * When the path is realloc'd, have to fix all of the pointers in structures + * already returned. + */ +static void +fts_padjust(FTS *sp, FTSENT *head) { + FTSENT *p; + char *addr; + + assert(sp != NULL); + +#define ADJUST(p) do { \ + if ((p)->fts_accpath != (p)->fts_name) \ + (p)->fts_accpath = \ + addr + ((p)->fts_accpath - (p)->fts_path); \ + (p)->fts_path = addr; \ +} while (/*CONSTCOND*/0) + + addr = sp->fts_path; + + /* Adjust the current set of children. */ + for (p = sp->fts_child; p; p = p->fts_link) { + ADJUST(p); + } + + /* Adjust the rest of the tree, including the current level. */ + for (p = head; p->fts_level >= FTS_ROOTLEVEL;) { + ADJUST(p); + p = p->fts_link ? p->fts_link : p->fts_parent; + } +} + +static size_t +fts_maxarglen(char *const *argv) { + size_t len, max; + + assert(argv != NULL); + + for (max = 0; *argv; ++argv) + if ((len = strlen(*argv)) > max) + max = len; + return (max + 1); +} + +/* + * Change to dir specified by fd or p->fts_accpath without getting + * tricked by someone changing the world out from underneath us. + * Assumes p->fts_dev and p->fts_ino are filled in. + */ +static int +fts_safe_changedir(const FTS *sp, const FTSENT *p, int fd, const char *path) { + int oldfd = fd, ret = -1; + __fts_stat_t sb; + + if (ISSET(FTS_NOCHDIR)) + return 0; + + if (oldfd < 0 && (fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) { + return -1; + } + + if (fstat(fd, &sb) == -1) + goto bail; + + if (sb.st_ino != p->fts_ino || sb.st_dev != p->fts_dev) { + errno = ENOENT; + goto bail; + } + + ret = fchdir(fd); + +bail: + if (oldfd < 0) { + int save_errno = errno; + (void) close(fd); + errno = save_errno; + } + return ret; +} \ No newline at end of file diff --git a/library/include/fts.h b/library/include/fts.h new file mode 100644 index 00000000..8784c3e3 --- /dev/null +++ b/library/include/fts.h @@ -0,0 +1,119 @@ +#ifndef _FTS_H_ +#define _FTS_H_ + +#include +#include +#include + +#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; + +__BEGIN_DECLS + +extern FTSENT *fts_children(FTS *, int); +extern int fts_close(FTS *); +extern FTS *fts_open(char * const *, int, int (*)(const FTSENT **, const FTSENT **)); +extern FTSENT *fts_read(FTS *); +extern int fts_set(FTS *, FTSENT *, int); + +__END_DECLS + +#endif /* !_FTS_H_ */ \ No newline at end of file diff --git a/library/include/stddef.h b/library/include/stddef.h index 9bb35821..0a9b753d 100755 --- a/library/include/stddef.h +++ b/library/include/stddef.h @@ -20,6 +20,7 @@ __BEGIN_DECLS typedef int ptrdiff_t; typedef unsigned int size_t; +typedef struct { long long __ll; long double __ld; } max_align_t; /* wchar_t is a built-in type in C++ */ #ifndef __cplusplus diff --git a/library/posix/raise.c b/library/posix/raise.c index e8a52ea1..284beaf6 100644 --- a/library/posix/raise.c +++ b/library/posix/raise.c @@ -1,5 +1,5 @@ /* - * $Id: signal_raise.c,v 1.10 2006-01-08 12:04:24 clib2devs Exp $ + * $Id: signal_raise.c,v 1.11 2023-09-12 12:04:24 clib2devs Exp $ */ #ifndef _SIGNAL_HEADERS_H @@ -106,7 +106,7 @@ raise(int sig) { /* Drop straight into abort(), which might call signal() again but is otherwise guaranteed to eventually land us in _exit(). */ - abort(); + __abort(); } /* If we have a SIGALRM without associated handler don't call abort but exit directly */ if (sig == SIGALRM) { diff --git a/library/profile/_mcount.c b/library/profile/_mcount.c index 01dd3aad..ed4705ed 100644 --- a/library/profile/_mcount.c +++ b/library/profile/_mcount.c @@ -20,8 +20,7 @@ __mcount(uint32 frompc, uint32 selfpc) { p = &_gmonparam; - if (p->state != kGmonProfOn) - return; + if (p->state != kGmonProfOn) return; p->state = kGmonProfBusy; @@ -31,8 +30,7 @@ __mcount(uint32 frompc, uint32 selfpc) { */ frompc -= p->lowpc; selfpc -= p->lowpc; - if (frompc > p->textsize) - goto done; + if (frompc > p->textsize) goto done; #if (HASHFRACTION & (HASHFRACTION - 1)) == 0 if (p->hashfraction == HASHFRACTION) { diff --git a/library/profile/gmon.c b/library/profile/gmon.c index 75425c5a..31756276 100644 --- a/library/profile/gmon.c +++ b/library/profile/gmon.c @@ -9,6 +9,7 @@ #include #include #include +#include #define SCALE_1_TO_1 0x10000L @@ -21,17 +22,12 @@ struct gmonparam _gmonparam = { state : kGmonProfOn }; -/* Use __executable_start as the lowest address to keep profiling records - if it provided by the linker. */ -extern const char __executable_start[] __attribute__ ((visibility ("hidden"))); - static unsigned int s_scale; void moncontrol(int); void monstartup(uint32, uint32); void moncleanup(void); void mongetpcs(uint32 *lowpc, uint32 *highpc); -extern int profil(uint16 *buffer, uint32 bufSize, uint32 offset, uint32 scale); void monstartup(uint32 low_pc, uint32 high_pc) { uint8 *cp; diff --git a/library/profile/mcount.S b/library/profile/mcount.S index 90f2c647..fa7ef649 100644 --- a/library/profile/mcount.S +++ b/library/profile/mcount.S @@ -43,7 +43,6 @@ #endif .text - .align 2 .global _mcount .type _mcount, @function _mcount: diff --git a/library/profile/profil.c b/library/profile/profil.c index 0d6cf79c..dc83e24f 100644 --- a/library/profile/profil.c +++ b/library/profile/profil.c @@ -38,7 +38,7 @@ GetCounterStart(void) { /* Timebase ticks at 1/4 of FSB */ bit0time = (double) 8.0 / (double) fsb; count = (uint32)((double) 0.01 / bit0time); - + dprintf("count = %d - result = %d", count, 0x80000000 - count); return 0x80000000 - count; } diff --git a/library/profile/profile.lib_rev.c b/library/profile/profile.lib_rev.c deleted file mode 100644 index acb127d5..00000000 --- a/library/profile/profile.lib_rev.c +++ /dev/null @@ -1,7 +0,0 @@ -/* - * $Id: profile.lib_rev.c,v 1.0 2022-07-18 11:59:23 clib2devs Exp $ -*/ - -#include "profile.lib_rev.h" - -char __profile_lib_version[] = VERSTAG; diff --git a/library/profile/profile.lib_rev.h b/library/profile/profile.lib_rev.h deleted file mode 100755 index 643e570e..00000000 --- a/library/profile/profile.lib_rev.h +++ /dev/null @@ -1,9 +0,0 @@ -#define VERSION 0 -#define REVISION 1 -#define SUBREVISION 0 - -#define DATE "08.02.2021" -#define VERS "profile.lib 0.1" -#define VSTRING "profile.lib 0.1 (08.02.2021)\r\n" -#define VERSTAG "\0$VER: profile.lib 0.1 (08.02.2021)" - diff --git a/library/profile/profile.lib_rev.rev b/library/profile/profile.lib_rev.rev deleted file mode 100755 index 573541ac..00000000 --- a/library/profile/profile.lib_rev.rev +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/library/shared_library/clib2.c b/library/shared_library/clib2.c index 2245d274..807516ff 100644 --- a/library/shared_library/clib2.c +++ b/library/shared_library/clib2.c @@ -172,7 +172,7 @@ struct Clib2Base *libOpen(struct LibraryManagerInterface *Self, uint32 version) struct Clib2Base *libBase = (struct Clib2Base *) Self->Data.LibBase; if (!IClib2) { - IClib2 = (struct Clib2Base *) IExec->GetInterface((struct Library *) libBase, "main", 1, NULL); + IClib2 = (struct Clib2IFace *) IExec->GetInterface((struct Library *) libBase, "main", 1, NULL); IExec->DropInterface((struct Interface *)IClib2); } diff --git a/library/shared_library/clib2_vectors.h b/library/shared_library/clib2_vectors.h index 99377b12..362834f5 100644 --- a/library/shared_library/clib2_vectors.h +++ b/library/shared_library/clib2_vectors.h @@ -1138,12 +1138,18 @@ static void *clib2Vectors[] = { (void *) (mkostemp), /* 4272 */ (void *) (mkostemps), /* 4276 */ - (void *) (strtof_l), /* 4282 */ - (void *) (strtod_l), /* 4286 */ + (void *) (strtof_l), /* 4280 */ + (void *) (strtod_l), /* 4284 */ - (void *) (fpgetround), /* 4290 */ - (void *) (fpsetround), /* 4294 */ - (void *) (fpgetmask), /* 4298 */ - (void *) (fpsetmask), /* 4302 */ - (void *) (fpgetsticky), /* 4306 */ + (void *) (fpgetround), /* 4288 */ + (void *) (fpsetround), /* 4292 */ + (void *) (fpgetmask), /* 4296 */ + (void *) (fpsetmask), /* 4300 */ + (void *) (fpgetsticky), /* 4304 */ + + (void *) (fts_children), /* 4308 */ + (void *) (fts_close), /* 4312 */ + (void *) (fts_open), /* 4316 */ + (void *) (fts_read), /* 4320 */ + (void *) (fts_set), /* 4324 */ }; \ No newline at end of file diff --git a/library/shared_library/interface.h b/library/shared_library/interface.h index 89921168..4b2d81e7 100644 --- a/library/shared_library/interface.h +++ b/library/shared_library/interface.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1304,14 +1305,20 @@ struct Clib2IFace { int (* mkostemp) (char *name, int flags); /* 4272 */ int (* mkostemps) (char *name, int len, int flags); /* 4276 */ - float (* strtof_l) (const char *__restrict s00, char **__restrict se, locale_t loc); /* 4282 */ - double (* strtod_l) (const char *__restrict s00, char **__restrict se, locale_t loc); /* 4286 */ + float (* strtof_l) (const char *__restrict s00, char **__restrict se, locale_t loc); /* 4280 */ + double (* strtod_l) (const char *__restrict s00, char **__restrict se, locale_t loc); /* 4284 */ - fp_rnd_t (* fpgetround) (void); /* 4290 */ - fp_rnd_t (* fpsetround) (fp_rnd_t); /* 4294 */ - fp_except_t (* fpgetmask) (void); /* 4298 */ - fp_except_t (* fpsetmask) (fp_except_t); /* 4302 */ - fp_except_t (* fpgetsticky) (void); /* 4306 */ + fp_rnd_t (* fpgetround) (void); /* 4288 */ + fp_rnd_t (* fpsetround) (fp_rnd_t); /* 4292 */ + fp_except_t (* fpgetmask) (void); /* 4296 */ + fp_except_t (* fpsetmask) (fp_except_t); /* 4300 */ + fp_except_t (* fpgetsticky) (void); /* 4304 */ + + FTSENT * (* fts_children) (FTS *, int); /* 4308 */ + int (* fts_close) (FTS *); /* 4312 */ + FTS * (* fts_open) (char * const *, int, int (*)(const FTSENT **, const FTSENT **)); /* 4316 */ + FTSENT * (* fts_read) (FTS *); /* 4320 */ + int (* fts_set) (FTS *, FTSENT *, int); /* 4324 */ }; #ifdef __PIC__ diff --git a/library/shared_library/stubs.c b/library/shared_library/stubs.c index 2bf5c783..9b61b06d 100644 --- a/library/shared_library/stubs.c +++ b/library/shared_library/stubs.c @@ -1074,11 +1074,17 @@ Clib2Call(dbopen, 4268); Clib2Call(mkostemp, 4272); Clib2Call(mkostemps, 4276); -Clib2Call(strtof_l, 4282); -Clib2Call(strtod_l, 4286); +Clib2Call(strtof_l, 4280); +Clib2Call(strtod_l, 4284); -Clib2Call(fpgetround, 4290); -Clib2Call(fpsetround, 4294); -Clib2Call(fpgetmask, 4298); -Clib2Call(fpsetmask, 4302); -Clib2Call(fpgetsticky, 4306); +Clib2Call(fpgetround, 4288); +Clib2Call(fpsetround, 4292); +Clib2Call(fpgetmask, 4296); +Clib2Call(fpsetmask, 4300); +Clib2Call(fpgetsticky, 4304); + +Clib2Call(fts_children, 4308); +Clib2Call(fts_close, 4312); +Clib2Call(fts_open, 4316); +Clib2Call(fts_read, 4320); +Clib2Call(fts_set, 4324); diff --git a/library/stdio/fclose.c b/library/stdio/fclose.c index 115edd31..3fd1ffca 100644 --- a/library/stdio/fclose.c +++ b/library/stdio/fclose.c @@ -89,6 +89,7 @@ fclose(FILE *stream) { if (file->iob_CustomBuffer != NULL) { SHOWMSG("Delete allocated buffer"); FreeVec(file->iob_CustomBuffer); + file->iob_CustomBuffer = NULL; } /* Free the lock semaphore now. */ diff --git a/library/stdio/fgets.c b/library/stdio/fgets.c index a377c31c..b5869219 100644 --- a/library/stdio/fgets.c +++ b/library/stdio/fgets.c @@ -71,7 +71,8 @@ fgets(char *buf, int n, FILE *stream) { /* Copy the remainder of the read buffer into the string buffer, including the terminating line feed character. */ - memcpy(s, buffer, num_characters_in_line); + memmove(s, buffer, num_characters_in_line - 1); + s += num_characters_in_line - 1; file->iob_BufferPosition += num_characters_in_line; s[num_characters_in_line] = 0; @@ -79,7 +80,7 @@ fgets(char *buf, int n, FILE *stream) { goto out; } - memcpy(s, buffer, num_bytes_in_buffer); + memmove(s, buffer, num_bytes_in_buffer); s += num_bytes_in_buffer; file->iob_BufferPosition += num_bytes_in_buffer; diff --git a/library/stdio/fread.c b/library/stdio/fread.c index fedd41af..1a92a66f 100644 --- a/library/stdio/fread.c +++ b/library/stdio/fread.c @@ -67,7 +67,10 @@ fread(void *ptr, size_t element_size, size_t count, FILE *stream) { if (__fgetc_check((FILE *) file) < 0) goto out; + /* Check for overflow. */ total_size = element_size * count; + if (element_size != (total_size / count)) + goto out; SHOWVALUE(total_size); @@ -128,11 +131,6 @@ fread(void *ptr, size_t element_size, size_t count, FILE *stream) { total_size -= num_bytes_in_buffer; if (total_size == 0) break; - - /* If the read buffer is now empty and there is still enough data - to be read, try to optimize the read operation. */ - if (file->iob_BufferReadBytes == 0 && total_size >= (size_t) file->iob_BufferSize) - continue; } c = __getc(file); diff --git a/library/stdio/fwrite.c b/library/stdio/fwrite.c index 35128811..37510ec5 100644 --- a/library/stdio/fwrite.c +++ b/library/stdio/fwrite.c @@ -55,7 +55,10 @@ fwrite(const void *ptr, size_t element_size, size_t count, FILE *stream) { size_t total_bytes_written = 0; size_t total_size; + /* Check for overflow. */ total_size = element_size * count; + if (element_size != (total_size / count)) + goto out; /* If this is an unbuffered interactive stream, we will switch to line buffered mode in order to improve readability of diff --git a/library/stdio/gets.c b/library/stdio/gets.c index 5fcde1b0..2983af7b 100644 --- a/library/stdio/gets.c +++ b/library/stdio/gets.c @@ -61,6 +61,7 @@ gets(char *s) { string buffer, including the terminating line feed character. */ memmove(s, buffer, num_characters_in_line); + s += num_characters_in_line; file->iob_BufferPosition += num_characters_in_line; s[num_characters_in_line] = 0; diff --git a/library/stdio/setvbuf.c b/library/stdio/setvbuf.c index b0e92a14..0c3a7d8b 100644 --- a/library/stdio/setvbuf.c +++ b/library/stdio/setvbuf.c @@ -77,7 +77,7 @@ setvbuf(FILE *stream, char *buf, int bufmode, size_t size) { allocate some memory for it. */ if (size > 0 && buf == NULL) { /* Allocate a little more memory than necessary. */ - new_buffer = malloc(size + (__clib2->__cache_line_size - 1)); + new_buffer = AllocVecTags(size + (__clib2->__cache_line_size - 1), AVT_Type, MEMF_SHARED, TAG_DONE); if (new_buffer == NULL) { __set_errno(ENOBUFS); goto out; diff --git a/library/stdlib/abort.c b/library/stdlib/abort.c index 393244e0..9885c923 100644 --- a/library/stdlib/abort.c +++ b/library/stdlib/abort.c @@ -15,14 +15,10 @@ #endif /* _STDIO_HEADERS_H */ void -abort(void) { +__abort(void) { ENTER(); struct _clib2 *__clib2 = __CLIB2; - /* Try to call the signal handler that might be in charge of - handling cleanup operations, etc. */ - raise(SIGABRT); - /* If the signal handler returns it means that we still have to terminate the program. */ @@ -36,3 +32,14 @@ abort(void) { does not trigger the exit trap. */ _exit(EXIT_FAILURE); } + +void +abort(void) { + /* Try to call the signal handler that might be in charge of + handling cleanup operations, etc. */ + raise(SIGABRT); + + /* If the signal handler returns it means that we still have + to terminate the program. */ + __abort(); +} \ No newline at end of file diff --git a/library/stdlib/calloc.c b/library/stdlib/calloc.c index 9f0e385d..2dfb20f6 100644 --- a/library/stdlib/calloc.c +++ b/library/stdlib/calloc.c @@ -35,7 +35,7 @@ __calloc(size_t num_elements, size_t element_size) { D(("calloc(num_elements=%ld, element_size=%ld) overflow")); } - return (result); + return result; } void * @@ -44,5 +44,5 @@ calloc(size_t num_elements, size_t element_size) { result = __calloc(num_elements, element_size); - return (result); + return result; } diff --git a/library/stdlib/stdlib_protos.h b/library/stdlib/stdlib_protos.h index 3d3c65d5..675c9539 100644 --- a/library/stdlib/stdlib_protos.h +++ b/library/stdlib/stdlib_protos.h @@ -47,6 +47,8 @@ extern void reent_exit(struct _clib2 *__clib2, BOOL fallback); extern void __check_abort(void); extern int32 _start(STRPTR argstring, int32 arglen, struct ExecBase *sysbase); +extern void __abort(void); + /* stdlib_assertion_failure.c */ extern void __assertion_failure(const char *file_name, int line_number, const char *expression); diff --git a/misc/amigaos.h b/misc/amigaos.h index 54d6bfde..73c6d6d2 100644 --- a/misc/amigaos.h +++ b/misc/amigaos.h @@ -448,3 +448,4 @@ do \ /* This target uses the amigaos.opt file. */ #define TARGET_USES_AMIGAOS_OPT 1 +#define NO_PROFILE_COUNTERS 1 \ No newline at end of file diff --git a/shared.gmk b/shared.gmk index 35feeeac..82f57165 100644 --- a/shared.gmk +++ b/shared.gmk @@ -51,9 +51,6 @@ $(OUT_SHARED_LIB)/crypt/%.o : $(LIB_DIR)/crypt/%.c $(VERBOSE)$(COMPILE) endif -$(OUT_SHARED_LIB)/profile/%.o : $(LIB_DIR)/profile/%.S - $(VERBOSE)$(ASSEMBLE) - $(OUT_SHARED_LIB)/%.o : $(LIB_DIR)/%.sx $(VERBOSE)$(COMPILE_ALTIVEC_REG) diff --git a/test_programs/misc/fts.c b/test_programs/misc/fts.c new file mode 100644 index 00000000..8cd6851a --- /dev/null +++ b/test_programs/misc/fts.c @@ -0,0 +1,45 @@ +#include +#include +#include +#include + +int compare(const FTSENT **, const FTSENT **); +void indent(int i); + +int main(int argc, char *const argv[]) { + FTS *file_system = NULL; + FTSENT * node = NULL; + + if (argc < 2) { + printf("Usage: %s \n", argv[0]); + exit(255); + } + + file_system = fts_open(argv + 1, FTS_COMFOLLOW | FTS_NOCHDIR, &compare); + + if (NULL != file_system) { + while ((node = fts_read(file_system)) != NULL) { + switch (node->fts_info) { + case FTS_D : + case FTS_F : + case FTS_SL: + indent(node->fts_level); + printf("%s\n", node->fts_name); + break; + default: + break; + } + } + fts_close(file_system); + } + return 0; +} + +int compare(const FTSENT **one, const FTSENT **two) { + return (strcmp((*one)->fts_name, (*two)->fts_name)); +} + +void indent(int i) { + for (; i > 0; i--) + printf(" "); +} \ No newline at end of file diff --git a/test_programs/misc/max_align.c b/test_programs/misc/max_align.c new file mode 100644 index 00000000..19e64921 --- /dev/null +++ b/test_programs/misc/max_align.c @@ -0,0 +1,20 @@ +#include +#include +#include +#include +#include + +int main(void) { + size_t sz = sizeof(max_align_t); + printf("Size of max_align_t is %zu (%#zx)\n", sz, sz); + + size_t a = alignof(max_align_t); + printf("Alignment of max_align_t is %zu (%#zx)\n", a, a); + + void *p = malloc(123); + printf("The address obtained from malloc(123) is %#" + PRIxPTR + "\n", + (uintptr_t) p); + free(p); +} \ No newline at end of file