summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1998-01-02 23:15:39 +0000
committerJim Meyering <jim@meyering.net>1998-01-02 23:15:39 +0000
commit53bc7b04cba662f9e2f020f45b08a8a8c80ef0e9 (patch)
tree4568803a0deddc3f30a61dfbf2698e1c14638b08 /lib
parent43c2a5f62bff26cacf7d276d5ffc7cd2f414a0bd (diff)
downloadcoreutils-53bc7b04cba662f9e2f020f45b08a8a8c80ef0e9.tar.xz
(make_path): Try to change ownership only if we've just created the
directory. Fix latent bug (s/&&/||/ in two places -- also, note that it could not be exercised via install or mkdir) whereby chown would not be invoked when only one of owner/group is not -1.
Diffstat (limited to 'lib')
-rw-r--r--lib/makepath.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/makepath.c b/lib/makepath.c
index 034665d3d..ff499cab0 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -71,6 +71,16 @@ extern int errno;
# endif
#endif
+#ifndef S_IWUSR
+# define S_IWUSR 0200
+#endif
+
+#ifndef S_IXUSR
+# define S_IXUSR 0100
+#endif
+
+#define WX_USR (S_IWUSR | S_IXUSR)
+
#ifdef __MSDOS__
typedef int uid_t;
typedef int gid_t;
@@ -162,8 +172,8 @@ make_path (const char *argpath,
/* If leading directories shouldn't be writable or executable,
or should have set[ug]id or sticky bits set and we are setting
their owners, we need to fix their permissions after making them. */
- if (((parent_mode & 0300) != 0300)
- || (owner != (uid_t) -1 && group != (gid_t) -1
+ if (((parent_mode & WX_USR) != WX_USR)
+ || ((owner != (uid_t) -1 || group != (gid_t) -1)
&& (parent_mode & 07000) != 0))
{
tmp_mode = 0700;
@@ -232,7 +242,8 @@ make_path (const char *argpath,
if (newly_created_dir && verbose_fmt_string != NULL)
fprintf (stderr, verbose_fmt_string, dirpath);
- if (owner != (uid_t) -1 && group != (gid_t) -1
+ if (newly_created_dir
+ && (owner != (uid_t) -1 || group != (gid_t) -1)
&& chown (basename_dir, owner, group)
#if defined(AFS) && defined (EPERM)
&& errno != EPERM
@@ -348,7 +359,7 @@ make_path (const char *argpath,
On System V, users can give away files with chown and then not
be able to chmod them. So don't give files away. */
- if (owner != (uid_t) -1 && group != (gid_t) -1
+ if ((owner != (uid_t) -1 || group != (gid_t) -1)
&& chown (dirpath, owner, group)
#ifdef AFS
&& errno != EPERM