sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r22419: Update configure so that we only need one copy of os2_delete.c

Browse Source 
(This used to be commit e5dd3bbf29)
This commit is contained in:
James Peach 2007-04-20 21:31:04 +00:00 committed by Gerald (Jerry) Carter
parent 44f5211c17
commit 8297933142
2 changed files with 10 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/configure.in
View File

@ -2813,7 +2813,12 @@ if test x"$samba_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then
fi
AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[
AC_TRY_RUN([#include "${srcdir-.}/tests/os2_delete.c"],
AC_TRY_RUN([
#include "${srcdir-.}/lib/replace/test/os2_delete.c"
int main(void) {
return test_readdir_os2_delete();
}
],
[samba_cv_HAVE_BROKEN_READDIR=no],
[samba_cv_HAVE_BROKEN_READDIR=yes],
[samba_cv_HAVE_BROKEN_READDIR="assuming not"])])
@ -2822,7 +2827,10 @@ if test x"$samba_cv_HAVE_BROKEN_READDIR" = x"yes"; then
AC_CACHE_CHECK([for replacing readdir],samba_cv_REPLACE_READDIR,[
AC_TRY_RUN([
#include "${srcdir-.}/lib/repdir.c"
#include "${srcdir-.}/tests/os2_delete.c"],
#include "${srcdir-.}/lib/replace/test/os2_delete.c"
int main(void) {
return test_readdir_os2_delete();
],
samba_cv_REPLACE_READDIR=yes,samba_cv_REPLACE_READDIR=no)])
fi

107
source3/tests/os2_delete.c
View File

@ -1,107 +0,0 @@
/*
test readdir/unlink pattern that OS/2 uses
tridge@samba.org July 2005
*/
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#define NUM_FILES 700
#define READDIR_SIZE 100
#define DELETE_SIZE 4
#define TESTDIR "test.dir"
#define FAILED(d) (fprintf(stderr, "Failed for %s - %s\n", d, strerror(errno)), exit(1), 1)
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
#endif
static void cleanup(void)
{
/* I'm a lazy bastard */
system("rm -rf " TESTDIR);
mkdir(TESTDIR, 0700) == 0 || FAILED("mkdir");
}
static void create_files()
{
int i;
for (i=0;i<NUM_FILES;i++) {
char fname[40];
sprintf(fname, TESTDIR "/test%u.txt", i);
close(open(fname, O_CREAT|O_RDWR, 0600)) == 0 || FAILED("close");
}
}
static int os2_delete(DIR *d)
{
off_t offsets[READDIR_SIZE];
int i, j;
struct dirent *de;
char names[READDIR_SIZE][30];
/* scan, remembering offsets */
for (i=0, de=readdir(d);
de && i < READDIR_SIZE;
de=readdir(d), i++) {
offsets[i] = telldir(d);
strcpy(names[i], de->d_name);
}
if (i == 0) {
return 0;
}
/* delete the first few */
for (j=0; j<MIN(i, DELETE_SIZE); j++) {
char fname[40];
sprintf(fname, TESTDIR "/%s", names[j]);
unlink(fname) == 0 || FAILED("unlink");
}
/* seek to just after the deletion */
seekdir(d, offsets[j-1]);
/* return number deleted */
return j;
}
int main(void)
{
int total_deleted = 0;
DIR *d;
struct dirent *de;
cleanup();
create_files();
d = opendir(TESTDIR);
/* skip past . and .. */
de = readdir(d);
strcmp(de->d_name, ".") == 0 || FAILED("match .");
de = readdir(d);
strcmp(de->d_name, "..") == 0 || FAILED("match ..");
while (1) {
int n = os2_delete(d);
if (n == 0) break;
total_deleted += n;
}
closedir(d);
printf("Deleted %d files of %d\n", total_deleted, NUM_FILES);
rmdir(TESTDIR) == 0 || FAILED("rmdir");
return 0;
}