projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update COPYING.DOC to fdl version 1.2.
[gnulib.git]
/
lib
/
makepath.c
diff --git
a/lib/makepath.c
b/lib/makepath.c
index
fbe3f6a
..
d4eaade
100644
(file)
--- a/
lib/makepath.c
+++ b/
lib/makepath.c
@@
-46,7
+46,7
@@
char *alloca ();
# undef S_ISDIR
#endif
# 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
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
@@
-303,7
+303,7
@@
make_path (const char *argpath,
if ((owner != (uid_t) -1 || group != (gid_t) -1)
&& chown (basename_dir, owner, group)
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
)
&& errno != EPERM
#endif
)
@@
-347,6
+347,9
@@
make_path (const char *argpath,
if (!do_chdir)
basename_dir = dirpath;
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. */
/* We're done making leading directories.
Create the final component of the path. */
@@
-356,9
+359,6
@@
make_path (const char *argpath,
return 1;
}
return 1;
}
- /* Done creating directories. Restore original umask. */
- umask (oldmask);
-
if (verbose_fmt_string != NULL)
error (0, 0, verbose_fmt_string, quote (dirpath));
if (verbose_fmt_string != NULL)
error (0, 0, verbose_fmt_string, quote (dirpath));
@@
-384,7
+384,8
@@
make_path (const char *argpath,
if ((mode & ~S_IRWXUGO)
&& chmod (basename_dir, mode))
{
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;
}
retval = 1;
}