X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fdirectory-handle.c;h=a790c5b79960d7933efe4221949070698b59eea9;hp=9548da216298ff23980e5e84dcf8cc24975c5608;hb=b2081a0f39bce45b3d1cf063308a9b77712f1a9f;hpb=57b1431829d660508840fc820a19ee27f5e1a711

diff --git a/src/common/compat/directory-handle.c b/src/common/compat/directory-handle.c
index 9548da216..a790c5b79 100644
--- a/src/common/compat/directory-handle.c
+++ b/src/common/compat/directory-handle.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <common/compat/directory-handle.h>
@@ -174,6 +164,8 @@ struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
 		if (ret) {
 			PERROR("Failed to fstat directory file descriptor %i", dirfd);
 			lttng_directory_handle_release(&handle->ref);
+			handle = NULL;
+			goto end;
 		}
 	} else {
 		handle->directory_inode = RESERVED_AT_FDCWD_INO;
@@ -191,6 +183,10 @@ void lttng_directory_handle_release(struct urcu_ref *ref)
 	struct lttng_directory_handle *handle =
 			container_of(ref, struct lttng_directory_handle, ref);
 
+	if (handle->destroy_cb) {
+		handle->destroy_cb(handle, handle->destroy_cb_data);
+	}
+
 	if (handle->dirfd == AT_FDCWD || handle->dirfd == -1) {
 		goto end;
 	}
@@ -248,6 +244,13 @@ int lttng_directory_handle_stat(const struct lttng_directory_handle *handle,
 	return fstatat(handle->dirfd, path, st, 0);
 }
 
+LTTNG_HIDDEN
+bool lttng_directory_handle_uses_fd(
+		const struct lttng_directory_handle *handle)
+{
+	return handle->dirfd != AT_FDCWD;
+}
+
 static
 int lttng_directory_handle_mkdir(
 		const struct lttng_directory_handle *handle,
@@ -590,7 +593,7 @@ LTTNG_HIDDEN
 bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
 		const struct lttng_directory_handle *rhs)
 {
-	return strcmp(lhs->path, rhs->path) == 0;
+	return strcmp(lhs->base_path, rhs->base_path) == 0;
 }
 
 static
@@ -617,6 +620,13 @@ end:
 	return ret;
 }
 
+LTTNG_HIDDEN
+bool lttng_directory_handle_uses_fd(
+		const struct lttng_directory_handle *handle)
+{
+	return false;
+}
+
 static
 int lttng_directory_handle_mkdir(const struct lttng_directory_handle *handle,
 		const char *subdirectory, mode_t mode)