Re: RFC V3 [1/2] test-in-container

[DJ Delorie <dj at redhat dot com>]

Florian Weimer <fweimer@redhat.com> writes:
> On 03/02/2018 12:05 AM, DJ Delorie wrote:
>> Moved mkdir_p() intto xmkdirp.c as xmkdirp(), it takes a mode now too,
>> and a const char *.
>
> The file is missing in the patch.

Sigh, sorry...

/* Error-checking replacement for "mkdir -p".
   Copyright (C) 2018 Free Software Foundation, Inc.
   This file is part of the GNU C Library.

   The GNU C Library 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.

   The GNU C Library 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 the GNU C Library; if not, see
   <http://www.gnu.org/licenses/>.  */

#include <support/support.h>
#include <support/check.h>

#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>

/* Equivalent of "mkdir -p".  */

int
xmkdirp (const char *path, int mode)
{
  struct stat s;
  const char *slash_p;
  int rv;

  if (path[0] == 0)
    return 0;

  if (stat (path, &s) == 0)
    {
      if (S_ISDIR (s.st_mode))
	return 0;
      errno = EEXIST;
      FAIL_EXIT1 ("mkdir_p (\"%s\", 0%o): %m", path, mode);
    }

  slash_p = strrchr (path, '/');
  if (slash_p)
    {
      while (slash_p > path && slash_p[-1] == '/')
	--slash_p;
      if (slash_p > path)
	{
	  char *parent = xstrndup (path, slash_p - path);
	  rv = xmkdirp (parent, mode);
	  free (parent);
	}
    }

  rv = mkdir (path, mode);
  if (rv != 0)
    FAIL_EXIT1 ("mkdir_p (\"%s\", 0%o): %m", path, mode);

  return 0;
}