Add a mkpath() helper function to rpki-client to recursively create

directories.
OK deraadt@

diff --git a/usr.sbin/rpki-client/Makefile b/usr.sbin/rpki-client/Makefile
index 151d488..66280c5 100644 (file)
--- a/usr.sbin/rpki-client/Makefile
+++ b/usr.sbin/rpki-client/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.16 2021/01/08 08:09:07 claudio Exp $
+#      $OpenBSD: Makefile,v 1.17 2021/02/02 18:33:11 claudio Exp $
 
 PROG=  rpki-client
-SRCS=  as.c cert.c cms.c crl.c gbr.c io.c ip.c log.c main.c mft.c output.c \
-       output-bgpd.c output-bird.c output-csv.c output-json.c \
+SRCS=  as.c cert.c cms.c crl.c gbr.c io.c ip.c log.c main.c mft.c mkdir.c \
+       output.c output-bgpd.c output-bird.c output-csv.c output-json.c \
        roa.c rsync.c tal.c validate.c x509.c
 MAN=   rpki-client.8
 

diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h
index 9cde650..99504cf 100644 (file)
--- a/usr.sbin/rpki-client/extern.h
+++ b/usr.sbin/rpki-client/extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: extern.h,v 1.38 2021/01/29 10:13:16 claudio Exp $ */
+/*     $OpenBSD: extern.h,v 1.39 2021/02/02 18:33:11 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -422,6 +422,8 @@ int          output_json(FILE *, struct vrp_tree *, struct stats *);
 void   logx(const char *fmt, ...)
                    __attribute__((format(printf, 1, 2)));
 
+int    mkpath(const char *);
+
 #define                RPKI_PATH_OUT_DIR       "/var/db/rpki-client"
 #define                RPKI_PATH_BASE_DIR      "/var/cache/rpki-client"
 

diff --git a/usr.sbin/rpki-client/mkdir.c b/usr.sbin/rpki-client/mkdir.c
new file mode 100644 (file)
index 0000000..d9f466f
--- /dev/null
+++ b/usr.sbin/rpki-client/mkdir.c
@@ -0,0 +1,75 @@
+/*     $OpenBSD: mkdir.c,v 1.1 2021/02/02 18:33:11 claudio Exp $       */
+
+/*
+ * Copyright (c) 1983, 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <string.h>
+
+#include "extern.h"
+
+/*
+ * mkpath -- create directories.
+ *     path     - path
+ *     mode     - file mode of terminal directory
+ *     dir_mode - file mode of intermediate directories
+ */
+int
+mkpath(const char *dir)
+{
+       char *path, *slash;
+       int done;
+
+       if ((path = strdup(dir)) == NULL)
+               return -1;
+
+       slash = path;
+       for (;;) {
+               slash += strspn(slash, "/");
+               slash += strcspn(slash, "/");
+
+               done = (*slash == '\0');
+               *slash = '\0';
+
+               if (mkdir(path, 0700) == -1 && errno != EEXIST) {
+                       free(path);
+                       return (-1);
+               }
+
+               if (done)
+                       break;
+
+               *slash = '/';
+       }
+
+       free(path);
+       return (0);
+}