|
|
@@ -1,52 +1,7 @@
|
|
|
---- src/file/config.h.in.orig 2004-03-24 08:47:38.000000000 +0100
|
|
|
-+++ src/file/config.h.in 2004-03-24 08:51:39.000000000 +0100
|
|
|
-@@ -200,3 +200,9 @@
|
|
|
-
|
|
|
- /* Define to `unsigned' if <sys/types.h> does not define. */
|
|
|
- #undef size_t
|
|
|
-+
|
|
|
-+/* Define to 1 if you have the `mbrtowc' function. */
|
|
|
-+#undef HAVE_MBRTOWC
|
|
|
-+
|
|
|
-+/* Define to 1 if you have the `wcwidth' function. */
|
|
|
-+#undef HAVE_WCWIDTH
|
|
|
---- src/file/configure.in.orig 2004-03-24 08:35:36.000000000 +0100
|
|
|
-+++ src/file/configure.in 2004-03-24 08:36:13.000000000 +0100
|
|
|
-@@ -97,7 +97,7 @@
|
|
|
- AC_CHECK_SIZEOF_STDC_HEADERS(uint64_t, 0)
|
|
|
-
|
|
|
- dnl Checks for functions
|
|
|
--AC_CHECK_FUNCS(mmap strerror strtoul mkstemp getopt_long utimes utime)
|
|
|
-+AC_CHECK_FUNCS(mmap strerror strtoul mkstemp getopt_long utimes utime mbrtowc wcwidth)
|
|
|
-
|
|
|
- dnl Checks for libraries
|
|
|
- AC_CHECK_LIB(z,gzopen)
|
|
|
---- src/file/configure.orig 2004-03-24 09:42:17.000000000 +0100
|
|
|
-+++ src/file/configure 2004-03-24 09:42:44.000000000 +0100
|
|
|
-@@ -7612,7 +7612,7 @@
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
--for ac_func in mmap strerror strtoul mkstemp getopt_long utimes utime
|
|
|
-+for ac_func in mmap strerror strtoul mkstemp getopt_long utimes utime mbrtowc wcwidth
|
|
|
- do
|
|
|
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
|
- echo "$as_me:$LINENO: checking for $ac_func" >&5
|
|
|
---- src/file/src/file.c.orig 2004-03-24 09:22:13.000000000 +0100
|
|
|
-+++ src/file/src/file.c 2004-03-24 09:22:48.000000000 +0100
|
|
|
-@@ -453,7 +453,7 @@
|
|
|
- size_t
|
|
|
- file_mbswidth(const char *s)
|
|
|
- {
|
|
|
--#ifdef HAVE_WCHAR_H
|
|
|
-+#if (defined(HAVE_WCHAR_H) && defined (HAVE_MBRTOWC) && defined (HAVE_WCWIDTH))
|
|
|
- size_t bytesconsumed, old_n, n, width = 0;
|
|
|
- mbstate_t state;
|
|
|
- wchar_t nextchar;
|
|
|
Index: Makefile
|
|
|
--- Makefile.orig 2004-04-20 21:57:10.000000000 +0200
|
|
|
+++ Makefile 2004-06-18 10:14:40.253031000 +0200
|
|
|
-@@ -14,10 +14,10 @@
|
|
|
+@@ -14,11 +14,11 @@
|
|
|
compile-static: no-perl-static mactime sorter file test
|
|
|
|
|
|
no-perl:
|
|
|
@@ -54,17 +9,19 @@ Index: Makefile
|
|
|
- cd src/hashtools; make "CC=$(CC)" MAKELEVEL=
|
|
|
- cd src/fstools; make "CC=$(CC)" MAKELEVEL=
|
|
|
- cd src/mmtools; make "CC=$(CC)" MAKELEVEL=
|
|
|
-+ cd src/misc; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
+- cd src/srchtools; make "CC=$(CC)" MAKELEVEL=
|
|
|
++ cd src/misc; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
+ cd src/hashtools; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
+ cd src/fstools; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
+ cd src/mmtools; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
++ cd src/srchtools; make -e "CC=$(CC)" OPT=-O MAKELEVEL=
|
|
|
|
|
|
no-perl-static:
|
|
|
cd src/misc; make "CC=$(CC)" OPT=-static MAKELEVEL=
|
|
|
Index: src/fstools/ntfs.c
|
|
|
--- src/fstools/ntfs.c.orig 2004-05-08 21:48:09.000000000 +0200
|
|
|
+++ src/fstools/ntfs.c 2004-06-18 10:25:58.526356000 +0200
|
|
|
-@@ -698,7 +698,7 @@
|
|
|
+@@ -752,7 +752,7 @@
|
|
|
((int)attr <= ((int)attrseq + len)) &&
|
|
|
(getu32(fs, attr->len) > 0 &&
|
|
|
(getu32(fs, attr->type) != 0xffffffff));
|
|
|
@@ -76,9 +33,9 @@ Index: src/fstools/ntfs.c
|
|
|
Index: src/mmtools/mm_tools.h
|
|
|
--- src/mmtools/mm_tools.h.orig 2004-07-30 07:22:58 +0200
|
|
|
+++ src/mmtools/mm_tools.h 2004-08-02 10:42:54 +0200
|
|
|
-@@ -77,6 +77,14 @@
|
|
|
- #define SUPPORTED
|
|
|
- #define STRTOUL strtoul
|
|
|
+@@ -88,6 +88,14 @@
|
|
|
+ #endif
|
|
|
+
|
|
|
#endif /* FREEBSD */
|
|
|
+#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4)
|
|
|
+# ifndef PRIx64
|
|
|
@@ -91,10 +48,10 @@ Index: src/mmtools/mm_tools.h
|
|
|
|
|
|
/*
|
|
|
* BSD/OS can handle filesystems > 2GB.
|
|
|
-@@ -94,6 +102,16 @@
|
|
|
- #define STRTOUL strtoul
|
|
|
+@@ -107,6 +115,16 @@
|
|
|
+ #include <inttypes.h>
|
|
|
#endif
|
|
|
-
|
|
|
+
|
|
|
+/*
|
|
|
+ * NetBSD
|
|
|
+ *
|
Michael Schloh von Bennewitz