X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustd%2Fustd.c;h=969c192abdb66bea7b9ce93dd48d7a994b5fe70c;hb=9df252731e9ee125dc691e512df8249c7a703655;hp=bfa6352e1ccf2b4063660ff279b007f29ec3702a;hpb=aa08b4413291fabcbd1b1144377d37034ad361de;p=lttng-ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index bfa6352e..969c192a 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -259,7 +259,7 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
 
 	result = sscanf(received_msg, "%d %d", &buf->shmid, &buf->bufstruct_shmid);
 	if(result != 2) {
-		ERR("unable to parse response to get_shmid");
+		ERR("unable to parse response to get_shmid (\"%s\")", received_msg);
 		return NULL;
 	}
 	free(received_msg);
@@ -342,7 +342,7 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
 	}
 	free(tmp);
 
-	asprintf(&tmp, "%s/%u_%lld/%s_0", trace_path, buf->pid, buf->pidunique, buf->name);
+	asprintf(&tmp, "%s/%u_%lld/%s", trace_path, buf->pid, buf->pidunique, buf->name);
 	result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 00600);
 	if(result == -1) {
 		PERROR("open");
@@ -545,7 +545,7 @@ static int write_pidfile(const char *file_name, pid_t pid)
 {
 	FILE *pidfp;
 
-	pidfp = fopen(file_name, "w+");
+	pidfp = fopen(file_name, "w");
 	if(!pidfp) {
 		PERROR("fopen (%s)", pidfile);
 		WARN("killing child process");
@@ -698,7 +698,6 @@ int start_ustd_daemon()
 	}
 	else {
 		char buf;
-		FILE *pidfp;
 
 		result = read(fd[0], &buf, 1);
 		if(result == -1) {