aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-05-21 03:49:53 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2010-05-21 03:49:53 +0000
commit434d2aaea54f6ea8f13ce28bf59cb4d5164ef889 (patch)
tree2a3dbb0e922440f1bc3cad4e5a64a255ef7c64df
parent324d7ec0253e654699ad1cee2f519c4b54884ccb (diff)
libsylph/socket.c: sock_kill_process(): prevent redundant error messages when waitpid() is interrupted by EINTR.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2541 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--libsylph/socket.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ebaa7e96..84107fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-05-20
+ * libsylph/socket.c: sock_kill_process(): prevent redundant error
+ messages when waitpid() is interrupted by EINTR.
+
+2010-05-20
+
* src/compose.c: added "Open" menu in the attach context menu.
attach_button_pressed(): modify sensitivity of attach context menu.
diff --git a/libsylph/socket.c b/libsylph/socket.c
index a3ad08b4..da6d9fdc 100644
--- a/libsylph/socket.c
+++ b/libsylph/socket.c
@@ -1145,9 +1145,10 @@ static gint sock_kill_process(pid_t pid)
while (ret == (pid_t)-1) {
if ((ret = waitpid(pid, NULL, 0)) != pid) {
- perror("sock_kill_process(): waitpid");
- if (ret == (pid_t)-1 && errno != EINTR)
+ if (ret == (pid_t)-1 && errno != EINTR) {
+ perror("sock_kill_process(): waitpid");
break;
+ }
}
}