X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttd%2Flttd.c;h=3553dfaeda2191c8a84cce896c65b8fe69b2b359;hb=4d20e4740bdeb063ae9ea0ac32b1988079dfbb83;hp=fda5de5174a32082fb29878a92bf8e4ae5a65b9b;hpb=4e4d11b3b1db254446f6cad04b3c3fa9b574851f;p=lttv.git

diff --git a/ltt/branches/poly/lttd/lttd.c b/ltt/branches/poly/lttd/lttd.c
index fda5de51..3553dfae 100644
--- a/ltt/branches/poly/lttd/lttd.c
+++ b/ltt/branches/poly/lttd/lttd.c
@@ -198,20 +198,21 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
 	char path_trace[PATH_MAX];
 	int path_trace_len;
 	char *path_trace_ptr;
+  int open_ret = 0;
 
 	if(channel_dir == NULL) {
 		perror(subchannel_name);
-		return ENOENT;
+		open_ret = ENOENT;
+    goto end;
 	}
 
 	printf("Creating trace subdirectory %s\n", subtrace_name);
 	ret = mkdir(subtrace_name, S_IRWXU|S_IRWXG|S_IRWXO);
 	if(ret == -1) {
-		if(errno == EEXIST && append_mode) {
-			printf("Appending to directory %s as resquested\n", subtrace_name);
-		} else {
+		if(errno != EEXIST) {
 			perror(subtrace_name);
-			return -1;
+      open_ret = -1;
+			goto end;
 		}
 	}
 
@@ -276,7 +277,8 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
 					}
 				} else {
 					printf("File %s exists, cannot open. Try append mode.\n", path_trace);
-					return -1;
+					open_ret = -1;
+          goto end;
 				}
 			} else {
 				if(errno == ENOENT) {
@@ -291,9 +293,10 @@ int open_channel_trace_pairs(char *subchannel_name, char *subtrace_name,
 		}
 	}
 	
+end:
 	closedir(channel_dir);
 
-	return 0;
+	return open_ret;
 }
 
 
@@ -510,7 +513,6 @@ void close_channel_trace_pairs(struct channel_trace_fd *fd_pairs)
 int main(int argc, char ** argv)
 {
 	int ret;
-	pid_t pid;
 	struct channel_trace_fd fd_pairs = { NULL, 0 };
 	struct sigaction act;
 	
@@ -523,18 +525,13 @@ int main(int argc, char ** argv)
 	show_info();
 
 	if(daemon_mode) {
-		pid = fork();
-		
-		if(pid > 0) {
-			/* parent */
-			return 0;
-		} else if(pid < 0) {
-			/* error */
-			printf("An error occured while forking.\n");
-			return -1;
-		}
-		/* else, we are the child, continue... */
-	}
+		ret = daemon(0, 0);
+    
+    if(ret == -1) {
+      perror("An error occured while daemonizing.");
+      exit(-1);
+    }
+  }
 
 	/* Connect the signal handlers */
 	act.sa_handler = handler;