From f6c28b6e0017ac36190ee31132721a1c9e30f2b6 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sat, 22 Nov 2014 00:36:45 -0600 Subject: As long as Android's going to require fortify, fixup the warnings it generates. --- toys/posix/cp.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'toys/posix/cp.c') diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 07a8f05b..9e83cb80 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -261,6 +261,7 @@ int cp_node(struct dirtree *try) if (fdout != -1) { if (flags & (FLAG_a|FLAG_p)) { struct timespec times[2]; + int rc; // Inability to set these isn't fatal, some require root access. @@ -268,13 +269,20 @@ int cp_node(struct dirtree *try) times[1] = try->st.st_mtim; // If we can't get a filehandle to the actual object, use racy functions - if (fdout == AT_FDCWD) { - fchownat(cfd, catch, try->st.st_uid, try->st.st_gid, - AT_SYMLINK_NOFOLLOW); - utimensat(cfd, catch, times, AT_SYMLINK_NOFOLLOW); - // permission bits already correct for mknod, don't apply to symlink - } else { - fchown(fdout, try->st.st_uid, try->st.st_gid); + if (fdout == AT_FDCWD) + rc = fchownat(cfd, catch, try->st.st_uid, try->st.st_gid, + AT_SYMLINK_NOFOLLOW); + else rc = fchown(fdout, try->st.st_uid, try->st.st_gid); + if (rc) { + char *pp; + + perror_msg("chown '%s'", pp = dirtree_path(try, 0)); + free(pp); + } + + // permission bits already correct for mknod and don't apply to symlink + if (fdout == AT_FDCWD) utimensat(cfd, catch, times, AT_SYMLINK_NOFOLLOW); + else { futimens(fdout, times); fchmod(fdout, try->st.st_mode); } -- cgit v1.2.3