From eb8dd9dca1228af0cd132f515509051ecfabf6f6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Mon, 14 Apr 2025 17:32:06 +0000 Subject: This commit was manufactured by cvs2git to create tag 'tb_20250414'. --- src/regress/lib/libc/glob/Makefile | 16 ---- src/regress/lib/libc/glob/files | 47 ----------- src/regress/lib/libc/glob/globtest.c | 142 ---------------------------------- src/regress/lib/libc/glob/globtest.in | 116 --------------------------- 4 files changed, 321 deletions(-) delete mode 100644 src/regress/lib/libc/glob/Makefile delete mode 100644 src/regress/lib/libc/glob/files delete mode 100644 src/regress/lib/libc/glob/globtest.c delete mode 100644 src/regress/lib/libc/glob/globtest.in (limited to 'src/regress/lib/libc/glob') diff --git a/src/regress/lib/libc/glob/Makefile b/src/regress/lib/libc/glob/Makefile deleted file mode 100644 index b3f9567833..0000000000 --- a/src/regress/lib/libc/glob/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $OpenBSD: Makefile,v 1.4 2011/05/01 04:25:40 guenther Exp $ - -PROG= globtest - -run-regress-${PROG}: - mkdir -m 755 -p `sed 's@/[^/]*$$@@' ${.CURDIR}/files | sort -u` - umask 022; touch `cat ${.CURDIR}/files` - chmod 0755 `grep '/r[^/]*$$' ${.CURDIR}/files` - chmod 0444 `grep '/s[^/]*$$' ${.CURDIR}/files` - chmod 0711 `grep '/t[^/]*$$' ${.CURDIR}/files` - ./${PROG} ${.CURDIR}/${PROG}.in - -clean: - rm -rf fake ${PROG} ${OBJS} *.core - -.include diff --git a/src/regress/lib/libc/glob/files b/src/regress/lib/libc/glob/files deleted file mode 100644 index c5e92aacd5..0000000000 --- a/src/regress/lib/libc/glob/files +++ /dev/null @@ -1,47 +0,0 @@ -fake/bin/[ -fake/bin/cat -fake/bin/chgrp -fake/bin/chio -fake/bin/chmod -fake/bin/cksum -fake/bin/cp -fake/bin/cpio -fake/bin/csh -fake/bin/date -fake/bin/dd -fake/bin/df -fake/bin/domainname -fake/bin/echo -fake/bin/ed -fake/bin/eject -fake/bin/expr -fake/bin/hostname -fake/bin/kill -fake/bin/ksh -fake/bin/ln -fake/bin/ls -fake/bin/md5 -fake/bin/mkdir -fake/bin/mt -fake/bin/mv -fake/bin/pax -fake/bin/ps -fake/bin/pwd -fake/bin/rcp -fake/bin/rksh -fake/bin/rm -fake/bin/rmail -fake/bin/rmd160 -fake/bin/rmdir -fake/bin/sh -fake/bin/sha1 -fake/bin/sha256 -fake/bin/sha384 -fake/bin/sha512 -fake/bin/sleep -fake/bin/stty -fake/bin/sum -fake/bin/sync -fake/bin/systrace -fake/bin/tar -fake/bin/test diff --git a/src/regress/lib/libc/glob/globtest.c b/src/regress/lib/libc/glob/globtest.c deleted file mode 100644 index 1f6037d5bc..0000000000 --- a/src/regress/lib/libc/glob/globtest.c +++ /dev/null @@ -1,142 +0,0 @@ -/* $OpenBSD: globtest.c,v 1.4 2019/01/25 00:19:26 millert Exp $ */ - -/* - * Public domain, 2008, Todd C. Miller - */ - -#include -#include -#include -#include -#include - -#define MAX_RESULTS 256 - -struct gl_entry { - int flags; - int nresults; - char pattern[1024]; - char *results[MAX_RESULTS]; - mode_t modes[MAX_RESULTS]; -}; - -int test_glob(struct gl_entry *); - -int -main(int argc, char **argv) -{ - FILE *fp = stdin; - char *buf, *cp; - int errors = 0, lineno, mode; - struct gl_entry entry; - size_t len; - - if (argc > 1) { - if ((fp = fopen(argv[1], "r")) == NULL) - err(1, "%s", argv[1]); - } - - /* - * Read in test file, which is formatted thusly: - * - * [pattern] - * result1 [mode] - * result2 [mode] - * result3 [mode] - * ... - * - */ - lineno = 0; - memset(&entry, 0, sizeof(entry)); - while ((buf = fgetln(fp, &len)) != NULL) { - lineno++; - if (buf[len - 1] != '\n') - errx(1, "missing newline at EOF"); - buf[--len] = '\0'; - if (len == 0) - continue; /* blank line */ - - if (buf[0] == '[') { - /* check previous pattern */ - if (entry.pattern[0]) - errors += test_glob(&entry); - - /* start new entry */ - if ((cp = strrchr(buf + 1, ']')) == NULL) - errx(1, "invalid entry on line %d", lineno); - len = cp - buf - 1; - if (len >= sizeof(entry.pattern)) - errx(1, "pattern too big on line %d", lineno); - memcpy(entry.pattern, buf + 1, len); - entry.pattern[len] = '\0'; - - buf = cp + 2; - if (*buf++ != '<') - errx(1, "invalid entry on line %d", lineno); - if ((cp = strchr(buf, '>')) == NULL) - errx(1, "invalid entry on line %d", lineno); - entry.flags = (int)strtol(buf, &cp, 0); - if (*cp != '>' || entry.flags < 0 || entry.flags > 0x4000) - errx(1, "invalid flags: %s", buf); - entry.nresults = 0; - continue; - } - if (!entry.pattern[0]) - errx(1, "missing entry on line %d", lineno); - - if (entry.nresults + 1 > MAX_RESULTS) { - errx(1, "too many results for %s, max %d", - entry.pattern, MAX_RESULTS); - } - if ((cp = strchr(buf, ' ')) != NULL) { - *cp++ = '\0'; - mode = strtol(cp, NULL, 8); - } else - mode = -1; - entry.modes[entry.nresults] = (mode_t)mode; - entry.results[entry.nresults++] = strdup(buf); - } - if (entry.pattern[0]) - errors += test_glob(&entry); /* test last pattern */ - exit(errors); -} - -int test_glob(struct gl_entry *entry) -{ - glob_t gl; - int i = 0; - - if (glob(entry->pattern, entry->flags, NULL, &gl) != 0) - errx(1, "glob failed: %s", entry->pattern); - - if (gl.gl_matchc != entry->nresults) - goto mismatch; - - for (i = 0; i < gl.gl_matchc; i++) { - if (strcmp(gl.gl_pathv[i], entry->results[i]) != 0) - goto mismatch; - if ((entry->flags & GLOB_KEEPSTAT) != 0) { - if (entry->modes[i] == -1 || - gl.gl_statv[i] == NULL || - entry->modes[i] != gl.gl_statv[i]->st_mode) - goto badmode; - } - free(entry->results[i]); - } - return (0); - badmode: - warnx("mismatch mode for pattern %s, flags 0x%x, file \"%s\" " - "(found %07o, expected %07o)", entry->pattern, entry->flags, - gl.gl_pathv[i], gl.gl_statv[i] ? gl.gl_statv[i]->st_mode : 0, - entry->modes[i]); - goto cleanup; - mismatch: - warnx("mismatch for pattern %s, flags 0x%x " - "(found \"%s\", expected \"%s\")", entry->pattern, entry->flags, - gl.gl_pathv[i], entry->results[i]); - cleanup: - while (i < gl.gl_matchc) { - free(entry->results[i++]); - } - return (1); -} diff --git a/src/regress/lib/libc/glob/globtest.in b/src/regress/lib/libc/glob/globtest.in deleted file mode 100644 index 2ae3b4dfb2..0000000000 --- a/src/regress/lib/libc/glob/globtest.in +++ /dev/null @@ -1,116 +0,0 @@ -[fake/bin/[[:alpha:]]*] <0x0> -fake/bin/cat -fake/bin/chgrp -fake/bin/chio -fake/bin/chmod -fake/bin/cksum -fake/bin/cp -fake/bin/cpio -fake/bin/csh -fake/bin/date -fake/bin/dd -fake/bin/df -fake/bin/domainname -fake/bin/echo -fake/bin/ed -fake/bin/eject -fake/bin/expr -fake/bin/hostname -fake/bin/kill -fake/bin/ksh -fake/bin/ln -fake/bin/ls -fake/bin/md5 -fake/bin/mkdir -fake/bin/mt -fake/bin/mv -fake/bin/pax -fake/bin/ps -fake/bin/pwd -fake/bin/rcp -fake/bin/rksh -fake/bin/rm -fake/bin/rmail -fake/bin/rmd160 -fake/bin/rmdir -fake/bin/sh -fake/bin/sha1 -fake/bin/sha256 -fake/bin/sha384 -fake/bin/sha512 -fake/bin/sleep -fake/bin/stty -fake/bin/sum -fake/bin/sync -fake/bin/systrace -fake/bin/tar -fake/bin/test - -[fake/bin/[[:alpha:]]*] <0x4000> -fake/bin/cat 0100644 -fake/bin/chgrp 0100644 -fake/bin/chio 0100644 -fake/bin/chmod 0100644 -fake/bin/cksum 0100644 -fake/bin/cp 0100644 -fake/bin/cpio 0100644 -fake/bin/csh 0100644 -fake/bin/date 0100644 -fake/bin/dd 0100644 -fake/bin/df 0100644 -fake/bin/domainname 0100644 -fake/bin/echo 0100644 -fake/bin/ed 0100644 -fake/bin/eject 0100644 -fake/bin/expr 0100644 -fake/bin/hostname 0100644 -fake/bin/kill 0100644 -fake/bin/ksh 0100644 -fake/bin/ln 0100644 -fake/bin/ls 0100644 -fake/bin/md5 0100644 -fake/bin/mkdir 0100644 -fake/bin/mt 0100644 -fake/bin/mv 0100644 -fake/bin/pax 0100644 -fake/bin/ps 0100644 -fake/bin/pwd 0100644 -fake/bin/rcp 0100755 -fake/bin/rksh 0100755 -fake/bin/rm 0100755 -fake/bin/rmail 0100755 -fake/bin/rmd160 0100755 -fake/bin/rmdir 0100755 -fake/bin/sh 0100444 -fake/bin/sha1 0100444 -fake/bin/sha256 0100444 -fake/bin/sha384 0100444 -fake/bin/sha512 0100444 -fake/bin/sleep 0100444 -fake/bin/stty 0100444 -fake/bin/sum 0100444 -fake/bin/sync 0100444 -fake/bin/systrace 0100444 -fake/bin/tar 0100711 -fake/bin/test 0100711 - -[fake/bin/rm{,dir,ail}] <0x80> -fake/bin/rm -fake/bin/rmdir -fake/bin/rmail - -[fake/bin/sha[[:digit:]]] <0x0> -fake/bin/sha1 - -[fake/bin/sha[[:digit:]]*] <0x0> -fake/bin/sha1 -fake/bin/sha256 -fake/bin/sha384 -fake/bin/sha512 - -[fake/bin/ca[a-z]] <0x0> -fake/bin/cat - -[fake/b[a-z]*] <0x4000> -fake/bin 0040755 - -- cgit v1.2.3-55-g6feb