Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/util.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-09-10 14:29:50 -0500
committerDan McGee <dan@archlinux.org>2008-10-12 21:28:05 -0500
commitf9be2334f7b01ba30235500cb12d4ed61fff564b (patch)
tree796b90d94985d8e0ad19f3c05d7f19dd275bc387 /lib/libalpm/util.c
parent18452a6c51827e91f37978397552c30cb92c26cd (diff)
libalpm: handle syscall interruption correctly
It is possible to throw EINTR from a system call such as open(), close(), or waitpid() if custom signal handlers are set up and they are not initialized with the SA_RESTART flag. This was noticed by Andreas Radke when ^C (SIGINT) was given during the call to waitpid(), causing it to throw the EINTR error and we could not accommodate it. Simply wrap these calls in a simple loop that allows us to retry the call if interrupted. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/util.c')
-rw-r--r--lib/libalpm/util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index b26c9702..da3463b0 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -254,7 +254,8 @@ int _alpm_lckmk()
_alpm_makepath(dir);
FREE(dir);
- fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000);
+ while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1
+ && errno == EINTR);
return(fd > 0 ? fd : -1);
}