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/telldir/Makefile | 9 ---- src/regress/lib/libc/telldir/main.c | 14 ----- src/regress/lib/libc/telldir/shortseek.c | 91 -------------------------------- src/regress/lib/libc/telldir/telldir.c | 71 ------------------------- src/regress/lib/libc/telldir/utils.c | 53 ------------------- src/regress/lib/libc/telldir/utils.h | 6 --- 6 files changed, 244 deletions(-) delete mode 100644 src/regress/lib/libc/telldir/Makefile delete mode 100644 src/regress/lib/libc/telldir/main.c delete mode 100644 src/regress/lib/libc/telldir/shortseek.c delete mode 100644 src/regress/lib/libc/telldir/telldir.c delete mode 100644 src/regress/lib/libc/telldir/utils.c delete mode 100644 src/regress/lib/libc/telldir/utils.h (limited to 'src/regress/lib/libc/telldir') diff --git a/src/regress/lib/libc/telldir/Makefile b/src/regress/lib/libc/telldir/Makefile deleted file mode 100644 index 728ae90e1e..0000000000 --- a/src/regress/lib/libc/telldir/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2013/11/03 00:20:24 schwarze Exp $ - -PROG = telldir -SRCS = utils.c shortseek.c telldir.c main.c - -cleandir: - rm -rf d - -.include diff --git a/src/regress/lib/libc/telldir/main.c b/src/regress/lib/libc/telldir/main.c deleted file mode 100644 index 23ffa65dbf..0000000000 --- a/src/regress/lib/libc/telldir/main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* $OpenBSD: main.c,v 1.1 2013/11/03 00:20:24 schwarze Exp $ */ - -/* Written by Ingo Schwarze, 2013, Public domain. */ - -void shortseek(void); -void longseek(void); - -int -main(void) -{ - shortseek(); - longseek(); - return(0); -} diff --git a/src/regress/lib/libc/telldir/shortseek.c b/src/regress/lib/libc/telldir/shortseek.c deleted file mode 100644 index 9b2141ab4c..0000000000 --- a/src/regress/lib/libc/telldir/shortseek.c +++ /dev/null @@ -1,91 +0,0 @@ -/* $OpenBSD: shortseek.c,v 1.1 2013/11/03 00:20:24 schwarze Exp $ */ - -/* Written by Otto Moerbeek, 2006, Public domain. */ -/* Modified by Ingo Schwarze, 2013, Public domain. */ - -#include -#include -#include -#include -#include -#include - -#include "utils.h" - -#define NFILES 5 - -static void -shortloop(DIR *dp, int iend, int iback) -{ - struct dirent *f; - char fend[PATH_MAX], fback[PATH_MAX]; - long pos, t, remember = -1; - int i; - - rewinddir(dp); - snprintf(fend, sizeof fend, "%d", iend); - snprintf(fback, sizeof fback, "%d", iback); - - /* Scan to iend, remember where iback is. */ - - for (;;) { - pos = telldir(dp); - f = readdir(dp); - if (f == NULL) - errx(1, "file %s not found", fend); - if (strcmp(fback, f->d_name) == 0) - remember = pos; - if (strcmp(fend, f->d_name) == 0) - break; - } - if (remember == -1) - errx(1, "file %s not found", fback); - - /* Go back to iback, checking seekdir, telldir and readdir. */ - - seekdir(dp, remember); - if ((t = telldir(dp)) != remember) - errx(1, "tell after seek %s %ld != %ld", fback, t, remember); - if ((t = telldir(dp)) != remember) - errx(1, "tell after tell %s %ld != %ld", fback, t, remember); - f = readdir(dp); - if (f == NULL) - errx(1, "readdir %s at %ld", fback, remember); - - if (strcmp(f->d_name, fback)) - errx(1, "name mismatch: %s != %s", f->d_name, fback); - - /* Check that readdir can iterate the remaining files. */ - - for (i = iback + 1; i < NFILES; i++) { - f = readdir(dp); - if (f == NULL) - errx(1, "readdir %i failed", i); - } - - /* Check that readdir stops at the right place. */ - - f = readdir(dp); - if (f != NULL) - errx(1, "readdir %i returned %s", NFILES, f->d_name); -} - -void -shortseek(void) -{ - DIR *dp; - int iend, iback; - - createfiles(NFILES); - - dp = opendir("d"); - if (dp == NULL) - err(1, "shortseek: opendir"); - - for (iend = 0; iend < NFILES; iend++) - for (iback = 0; iback <= iend; iback++) - shortloop(dp, iend, iback); - - closedir(dp); - delfiles(); -} diff --git a/src/regress/lib/libc/telldir/telldir.c b/src/regress/lib/libc/telldir/telldir.c deleted file mode 100644 index d2879cc701..0000000000 --- a/src/regress/lib/libc/telldir/telldir.c +++ /dev/null @@ -1,71 +0,0 @@ -/* $OpenBSD: telldir.c,v 1.4 2013/11/03 00:20:24 schwarze Exp $ */ - -/* Written by Otto Moerbeek, 2006, Public domain. */ - -#include -#include -#include -#include -#include -#include - -#include "utils.h" - -#define NFILES 1000 - -static void -longloop(DIR *dp, int i) -{ - struct dirent *f; - char file[PATH_MAX]; - long pos, t, remember = -1; - - rewinddir(dp); - snprintf(file, sizeof file, "%d", i); - - /* Scan through all files, remember where file i is. */ - - for (;;) { - pos = telldir(dp); - f = readdir(dp); - if (f == NULL) - break; - if (strcmp(file, f->d_name) == 0) - remember = pos; - } - if (remember == -1) - errx(1, "remember %s", file); - - /* Go back to i, checking seekdir, telldir and readdir. */ - - seekdir(dp, remember); - if ((t = telldir(dp)) != remember) - errx(1, "tell after seek %s %ld != %ld", file, t, remember); - if ((t = telldir(dp)) != remember) - errx(1, "tell after tell %s %ld != %ld", file, t, remember); - f = readdir(dp); - if (f == NULL) - errx(1, "readdir %s at %ld", file, remember); - - if (strcmp(f->d_name, file) != 0) - errx(1, "name mismatch: %s != %s", f->d_name, file); -} - -void -longseek(void) -{ - DIR *dp; - int i; - - createfiles(NFILES); - - dp = opendir("d"); - if (dp == NULL) - err(1, "longseek: opendir"); - - for (i = 0; i < NFILES; i++) - longloop(dp, (i + NFILES/2) % NFILES); - - closedir(dp); - delfiles(); -} diff --git a/src/regress/lib/libc/telldir/utils.c b/src/regress/lib/libc/telldir/utils.c deleted file mode 100644 index 7fb0401d70..0000000000 --- a/src/regress/lib/libc/telldir/utils.c +++ /dev/null @@ -1,53 +0,0 @@ -/* $OpenBSD: utils.c,v 1.2 2017/07/27 15:08:37 bluhm Exp $ */ - -/* Written by Otto Moerbeek, 2006, Public domain. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "utils.h" - -void -createfiles(int nfiles) -{ - int i, fd; - char file[PATH_MAX]; - - mkdir("d", 0755); - for (i = 0; i < nfiles; i++) { - snprintf(file, sizeof file, "d/%d", i); - if ((fd = open(file, O_CREAT | O_WRONLY, 0600)) == -1) - err(1, "open %s", file); - close(fd); - } -} - -void -delfiles(void) -{ - DIR *dp; - struct dirent *f; - char file[PATH_MAX]; - - dp = opendir("d"); - if (dp == NULL) - err(1, "opendir"); - while ((f = readdir(dp))) { - if (strcmp(f->d_name, ".") == 0 || - strcmp(f->d_name, "..") == 0) - continue; - snprintf(file, sizeof file, "d/%s", f->d_name); - if (unlink(file) == -1) - err(1, "unlink %s", f->d_name); - } - closedir(dp); - if (rmdir("d") == -1) - err(1, "rmdir"); -} diff --git a/src/regress/lib/libc/telldir/utils.h b/src/regress/lib/libc/telldir/utils.h deleted file mode 100644 index 74ffcd4641..0000000000 --- a/src/regress/lib/libc/telldir/utils.h +++ /dev/null @@ -1,6 +0,0 @@ -/* $OpenBSD: utils.h,v 1.1 2013/11/03 00:20:24 schwarze Exp $ */ - -/* Written by Ingo Schwarze, 2013, Public domain. */ - -void createfiles(int); -void delfiles(void); -- cgit v1.2.3-55-g6feb