svn commit: samba r18419 - in branches/SAMBA_4_0/source:
build/tests lib/replace lib/replace/repdir lib/replace/test
metze at samba.org
metze at samba.org
Tue Sep 12 07:05:42 GMT 2006
Author: metze
Date: 2006-09-12 07:05:41 +0000 (Tue, 12 Sep 2006)
New Revision: 18419
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18419
Log:
fix include paths of the configure tests
metze
Added:
branches/SAMBA_4_0/source/lib/replace/test/os2_delete.c
Removed:
branches/SAMBA_4_0/source/build/tests/os2_delete.c
Modified:
branches/SAMBA_4_0/source/lib/replace/getpass.m4
branches/SAMBA_4_0/source/lib/replace/repdir/config.m4
branches/SAMBA_4_0/source/lib/replace/replace.h
Changeset:
Deleted: branches/SAMBA_4_0/source/build/tests/os2_delete.c
===================================================================
--- branches/SAMBA_4_0/source/build/tests/os2_delete.c 2006-09-12 07:04:12 UTC (rev 18418)
+++ branches/SAMBA_4_0/source/build/tests/os2_delete.c 2006-09-12 07:05:41 UTC (rev 18419)
@@ -1,110 +0,0 @@
-/*
- test readdir/unlink pattern that OS/2 uses
- tridge at 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>
-#ifdef REPLACE_READDIR
-#include "lib/replace/repdir/repdir.h"
-#endif
-
-#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;
-}
Modified: branches/SAMBA_4_0/source/lib/replace/getpass.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/getpass.m4 2006-09-12 07:04:12 UTC (rev 18418)
+++ branches/SAMBA_4_0/source/lib/replace/getpass.m4 2006-09-12 07:05:41 UTC (rev 18419)
@@ -1,11 +1,12 @@
AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/popt -I${srcdir-.}/smbwrapper"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
AC_TRY_COMPILE([
+#include "confdefs.h"
+#define _LIBREPLACE_REPLACE_H
#define REPLACE_GETPASS 1
-#define NO_CONFIG_H 1
#define main dont_declare_main
-#include "${srcdir-.}/lib/replace/getpass.c"
+#include "$libreplacedir/getpass.c"
#undef main
],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
CPPFLAGS="$SAVE_CPPFLAGS"
Modified: branches/SAMBA_4_0/source/lib/replace/repdir/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/repdir/config.m4 2006-09-12 07:04:12 UTC (rev 18418)
+++ branches/SAMBA_4_0/source/lib/replace/repdir/config.m4 2006-09-12 07:05:41 UTC (rev 18419)
@@ -1,5 +1,5 @@
AC_CACHE_CHECK([for broken readdir],samba_cv_HAVE_BROKEN_READDIR,[
- AC_TRY_RUN([#include "${srcdir-.}/build/tests/os2_delete.c"],
+ AC_TRY_RUN([#include "$libreplacedir/test/os2_delete.c"],
[samba_cv_HAVE_BROKEN_READDIR=no],
[samba_cv_HAVE_BROKEN_READDIR=yes],
[samba_cv_HAVE_BROKEN_READDIR="assuming not"])])
@@ -7,8 +7,8 @@
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/replace/repdir/repdir.c"
-#include "${srcdir-.}/build/tests/os2_delete.c"],
+#include "$libreplacedir/repdir/repdir.c"
+#include "$libreplacedir/test/os2_delete.c"],
samba_cv_REPLACE_READDIR=yes,samba_cv_REPLACE_READDIR=no)])
fi
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-12 07:04:12 UTC (rev 18418)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-12 07:05:41 UTC (rev 18419)
@@ -25,8 +25,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _replace_h
-#define _replace_h
+#ifndef _LIBREPLACE_REPLACE_H
+#define _LIBREPLACE_REPLACE_H
#include "config.h"
@@ -360,4 +360,4 @@
#undef HAVE_MMAP
#endif
-#endif
+#endif /* _LIBREPLACE_REPLACE_H */
Copied: branches/SAMBA_4_0/source/lib/replace/test/os2_delete.c (from rev 10719, branches/SAMBA_4_0/source/build/tests/os2_delete.c)
More information about the samba-cvs
mailing list