comparison lib-src/make-path.c @ 9050:953e5ea2b8ea

(touchy_mkdir): Make dir ugo+re even if it isn't new. Rename path to dirname.

9049:522a9e03ca05

extern int errno;

char *prog_name;

int touchy_mkdir (path)
     char *path;
{
  struct stat buf;

  /* If PATH already exists and is a directory, return success.  */
  if (stat (path, &buf) >= 0
      && (buf.st_mode & S_IFMT) == S_IFDIR)
    return 0;

  /* Otherwise, try to make it.  If PATH exists but isn't a directory,
     this will signal an error.  */
  if (mkdir (path, 0777) < 0)
    {
      fprintf (stderr, "%s: ", prog_name);
      perror (path);
      return 1;
    }

  return 0;
}

{
  prog_name = *argv;

  for (argc--, argv++; argc > 0; argc--, argv++)
    {
      char *path = *argv;
      int i;

      /* Stop at each slash in path and try to create the directory.
	 Skip any initial slash.  */
      for (i = (path[0] == '/') ? 1 : 0; path[i]; i++)
	if (path[i] == '/')
	  {
	    path[i] = '\0';
	    if (touchy_mkdir (path) < 0)
	      goto next_pathname;
	    path[i] = '/';
	  }

      touchy_mkdir (path);

    next_pathname:
      ;
    }

  return 0;
}

9050:953e5ea2b8ea

extern int errno;

char *prog_name;

/* Create directory DIRNAME if it does not exist already.
   Then give permission for everyone to read and search it.
   Return 0 if successful, 1 if not.  */

int
touchy_mkdir (dirname)
     char *dirname;
{
  struct stat buf;

  /* If DIRNAME already exists and is a directory, don't create.  */
  if (! (stat (dirname, &buf) >= 0
	 && (buf.st_mode & S_IFMT) == S_IFDIR))
    {
      /* Otherwise, try to make it.  If DIRNAME exists but isn't a directory,
	 this will signal an error.  */
      if (mkdir (dirname, 0777) < 0)
	{
	  fprintf (stderr, "%s: ", prog_name);
	  perror (dirname);
	  return 1;
	}
    }

  /* Make sure everyone can look at this directory.  */
  if (stat (dirname, &buf) < 0)
    {
      fprintf (stderr, "%s: ", prog_name);
      perror (dirname);
      return 1;
    }
  if (chmod (dirname, 0555 | (buf.st_mode & 0777)) < 0)
    {
      fprintf (stderr, "%s: ", prog_name);
      perror (dirname);
    }

  return 0;
}

{
  prog_name = *argv;

  for (argc--, argv++; argc > 0; argc--, argv++)
    {
      char *dirname = *argv;
      int i;

      /* Stop at each slash in dirname and try to create the directory.
	 Skip any initial slash.  */
      for (i = (dirname[0] == '/') ? 1 : 0; dirname[i]; i++)
	if (dirname[i] == '/')
	  {
	    dirname[i] = '\0';
	    if (touchy_mkdir (dirname) < 0)
	      goto next_dirname;
	    dirname[i] = '/';
	  }

      touchy_mkdir (dirname);

    next_dirname:
      ;
    }

  return 0;
}