diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2006-05-27 13:03:06 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2006-05-27 13:03:06 +0000 |
| commit | 8f577079ccfd622a752fbcbec89de29b394dc0cb (patch) | |
| tree | 343b487c7778262b0abc9cbfd84a4b6ce559f44e | |
| parent | 3a2b3b32e5d84dd88d5c3bfeffdd6760081ca077 (diff) | |
| download | FreeBSD-ports-8f577079ccfd622a752fbcbec89de29b394dc0cb.zip FreeBSD-ports-8f577079ccfd622a752fbcbec89de29b394dc0cb.tar.gz | |
Fix patch.
| -rw-r--r-- | sysutils/xfsprogs/files/patch-freebsd.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/sysutils/xfsprogs/files/patch-freebsd.h b/sysutils/xfsprogs/files/patch-freebsd.h index b61ee91..963f507 100644 --- a/sysutils/xfsprogs/files/patch-freebsd.h +++ b/sysutils/xfsprogs/files/patch-freebsd.h @@ -1,5 +1,5 @@ --- include/freebsd.h.orig Mon Jan 16 22:46:48 2006 -+++ include/freebsd.h Sat May 27 03:35:21 2006 ++++ include/freebsd.h Sat May 27 08:57:20 2006 @@ -27,7 +27,13 @@ #include <paths.h> #include <uuid.h> @@ -15,11 +15,10 @@ /* FreeBSD file API is 64-bit aware */ #define fstat64 fstat -@@ -38,15 +44,6 @@ - #define pread64 pread +@@ -39,15 +45,6 @@ #define fdatasync fsync #define memalign(a,size) valloc(size) -- + -typedef u_int8_t __u8; -typedef int8_t __s8; -typedef u_int16_t __u16; @@ -28,6 +27,25 @@ -typedef int32_t __s32; -typedef u_int64_t __u64; -typedef int64_t __s64; - +- #define constpp char * const * + #define EFSCORRUPTED 990 /* Filesystem is corrupted */ +@@ -84,7 +81,7 @@ + struct statfs buf; + if (fstatfs(fd, &buf) < 0) + return 0; +- return strcpy(buf.f_fstypename, "xfs") == 0; ++ return strncmp(buf.f_fstypename, "xfs", 4) == 0; + } + + static __inline__ int platform_test_xfs_path(const char *path) +@@ -92,7 +89,7 @@ + struct statfs buf; + if (statfs(path, &buf) < 0) + return 0; +- return strcpy(buf.f_fstypename, "xfs") == 0; ++ return strncmp(buf.f_fstypename, "xfs", 4) == 0; + } + + static __inline__ int platform_fstatfs(int fd, struct statfs *buf) |
