X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=d4eaadeec280e539f4b754e3aab0d9a8fb6ea926;hb=ef8e4e5cfec5367d1c3c3aedf15408371de20f6d;hp=3729b1a43eddec1d44ea72fddff8c1f5e3eff693;hpb=a5c4d40f377632b88f3d6aebf023d238677eb2b7;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index 3729b1a43..d4eaadeec 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, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000, 2002 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
@@ -46,7 +46,7 @@ char *alloca ();
 # undef S_ISDIR
 #endif
 
-#if !defined(S_ISDIR) && defined(S_IFDIR)
+#if !defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
@@ -103,23 +103,14 @@ extern int errno;
 /* Include this before libintl.h so we get our definition of PARAMS. */
 #include "makepath.h"
 
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
 #include "save-cwd.h"
+#include "dirname.h"
 #include "error.h"
 #include "quote.h"
 
-void strip_trailing_slashes ();
-
 #define CLEANUP_CWD					\
   do							\
     {							\
@@ -196,7 +187,6 @@ make_dir (const char *dir, const char *dirpath, mode_t mode, int *created_dir_p)
 }
 
 /* Ensure that the directory ARGPATH exists.
-   Remove any trailing slashes from ARGPATH before calling this function.
 
    Create any leading directories that don't already exist, with
    permissions PARENT_MODE.
@@ -313,7 +303,7 @@ make_path (const char *argpath,
 
 	      if ((owner != (uid_t) -1 || group != (gid_t) -1)
 		  && chown (basename_dir, owner, group)
-#if defined(AFS) && defined (EPERM)
+#if defined AFS && defined EPERM
 		  && errno != EPERM
 #endif
 		  )
@@ -340,7 +330,7 @@ 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"),
+	      error (0, errno, _("cannot chdir to directory %s"),
 		     quote (dirpath));
 	      CLEANUP;
 	      return 1;
@@ -357,6 +347,9 @@ make_path (const char *argpath,
       if (!do_chdir)
 	basename_dir = dirpath;
 
+      /* Done creating leading directories.  Restore original umask.  */
+      umask (oldmask);
+
       /* We're done making leading directories.
 	 Create the final component of the path.  */
 
@@ -366,9 +359,6 @@ make_path (const char *argpath,
 	  return 1;
 	}
 
-      /* Done creating directories.  Restore original umask.  */
-      umask (oldmask);
-
       if (verbose_fmt_string != NULL)
 	error (0, 0, verbose_fmt_string, quote (dirpath));
 
@@ -394,7 +384,8 @@ make_path (const char *argpath,
       if ((mode & ~S_IRWXUGO)
 	  && chmod (basename_dir, mode))
 	{
-	  error (0, errno, _("cannot change permissions of %s"), quote (dirpath));
+	  error (0, errno, _("cannot change permissions of %s"),
+		 quote (dirpath));
 	  retval = 1;
 	}