[PATCHv2 2/2] static-nodes: create parent directories of output file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Allows us to drop call to "mkdir -p" from the systemd service file.
---

v2: rebase

 Makefile.am          |  3 +-
 tools/mkdir.c        | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/mkdir.h        | 25 ++++++++++++++++
 tools/static-nodes.c | 14 +++++++--
 4 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 tools/mkdir.c
 create mode 100644 tools/mkdir.h

diff --git a/Makefile.am b/Makefile.am
index 0ed944c..ab49dfd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,8 @@ tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/lsmod.c \
 		     tools/rmmod.c tools/insmod.c \
 		     tools/modinfo.c tools/modprobe.c \
 		     tools/depmod.c tools/log.h tools/log.c \
-		     tools/static-nodes.c
+		     tools/static-nodes.c tools/mkdir.c \
+		     tools/mkdir.h
 tools_kmod_LDADD = libkmod/libkmod-util.la \
 		   libkmod/libkmod-internal.la
 
diff --git a/tools/mkdir.c b/tools/mkdir.c
new file mode 100644
index 0000000..9935366
--- /dev/null
+++ b/tools/mkdir.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2012  Lucas De Marchi <lucas.de.marchi@xxxxxxxxx
+ * Copyright (C) 2013  Tom Gundersen <teg@xxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <errno.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "mkdir.h"
+
+static int mkdir_p(char *path, mode_t mode)
+{
+	char *end = path + strlen(path);
+	struct stat st;
+	int r;
+
+	/*
+	 * don't try to overwrite existing file, succeed if it is a directory,
+	 * fail otherwise
+	 */
+	if (stat(path, &st) >= 0) {
+		if (S_ISDIR(st.st_mode)) {
+			return 0;
+		} else
+			return -ENOTDIR;
+	}
+
+	/* Find the last '/' */
+	while (end > path && *end != '/')
+		end--;
+
+	/* discard extra '/' */
+	while (end > path && *(end - 1) == '/')
+		end--;
+
+	/* if a parent directory was found, create it recursively */
+	if (end != path) {
+		*end = '\0';
+		r = mkdir_p(path, mode);
+		*end = '/';
+
+		if (r < 0)
+			return -errno;
+	}
+
+	/* create the desired directory */
+	return mkdir(path, mode);
+}
+
+int mkdir_parents(const char *path, mode_t mode) {
+	char *dirname = strdupa(path);
+	char *offset = strrchr(dirname, '/');
+
+	/* no parent directories */
+	if (!offset) {
+		return 0;
+	}
+
+	/* compute the dirname */
+	while (*(offset - 1) == '/')
+		offset--;
+	*offset = '\0';
+
+	return mkdir_p(dirname, mode);
+}
diff --git a/tools/mkdir.h b/tools/mkdir.h
new file mode 100644
index 0000000..5327fbe
--- /dev/null
+++ b/tools/mkdir.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2012  Lucas De Marchi <lucas.de.marchi@xxxxxxxxx>
+ * Copyright (C) 2013  Tom Gundersen <teg@xxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+int mkdir_parents(const char *path, mode_t mode);
diff --git a/tools/static-nodes.c b/tools/static-nodes.c
index 351c02b..faccefc 100644
--- a/tools/static-nodes.c
+++ b/tools/static-nodes.c
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include "libkmod-util.h"
 
+#include "mkdir.h"
+
 #include "kmod.h"
 
 struct static_nodes_format {
@@ -154,12 +156,11 @@ static void help(void)
 static int do_static_nodes(int argc, char *argv[])
 {
 	struct utsname kernel;
-	char modules[PATH_MAX];
+	char modules[PATH_MAX], buf[4096];
 	const char *output = "/dev/stdout";
 	FILE *in = NULL, *out = NULL;
 	const struct static_nodes_format *format = &static_nodes_format_human;
-	char buf[4096];
-	int ret = EXIT_SUCCESS;
+	int r, ret = EXIT_SUCCESS;
 
 	for (;;) {
 		int c, idx = 0, valid;
@@ -227,6 +228,13 @@ static int do_static_nodes(int argc, char *argv[])
 		goto finish;
 	}
 
+	r = mkdir_parents(output, 0755);
+	if (r < 0) {
+		fprintf(stderr, "Error: could not create parent directory for %s - %m.\n", output);
+		ret = EXIT_FAILURE;
+		goto finish;
+	}
+
 	out = fopen(output, "we");
 	if (out == NULL) {
 		fprintf(stderr, "Error: could not create %s - %m\n", output);
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux