X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=24c3b8ca146ff1fafe8de8da3dd059c7f947f415;hb=b61e1dca934c1cda7632d154c243dcf56aabac60;hp=901ddb036771d77ff7ab1c2f723c98db7f895bbb;hpb=32bd4678460f5a6d724ca5f4470314bbe63c0429;p=lttng-tools.git

diff --git a/src/common/utils.c b/src/common/utils.c
index 901ddb036..24c3b8ca1 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -528,7 +528,7 @@ int utils_create_lock_file(const char *filepath)
 		S_IRGRP | S_IWGRP);
 	if (fd < 0) {
 		PERROR("open lock file %s", filepath);
-		ret = -1;
+		fd = -1;
 		goto error;
 	}
 
@@ -854,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) {
 		/*
@@ -1334,15 +1335,17 @@ LTTNG_HIDDEN
 int utils_truncate_stream_file(int fd, off_t length)
 {
 	int ret;
+	off_t lseek_ret;
 
 	ret = ftruncate(fd, length);
 	if (ret < 0) {
 		PERROR("ftruncate");
 		goto end;
 	}
-	ret = lseek(fd, length, SEEK_SET);
-	if (ret < 0) {
+	lseek_ret = lseek(fd, length, SEEK_SET);
+	if (lseek_ret < 0) {
 		PERROR("lseek");
+		ret = -1;
 		goto end;
 	}
 end:
@@ -1374,11 +1377,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;
 }