[Midnightbsd-cvs] src [7651] stable/0.8/lib/libmport: implement mkdir -p like functionality for plists.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 31 12:41:19 EDT 2016
Revision: 7651
http://svnweb.midnightbsd.org/src/?rev=7651
Author: laffer1
Date: 2016-07-31 12:40:18 -0400 (Sun, 31 Jul 2016)
Log Message:
-----------
implement mkdir -p like functionality for plists.
Modified Paths:
--------------
stable/0.8/lib/libmport/Makefile
stable/0.8/lib/libmport/bundle_read_install_pkg.c
stable/0.8/lib/libmport/mport_private.h
Added Paths:
-----------
stable/0.8/lib/libmport/mkdir.c
Modified: stable/0.8/lib/libmport/Makefile
===================================================================
--- stable/0.8/lib/libmport/Makefile 2016-07-31 01:27:03 UTC (rev 7650)
+++ stable/0.8/lib/libmport/Makefile 2016-07-31 16:40:18 UTC (rev 7651)
@@ -8,7 +8,7 @@
default_cbs.c merge_primative.c bundle_read_install_pkg.c \
update_primative.c bundle_read_update_pkg.c pkgmeta.c \
fetch.c index.c index_depends.c install.c clean.c setting.c \
- stats.c verify.c lock.c
+ stats.c verify.c lock.c mkdir.c
INCS= mport.h mport_dispatch.h
CFLAGS+= -I${.CURDIR} -fblocks -g
Modified: stable/0.8/lib/libmport/bundle_read_install_pkg.c
===================================================================
--- stable/0.8/lib/libmport/bundle_read_install_pkg.c 2016-07-31 01:27:03 UTC (rev 7650)
+++ stable/0.8/lib/libmport/bundle_read_install_pkg.c 2016-07-31 16:40:18 UTC (rev 7651)
@@ -161,6 +161,7 @@
mode_t *dirset;
mode_t dirnewmode;
char *mode = NULL;
+ char *mkdirp = NULL;
struct stat sb;
char file[FILENAME_MAX], cwd[FILENAME_MAX], dir[FILENAME_MAX];
char *fm_owner, *fm_group, *fm_mode;
@@ -266,11 +267,13 @@
case ASSET_DIRRM:
case ASSET_DIRRMTRY:
case ASSET_DIR_OWNER_MODE:
- if (stat(data, &sb) == -1)
- mkdir(data, 0755); /* XXX: we ignore error because it's most likely already there */
+ mkdirp = strdup(data); /* need a char * here */
+ if (mport_mkdirp(mkdirp, S_IRWXU | S_IRWXG | S_IRWXO) == 0) {
+ SET_ERRORX(MPORT_ERR_FATAL, "Unable to create directory %s", data);
+ goto ERROR;
+ }
+ free(mkdirp);
- if (stat(data, &sb))
- goto ERROR;
if (fm_mode != NULL && fm_mode[0] != '\0') {
if ((dirset = setmode(fm_mode)) == NULL)
goto ERROR;
Added: stable/0.8/lib/libmport/mkdir.c
===================================================================
--- stable/0.8/lib/libmport/mkdir.c (rev 0)
+++ stable/0.8/lib/libmport/mkdir.c 2016-07-31 16:40:18 UTC (rev 7651)
@@ -0,0 +1,124 @@
+/*-
+ * 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.
+ * 4. 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.
+ */
+/* $FreeBSD: src/bin/mkdir/mkdir.c,v 1.32 2005/02/09 17:37:38 ru Exp $ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include "mport.h"
+#include "mport_private.h"
+
+
+/*
+ * Create directory (like mkdir -p) based on mkdir.c source.
+ * WARNING: unlike most mport_ functions this does not use MPORT_ERR_FATAL, etc
+ * omode should be the mode used, like say S_IRWXU | S_IRWXG | S_IRWXO
+ * Returns 1 if a directory has been created,
+ * 2 if it already existed, and 0 on failure.
+ */
+int
+mport_mkdirp(char *path, mode_t omode)
+{
+ struct stat sb;
+ mode_t numask, oumask;
+ int first, last, retval;
+ char *p;
+
+ p = path;
+ oumask = 0;
+ retval = 1;
+ if (p[0] == '/') /* Skip leading '/'. */
+ ++p;
+ for (first = 1, last = 0; !last ; ++p) {
+ if (p[0] == '\0')
+ last = 1;
+ else if (p[0] != '/')
+ continue;
+ *p = '\0';
+ if (!last && p[1] == '\0')
+ last = 1;
+ if (first) {
+ /*
+ * POSIX 1003.2:
+ * For each dir operand that does not name an existing
+ * directory, effects equivalent to those caused by the
+ * following command shall occcur:
+ *
+ * mkdir -p -m $(umask -S),u+wx $(dirname dir) &&
+ * mkdir [-m mode] dir
+ *
+ * We change the user's umask and then restore it,
+ * instead of doing chmod's.
+ */
+ oumask = umask(0);
+ numask = oumask & ~(S_IWUSR | S_IXUSR);
+ (void)umask(numask);
+ first = 0;
+ }
+ if (last)
+ (void)umask(oumask);
+ if (mkdir(path, last ? omode : S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
+ if (errno == EEXIST || errno == EISDIR) {
+ if (stat(path, &sb) < 0) {
+ warn("%s", path);
+ retval = 0;
+ break;
+ } else if (!S_ISDIR(sb.st_mode)) {
+ if (last)
+ errno = EEXIST;
+ else
+ errno = ENOTDIR;
+ warn("%s", path);
+ retval = 0;
+ break;
+ }
+ if (last)
+ retval = 2;
+ } else {
+ warn("%s", path);
+ retval = 0;
+ break;
+ }
+ }
+ if (!last)
+ *p = '/';
+ }
+ if (!first && !last)
+ (void)umask(oumask);
+ return (retval);
+}
Property changes on: stable/0.8/lib/libmport/mkdir.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: stable/0.8/lib/libmport/mport_private.h
===================================================================
--- stable/0.8/lib/libmport/mport_private.h 2016-07-31 01:27:03 UTC (rev 7650)
+++ stable/0.8/lib/libmport/mport_private.h 2016-07-31 16:40:18 UTC (rev 7651)
@@ -86,6 +86,7 @@
gid_t mport_get_gid(const char *);
int mport_rmtree(const char *);
int mport_mkdir(const char *);
+int mport_mkdirp(char *, mode_t);
int mport_rmdir(const char *, int);
int mport_chdir(mportInstance *, const char *);
int mport_xsystem(mportInstance *, const char *, ...);
@@ -181,7 +182,6 @@
#error "libmport only supports MidnightBSD versions 0.7 and greater."
#endif
-
/* fetch stuff */
#define MPORT_URL_PATH MPORT_ARCH "/" MPORT_OSVERSION
#define MPORT_INDEX_URL_PATH MPORT_URL_PATH "/index.db.bz2"
More information about the Midnightbsd-cvs
mailing list