X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-fd%2Flttng-ust-fd.c;h=14a23d9f557b79f12d44146d52a498b895ac76dd;hb=f7f0310af616d6baffebc42ce2374947e90f4256;hp=6a095db60803e1cd45f50dce805faaba4d915716;hpb=95e6d2685eec83a144f533a447ffd355fadf9d79;p=lttng-ust.git

diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
index 6a095db6..14a23d9f 100644
--- a/liblttng-ust-fd/lttng-ust-fd.c
+++ b/liblttng-ust-fd/lttng-ust-fd.c
@@ -1,22 +1,9 @@
 /*
- * Copyright (C) 2016  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
- *
- * This library 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
- * Lesser General Public License for more details.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2016  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <limits.h>
 #include <stdio.h>
@@ -25,12 +12,10 @@
 #include <ust-fd.h>
 #include <dlfcn.h>
 
-#include <helper.h>
-#include "usterr-signal-safe.h"
-
-volatile enum ust_loglevel ust_loglevel;
+#include <ust-helper.h>
 
 static int (*__lttng_ust_fd_plibc_close)(int fd);
+static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
 
 static
 int _lttng_ust_fd_libc_close(int fd)
@@ -45,22 +30,46 @@ int _lttng_ust_fd_libc_close(int fd)
 	return lttng_ust_safe_close_fd(fd, __lttng_ust_fd_plibc_close);
 }
 
+static
+int _lttng_ust_fd_libc_fclose(FILE *stream)
+{
+	if (!__lttng_ust_fd_plibc_fclose) {
+		__lttng_ust_fd_plibc_fclose = dlsym(RTLD_NEXT, "fclose");
+		if (!__lttng_ust_fd_plibc_fclose) {
+			fprintf(stderr, "%s\n", dlerror());
+			return -1;
+		}
+	}
+	return lttng_ust_safe_fclose_stream(stream,
+			__lttng_ust_fd_plibc_fclose);
+}
+
 int close(int fd)
 {
 	return _lttng_ust_fd_libc_close(fd);
 }
 
+/*
+ * Note: fcloseall() is not an issue because it fcloses only the
+ * streams it knows about, which differs from the problems caused by
+ * gnulib close_stdout(), which does an explicit fclose(stdout).
+ */
+int fclose(FILE *stream)
+{
+	return _lttng_ust_fd_libc_fclose(stream);
+}
+
 #if defined(__sun__) || defined(__FreeBSD__)
 /* Solaris and FreeBSD. */
 void closefrom(int lowfd)
 {
-	(void) lttng_ust_safe_closefrom(lowfd, __lttng_ust_fd_plibc_close);
+	(void) lttng_ust_safe_closefrom_fd(lowfd, __lttng_ust_fd_plibc_close);
 }
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 /* NetBSD and OpenBSD. */
 int closefrom(int lowfd)
 {
-	return lttng_ust_safe_closefrom(lowfd, __lttng_ust_fd_plibc_close);
+	return lttng_ust_safe_closefrom_fd(lowfd, __lttng_ust_fd_plibc_close);
 }
 #else
 /* As far as we know, this OS does not implement closefrom. */