diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2013-03-08 14:26:42 +0100 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2013-03-13 14:41:33 -0400 |
commit | 22d381367c27910fe82f476a76b9f4ede555e35a (patch) | |
tree | 4c9c2d12bae688e4f94a9864f3069018bf171ca1 /src/util | |
parent | 8359bf07a2e6c0181251ce8d5d9160dc57546c55 (diff) | |
download | sssd-22d381367c27910fe82f476a76b9f4ede555e35a.tar.gz sssd-22d381367c27910fe82f476a76b9f4ede555e35a.tar.bz2 sssd-22d381367c27910fe82f476a76b9f4ede555e35a.zip |
Reuse sss_open_cloexec at other places in code.
Functions open_cloexec and openat_cloexec were renamed with prefix
"sss_" and moved to separete file. Replacing duplicated code of
function sss_open_cloexec everywhere in the source code.
https://fedorahosted.org/sssd/ticket/1794
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/io.c | 90 | ||||
-rw-r--r-- | src/util/util.h | 3 |
2 files changed, 93 insertions, 0 deletions
diff --git a/src/util/io.c b/src/util/io.c new file mode 100644 index 00000000..e07a18c5 --- /dev/null +++ b/src/util/io.c @@ -0,0 +1,90 @@ +/* + SSSD + + compact.c + + Authors: + Lukas Slebodnik <lslebodn@redhat.com> + + Copyright (C) 2012 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <unistd.h> +#include <fcntl.h> + +#include "util/util.h" + +int sss_open_cloexec(const char *pathname, int flags, int *ret) +{ + int fd; + int oflags; + + oflags = flags; +#ifdef O_CLOEXEC + oflags |= O_CLOEXEC; +#endif + + errno = 0; + fd = open(pathname, oflags); + if (fd == -1) { + if (ret) { + *ret = errno; + } + return -1; + } + +#ifndef O_CLOEXEC + int v; + + v = fcntl(fd, F_GETFD, 0); + /* we ignore an error, it's not fatal and there is nothing we + * can do about it anyways */ + (void)fcntl(fd, F_SETFD, v | FD_CLOEXEC); +#endif + + return fd; +} + +int sss_openat_cloexec(int dir_fd, const char *pathname, int flags, int *ret) +{ + int fd; + int oflags; + + oflags = flags; +#ifdef O_CLOEXEC + oflags |= O_CLOEXEC; +#endif + + errno = 0; + fd = openat(dir_fd, pathname, oflags); + if (fd == -1) { + if (ret) { + *ret = errno; + } + return -1; + } + +#ifndef O_CLOEXEC + int v; + + v = fcntl(fd, F_GETFD, 0); + /* we ignore an error, it's not fatal and there is nothing we + * can do about it anyways */ + (void)fcntl(fd, F_SETFD, v | FD_CLOEXEC); +#endif + + return fd; +} diff --git a/src/util/util.h b/src/util/util.h index 8afb3bc9..d5ff9bb0 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -584,6 +584,9 @@ errno_t sssd_domain_init(TALLOC_CTX *mem_ctx, /* from util_lock.c */ errno_t sss_br_lock_file(int fd, size_t start, size_t len, int num_tries, useconds_t wait); +/* from io.c */ +int sss_open_cloexec(const char *pathname, int flags, int *ret); +int sss_openat_cloexec(int dir_fd, const char *pathname, int flags, int *ret); /* Endianness-compatibility for systems running older versions of glibc */ |