summaryrefslogtreecommitdiffstats
path: root/login-utils/sulogin-consoles.c
diff options
context:
space:
mode:
authorSami Kerola2016-04-16 16:43:17 +0200
committerSami Kerola2016-04-17 00:09:26 +0200
commit400423824a6810aa0ec09b0d1cae34e420cfa781 (patch)
tree84cf5ca9926f26901b9044136014d936815229a6 /login-utils/sulogin-consoles.c
parentscript: close file descriptors on exec (diff)
downloadkernel-qcow2-util-linux-400423824a6810aa0ec09b0d1cae34e420cfa781.tar.gz
kernel-qcow2-util-linux-400423824a6810aa0ec09b0d1cae34e420cfa781.tar.xz
kernel-qcow2-util-linux-400423824a6810aa0ec09b0d1cae34e420cfa781.zip
sulogin: make fopen O_CLOEXEC specifier usage portable
The close at exit specifier "e" is glibc extension, so use it only if when the extension is available. Proposed-by: Ruediger Meier <sweet_f_a@gmx.de> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'login-utils/sulogin-consoles.c')
-rw-r--r--login-utils/sulogin-consoles.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index fe8eab15d..4dcc77c43 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -160,7 +160,7 @@ char *oneline(const char *file)
DBG(dbgprint("reading %s", file));
- if (!(fp = fopen(file, "re")))
+ if (!(fp = fopen(file, "r" UL_CLOEXECSTR)))
return NULL;
len = getline(&ret, &dummy, fp);
if (len >= 0) {
@@ -361,7 +361,7 @@ static int detect_consoles_from_proc(struct list_head *consoles)
DBG(dbgprint("trying /proc"));
- fc = fopen("/proc/consoles", "re");
+ fc = fopen("/proc/consoles", "r" UL_CLOEXECSTR);
if (!fc) {
rc = 2;
goto done;