Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated patches to work with the current trunk.
[rsync/rsync-patches.git]
/
catch_crash_signals.diff
diff --git
a/catch_crash_signals.diff
b/catch_crash_signals.diff
index
4229422
..
3ecf176
100644
(file)
--- a/
catch_crash_signals.diff
+++ b/
catch_crash_signals.diff
@@
-25,7
+25,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on:
a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/errcode.h b/errcode.h
--- a/errcode.h
+++ b/errcode.h
diff --git a/errcode.h b/errcode.h
--- a/errcode.h
+++ b/errcode.h
@@
-52,7
+52,7
@@
diff --git a/log.c b/log.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -1
76,8 +176
,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -1
80,8 +180
,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
*exit_code_ptr = RERR_TERMINATED;
else
*exit_code_ptr = RERR_WAITCHILD;
*exit_code_ptr = RERR_TERMINATED;
else
*exit_code_ptr = RERR_WAITCHILD;
@@
-65,7
+65,7
@@
diff --git a/main.c b/main.c
}
void write_del_stats(int f)
}
void write_del_stats(int f)
-@@ -14
16,6 +1419
,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+@@ -14
32,6 +1435
,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
break;
}
}
break;
}
}
@@
-80,7
+80,7
@@
diff --git a/main.c b/main.c
}
#endif
#ifndef HAVE_SIGACTION
}
#endif
#ifndef HAVE_SIGACTION
-@@ -14
74,6 +1485
,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -14
90,6 +1501
,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
}
#endif
}
#endif
@@
-93,7
+93,7
@@
diff --git a/main.c b/main.c
int main(int argc,char *argv[])
{
int main(int argc,char *argv[])
{
-@@ -1
496,6 +1513
,11 @@ int main(int argc,char *argv[])
+@@ -1
512,6 +1529
,11 @@ int main(int argc,char *argv[])
SIGACTMASK(SIGFPE, rsync_panic_handler);
SIGACTMASK(SIGABRT, rsync_panic_handler);
SIGACTMASK(SIGBUS, rsync_panic_handler);
SIGACTMASK(SIGFPE, rsync_panic_handler);
SIGACTMASK(SIGABRT, rsync_panic_handler);
SIGACTMASK(SIGBUS, rsync_panic_handler);