X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=16d2f817ad8a1b21d99228a67e5bba25e0d1f3fa;hb=b07e7ef09b90a6bbb055f49bb2a6586dd45e73c9;hp=30a5f106ba8b19ec6ebbf26a059ff20fd278062c;hpb=b86d5f3ff9f8056db2590f881044b7ecbfc21527;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 30a5f106b..16d2f817a 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -190,7 +190,9 @@ error:
 	free(resolved_path);
 	free(cut_path);
 	free(try_path);
-	free(try_path_prev);
+	if (try_path_prev != try_path) {
+		free(try_path_prev);
+	}
 	return NULL;
 }
 
@@ -852,6 +854,7 @@ int utils_rotate_stream_file(char *path_name, char *file_name, uint64_t size,
 		PERROR("Closing tracefile");
 		goto error;
 	}
+	*stream_fd = -1;
 
 	if (count > 0) {
 		/*
@@ -1372,11 +1375,11 @@ int utils_show_man_page(int section, const char *page_name)
 	/*
 	 * Execute man pager.
 	 *
-	 * We provide --manpath to man here because LTTng-tools can
+	 * We provide -M to man here because LTTng-tools can
 	 * be installed outside /usr, in which case its man pages are
 	 * not located in the default /usr/share/man directory.
 	 */
-	ret = execlp(man_bin_path, "man", "--manpath", MANPATH,
+	ret = execlp(man_bin_path, "man", "-M", MANPATH,
 		section_string, page_name, NULL);
 	return ret;
 }