X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=3729b1a43eddec1d44ea72fddff8c1f5e3eff693;hb=999775b691c8778c10b4787178805280dc4a8183;hp=018b17e567402d68509de4ca6f3a90fc51b31192;hpb=6564fd9944c6478655dfec306aa9cd046e694a23;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index 018b17e56..3729b1a43 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -1,5 +1,5 @@
 /* makepath.c -- Ensure that a directory path exists.
-   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,6 +50,10 @@ char *alloca ();
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_IRWXUGO
+# define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
+#endif
+
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
@@ -110,13 +114,9 @@ extern int errno;
 # define _(Text) Text
 #endif
 
-#ifdef __MSDOS__
-typedef int uid_t;
-typedef int gid_t;
-#endif
-
 #include "save-cwd.h"
 #include "error.h"
+#include "quote.h"
 
 void strip_trailing_slashes ();
 
@@ -148,10 +148,10 @@ void strip_trailing_slashes ();
    function creates DIR and to zero otherwise.  Give a diagnostic and
    return non-zero if DIR cannot be created or cannot be determined to
    exist already.  Use DIRPATH in any diagnostic, not DIR.
-   Note that if DIR already exists, this function will return zero
-   (indicating success) and will set *CREATED_DIR_P to zero.  */
+   Note that if DIR already exists, this function returns zero
+   (indicating success) and sets *CREATED_DIR_P to zero.  */
 
-static int
+int
 make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 {
   int fail = 0;
@@ -174,12 +174,13 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 
       if (stat (dir, &stats))
 	{
-	  error (0, saved_errno, _("cannot create directory `%s'"), dirpath);
+	  error (0, saved_errno, _("cannot create directory %s"),
+		 quote (dirpath));
 	  fail = 1;
 	}
       else if (!S_ISDIR (stats.st_mode))
 	{
-	  error (0, 0, _("`%s' exists but is not a directory"), dirpath);
+	  error (0, 0, _("%s exists but is not a directory"), quote (dirpath));
 	  fail = 1;
 	}
       else
@@ -308,7 +309,7 @@ make_path (const char *argpath,
 	  if (newly_created_dir)
 	    {
 	      if (verbose_fmt_string)
-		fprintf (stderr, verbose_fmt_string, dirpath);
+		error (0, 0, verbose_fmt_string, quote (dirpath));
 
 	      if ((owner != (uid_t) -1 || group != (gid_t) -1)
 		  && chown (basename_dir, owner, group)
@@ -317,7 +318,8 @@ make_path (const char *argpath,
 #endif
 		  )
 		{
-		  error (0, errno, "%s", dirpath);
+		  error (0, errno, _("cannot change owner and/or group of %s"),
+			 quote (dirpath));
 		  CLEANUP;
 		  return 1;
 		}
@@ -338,7 +340,8 @@ make_path (const char *argpath,
 	     stat and mkdir process O(n^2) file name components.  */
 	  if (do_chdir && chdir (basename_dir) < 0)
 	    {
-	      error (0, errno, _("cannot chdir to directory, %s"), dirpath);
+	      error (0, errno, _("cannot chdir to directory, %s"),
+		     quote (dirpath));
 	      CLEANUP;
 	      return 1;
 	    }
@@ -367,7 +370,7 @@ make_path (const char *argpath,
       umask (oldmask);
 
       if (verbose_fmt_string != NULL)
-	error (0, 0, verbose_fmt_string, dirpath);
+	error (0, 0, verbose_fmt_string, quote (dirpath));
 
       if (owner != (uid_t) -1 || group != (gid_t) -1)
 	{
@@ -377,18 +380,24 @@ make_path (const char *argpath,
 #endif
 	      )
 	    {
-	      error (0, errno, _("cannot chown %s"), dirpath);
-	      retval = 1;
-	    }
-	  /* chown may have turned off some permission bits we wanted.  */
-	  if ((mode & (S_ISUID | S_ISGID | S_ISVTX))
-	      && chmod (basename_dir, mode))
-	    {
-	      error (0, errno, _("cannot chmod %s"), dirpath);
+	      error (0, errno, _("cannot change owner and/or group of %s"),
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	}
 
+      /* The above chown may have turned off some permission bits in MODE.
+	 Another reason we may have to use chmod here is that mkdir(2) is
+	 required to honor only the file permission bits.  In particular,
+	 it need not honor the `special' bits, so if MODE includes any
+	 special bits, set them here.  */
+      if ((mode & ~S_IRWXUGO)
+	  && chmod (basename_dir, mode))
+	{
+	  error (0, errno, _("cannot change permissions of %s"), quote (dirpath));
+	  retval = 1;
+	}
+
       CLEANUP_CWD;
 
       /* If the mode for leading directories didn't include owner "wx"
@@ -399,7 +408,8 @@ make_path (const char *argpath,
 	  *(p->dirname_end) = '\0';
 	  if (chmod (dirpath, parent_mode))
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, "cannot change permissions of %s",
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	}
@@ -412,7 +422,7 @@ make_path (const char *argpath,
 
       if (!S_ISDIR (stats.st_mode))
 	{
-	  error (0, 0, _("`%s' exists but is not a directory"), dirpath);
+	  error (0, 0, _("%s exists but is not a directory"), quote (dirpath));
 	  return 1;
 	}
 
@@ -431,12 +441,14 @@ make_path (const char *argpath,
 #endif
 	      )
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, _("cannot change owner and/or group of %s"),
+		     quote (dirpath));
 	      retval = 1;
 	    }
 	  if (chmod (dirpath, mode))
 	    {
-	      error (0, errno, "%s", dirpath);
+	      error (0, errno, _("cannot change permissions of %s"),
+				 quote (dirpath));
 	      retval = 1;
 	    }
 	}