projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5dab5c
)
util: don't fail if we cannot close valgrind's fds
author
Lennart Poettering
<lennart@poettering.net>
Tue, 6 Apr 2010 22:09:59 +0000
(
00:09
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 6 Apr 2010 22:09:59 +0000
(
00:09
+0200)
util.c
patch
|
blob
|
history
diff --git
a/util.c
b/util.c
index
f3af956
..
03c60af
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-1162,10
+1162,15
@@
int close_all_fds(const int except[], unsigned n_except) {
continue;
}
- if ((r = close_nointr(fd)) < 0)
- goto finish;
+ if ((r = close_nointr(fd)) < 0) {
+ /* Valgrind has its own FD and doesn't want to have it closed */
+ if (errno != EBADF)
+ goto finish;
+ }
}
+ r = 0;
+
finish:
closedir(d);
return r;