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>

diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index fe8eab15d76e78a7528bf4cd6fbf1ef5cfbf4572..4dcc77c43b7306287e0a35311a2d311b0cf79eae 100644 (file)
--- 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;