X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffd-util.c;h=8e4cfe3fe4084fec6f7c8b5d0654329821dfcc48;hb=c733f9b08d9eadc5e671185112567ada81116bdf;hp=17cafa4bb8b46b5f7cf952e2ed96f8b1dfa9954a;hpb=c5729796b4ec5e5f4800bfe6bd9ceb5c2da81fbe;p=elogind.git
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 17cafa4bb..8e4cfe3fe 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,9 +17,18 @@
along with systemd; If not, see .
***/
-#include "dirent-util.h"
+#include
+#include
+#include
+#include
+#include
+#include
+
#include "fd-util.h"
+#include "macro.h"
+#include "missing.h"
#include "parse-util.h"
+#include "path-util.h"
#include "socket-util.h"
#include "util.h"
@@ -224,7 +231,7 @@ int close_all_fds(const int except[], unsigned n_except) {
while ((de = readdir(d))) {
int fd = -1;
- if (hidden_file(de->d_name))
+ if (hidden_or_backup_file(de->d_name))
continue;
if (safe_atoi(de->d_name, &fd) < 0)
@@ -352,4 +359,18 @@ bool fdname_is_valid(const char *s) {
return p - s < 256;
}
+
+int fd_get_path(int fd, char **ret) {
+ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)];
+ int r;
+
+ xsprintf(procfs_path, "/proc/self/fd/%i", fd);
+
+ r = readlink_malloc(procfs_path, ret);
+
+ if (r == -ENOENT) /* If the file doesn't exist the fd is invalid */
+ return -EBADF;
+
+ return r;
+}
#endif // 0