X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttctl%2Flttctl.c;h=5b8c262d862881bb7e66f7730707ed6d6f48d4c4;hb=63eeefc358a5e7d651a21c0f8fff160a0a2017a5;hp=080518d840ffb85ef6ec6c43e163a74f9fcc7937;hpb=2baf08e59375441cdf8be9ead01635f82b1553d5;p=lttv.git

diff --git a/ltt/branches/poly/lttctl/lttctl.c b/ltt/branches/poly/lttctl/lttctl.c
index 080518d8..5b8c262d 100644
--- a/ltt/branches/poly/lttctl/lttctl.c
+++ b/ltt/branches/poly/lttctl/lttctl.c
@@ -12,7 +12,7 @@
 #include <config.h>
 #endif
 
-#include <libltt/libltt.h>
+#include <liblttctl/lttctl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -117,7 +117,7 @@ int parse_arguments(int argc, char **argv)
 							trace_name = argv[argn+1];
 							argn++;
 						} else {
-							printf("Specify a trace name after -n.\n", argv[argn]);
+							printf("Specify a trace name after -n.\n");
 							printf("\n");
 							ret = EINVAL;
 						}
@@ -282,9 +282,9 @@ int create_eventdefs(void)
 
   ret = mkdir(trace_root, S_IRWXU|S_IRWXG|S_IRWXO);
   if(ret == -1 && errno != EEXIST) {
+    ret = errno;
     perror("Cannot create trace_root directory");
     printf("trace_root is %s\n", trace_root);
-    ret = errno;
     goto error;
   }
   ret = 0;
@@ -295,8 +295,8 @@ int create_eventdefs(void)
   size_t eventdefs_path_len = strlen(eventdefs_path);
   ret = mkdir(eventdefs_path, S_IRWXU|S_IRWXG|S_IRWXO);
   if(ret == -1 && (!append_trace || errno != EEXIST)) {
-    perror("Cannot create eventdefs directory");
     ret = errno;
+    perror("Cannot create eventdefs directory");
     goto error;
   }
   ret = 0;
@@ -327,8 +327,8 @@ int create_eventdefs(void)
     strncat(facilities_file, entry->d_name, PATH_MAX - facilities_dir_len-1);
     FILE *src = fopen(facilities_file, "r");
     if(!src) {
-      perror("Cannot open eventdefs file for reading");
       ret = errno;
+      perror("Cannot open eventdefs file for reading");
       goto close_dest;
     }
 
@@ -336,14 +336,14 @@ int create_eventdefs(void)
       size_t read_size, write_size;
       read_size = fread(read_buf, sizeof(char), BUF_SIZE, src);
       if(ferror(src)) {
-        perror("Cannot read eventdefs file");
         ret = errno;
+        perror("Cannot read eventdefs file");
         goto close_src;
       }
       write_size = fwrite(read_buf, sizeof(char), read_size, dest);
       if(ferror(dest)) {
-        perror("Cannot write eventdefs file");
         ret = errno;
+        perror("Cannot write eventdefs file");
         goto close_src;
       }
     } while(!feof(src));
@@ -416,8 +416,9 @@ int lttctl_daemon(struct lttctl_handle *handle, char *trace_name)
   		ret =	execlp(lttd_path, lttd_path, "-t", trace_root, "-c",
                        channel_path, "-d", NULL);
 		if(ret) {
+      ret = errno;
 			perror("Error in executing the lttd daemon");
-			exit(errno);
+			exit(ret);
 		}
 	} else {
 		/* error */