From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Mon, 19 Sep 2011 21:17:56 +0000 (-0400)
Subject: Don't report an error when the last section of the path exist in mkdir_recursive
X-Git-Tag: v2.0-pre15~201
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=7272acf55ec512708704dc5f1ad4f447e5b3ca8e;ds=sidebyside

Don't report an error when the last section of the path exist in mkdir_recursive

Minor adjustment for perror call changed to PERROR using the lttngerr.h
interface.

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 7532e2c3b..c72087ef2 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1432,12 +1432,13 @@ static int mount_debugfs(char *path)
 
 	ret = mkdir_recursive(path, S_IRWXU | S_IRWXG, geteuid(), getegid());
 	if (ret < 0) {
+		PERROR("Cannot create debugfs path");
 		goto error;
 	}
 
 	ret = mount(type, path, type, 0, NULL);
 	if (ret < 0) {
-		perror("mount debugfs");
+		PERROR("Cannot mount debugfs");
 		goto error;
 	}
 
@@ -1487,6 +1488,7 @@ static void init_kernel_tracer(void)
 		}
 		ret = mount_debugfs(debugfs_path);
 		if (ret < 0) {
+			perror("Cannot mount debugfs");
 			goto error;
 		}
 	}
diff --git a/ltt-sessiond/utils.c b/ltt-sessiond/utils.c
index 429d25b3b..0da564210 100644
--- a/ltt-sessiond/utils.c
+++ b/ltt-sessiond/utils.c
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; only version 2 of the License.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #define _GNU_SOURCE
@@ -27,6 +26,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <lttngerr.h>
+
 #include "utils.h"
 
 /*
@@ -38,7 +39,7 @@ int notify_thread_pipe(int wpipe)
 
 	ret = write(wpipe, "!", 1);
 	if (ret < 0) {
-		perror("write poll pipe");
+		PERROR("write poll pipe");
 	}
 
 	return ret;
@@ -66,7 +67,7 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 
 	ret = snprintf(tmp, sizeof(tmp), "%s", path);
 	if (ret < 0) {
-		perror("snprintf mkdir");
+		PERROR("snprintf mkdir");
 		goto error;
 	}
 
@@ -82,7 +83,7 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 			ret = mkdir(tmp, mode);
 			if (ret < 0) {
 				if (!(errno == EEXIST)) {
-					perror("mkdir recursive");
+					PERROR("mkdir recursive");
 					ret = -errno;
 					goto umask_error;
 				}
@@ -93,7 +94,7 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 				 */
 				ret = chown(tmp, uid, gid);
 				if (ret < 0) {
-					perror("chown in mkdir recursive");
+					PERROR("chown in mkdir recursive");
 					ret = -errno;
 					goto umask_error;
 				}
@@ -104,7 +105,12 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 
 	ret = mkdir(tmp, mode);
 	if (ret < 0) {
-		ret = -errno;
+		if (!(errno == EEXIST)) {
+			PERROR("mkdir recursive last piece");
+			ret = -errno;
+		} else {
+			ret = 0;
+		}
 	} else if (ret == 0) {
 		/*
 		 * We created the directory. Set its ownership to the user/group
@@ -112,7 +118,7 @@ int mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
 		 */
 		ret = chown(tmp, uid, gid);
 		if (ret < 0) {
-			perror("chown in mkdir recursive");
+			PERROR("chown in mkdir recursive");
 			ret = -errno;
 			goto umask_error;
 		}