|
|
@@ -1,7 +1,7 @@
|
|
|
Index: file.c
|
|
|
---- file.c.orig 2005-06-08 22:45:28 +0200
|
|
|
-+++ file.c 2005-06-25 13:07:36 +0200
|
|
|
-@@ -1481,7 +1481,11 @@
|
|
|
+--- file.c.orig 2007-01-15 21:25:52 +0100
|
|
|
++++ file.c 2007-03-15 08:51:23 +0100
|
|
|
+@@ -1587,7 +1587,11 @@
|
|
|
statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree);
|
|
|
tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u",
|
|
|
statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree,
|
|
|
@@ -13,7 +13,7 @@ Index: file.c
|
|
|
statbuf.f_namelen);
|
|
|
#else /* !ALPHA */
|
|
|
tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
|
|
|
-@@ -1493,7 +1497,11 @@
|
|
|
+@@ -1599,7 +1603,11 @@
|
|
|
(unsigned long)statbuf.f_bavail,
|
|
|
(unsigned long)statbuf.f_files,
|
|
|
(unsigned long)statbuf.f_ffree,
|
|
|
@@ -25,7 +25,7 @@ Index: file.c
|
|
|
#ifdef LINUX
|
|
|
tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
|
|
|
#endif /* LINUX */
|
|
|
-@@ -2479,6 +2487,7 @@
|
|
|
+@@ -2747,6 +2755,7 @@
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -33,7 +33,7 @@ Index: file.c
|
|
|
static const struct xlat advise[] = {
|
|
|
{ POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" },
|
|
|
{ POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" },
|
|
|
-@@ -2488,6 +2497,7 @@
|
|
|
+@@ -2756,6 +2765,7 @@
|
|
|
{ POSIX_FADV_NOREUSE, "POSIX_FADV_NOREUSE" },
|
|
|
{ 0, NULL }
|
|
|
};
|
|
|
@@ -41,7 +41,7 @@ Index: file.c
|
|
|
|
|
|
|
|
|
#ifdef LINUX
|
|
|
-@@ -2511,6 +2521,7 @@
|
|
|
+@@ -2779,6 +2789,7 @@
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@@ -49,14 +49,28 @@ Index: file.c
|
|
|
int
|
|
|
sys_fadvise64_64(tcp)
|
|
|
struct tcb *tcp;
|
|
|
-@@ -2529,3 +2540,4 @@
|
|
|
+@@ -2797,6 +2808,7 @@
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
+#endif
|
|
|
+
|
|
|
+ #ifdef LINUX
|
|
|
+ static const struct xlat inotify_modes[] = {
|
|
|
+Index: freebsd/i386/syscall.h
|
|
|
+--- freebsd/i386/syscall.h.orig 2001-03-08 18:27:20 +0100
|
|
|
++++ freebsd/i386/syscall.h 2007-03-15 08:51:48 +0100
|
|
|
+@@ -9,6 +9,7 @@
|
|
|
+ int sys_write();
|
|
|
+ int sys_open();
|
|
|
+ int sys_close();
|
|
|
++int sys_waitpid();
|
|
|
+ int sys_wait4();
|
|
|
+ int sys_creat();
|
|
|
+ int sys_link();
|
|
|
Index: net.c
|
|
|
---- net.c.orig 2005-06-01 21:22:07 +0200
|
|
|
-+++ net.c 2005-06-25 13:45:39 +0200
|
|
|
+--- net.c.orig 2006-12-13 20:57:23 +0100
|
|
|
++++ net.c 2007-03-15 08:51:23 +0100
|
|
|
@@ -43,12 +43,8 @@
|
|
|
#endif
|
|
|
|
|
|
@@ -70,7 +84,7 @@ Index: net.c
|
|
|
#include <arpa/inet.h>
|
|
|
#include <net/if.h>
|
|
|
#if defined(LINUX)
|
|
|
-@@ -1070,6 +1066,9 @@
|
|
|
+@@ -1079,6 +1075,9 @@
|
|
|
#ifdef SCM_RIGHTS
|
|
|
{ SCM_RIGHTS, "SCM_RIGHTS" },
|
|
|
#endif
|
|
|
@@ -80,7 +94,7 @@ Index: net.c
|
|
|
#ifdef SCM_CREDENTIALS
|
|
|
{ SCM_CREDENTIALS, "SCM_CREDENTIALS" },
|
|
|
#endif
|
|
|
-@@ -1116,6 +1115,13 @@
|
|
|
+@@ -1125,6 +1124,13 @@
|
|
|
free(cmsg);
|
|
|
return;
|
|
|
}
|
|
|
@@ -94,7 +108,7 @@ Index: net.c
|
|
|
if (cmsg->cmsg_type == SCM_CREDENTIALS
|
|
|
&& CMSG_LEN(sizeof(struct ucred)) <= cmsg_len) {
|
|
|
struct ucred *uc = (struct ucred *) CMSG_DATA (cmsg);
|
|
|
-@@ -1123,6 +1129,7 @@
|
|
|
+@@ -1132,6 +1138,7 @@
|
|
|
tprintf("{pid=%ld, uid=%ld, gid=%ld}}",
|
|
|
(long)uc->pid, (long)uc->uid, (long)uc->gid);
|
|
|
free(cmsg);
|
|
|
@@ -102,7 +116,7 @@ Index: net.c
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
-@@ -1148,17 +1155,12 @@
|
|
|
+@@ -1157,17 +1164,12 @@
|
|
|
tprint_iov(tcp, (unsigned long)msg.msg_iovlen,
|
|
|
(unsigned long)msg.msg_iov);
|
|
|
|
|
|
@@ -121,9 +135,9 @@ Index: net.c
|
|
|
}
|
|
|
|
|
|
Index: process.c
|
|
|
---- process.c.orig 2005-06-08 22:45:28 +0200
|
|
|
-+++ process.c 2005-06-25 13:07:36 +0200
|
|
|
-@@ -2965,7 +2965,9 @@
|
|
|
+--- process.c.orig 2007-01-11 23:08:38 +0100
|
|
|
++++ process.c 2007-03-15 08:51:23 +0100
|
|
|
+@@ -2982,7 +2982,9 @@
|
|
|
sys_ptrace(tcp)
|
|
|
struct tcb *tcp;
|
|
|
{
|
|
|
@@ -135,7 +149,7 @@ Index: process.c
|
|
|
if (entering(tcp)) {
|
|
|
Index: sock.c
|
|
|
--- sock.c.orig 2005-06-01 21:02:37 +0200
|
|
|
-+++ sock.c 2005-06-25 13:07:36 +0200
|
|
|
++++ sock.c 2007-03-15 08:51:23 +0100
|
|
|
@@ -37,6 +37,7 @@
|
|
|
#include <sys/sockio.h>
|
|
|
#endif
|