Fix cp(1) for files in /proc.
Also modernize the Android-specific hacks.
Bug: https://code.google.com/p/android/issues/detail?id=70793
(cherry picked from commit 1dc64f7a46a9cbac4a90c2cb7445fbbb7c5c8193)
Change-Id: Icacb20e735ec4ab3a93889f06a8d7b1a917f6b16
diff --git a/toolbox/cp/cp.c b/toolbox/cp/cp.c
index e666453..0ea206e 100644
--- a/toolbox/cp/cp.c
+++ b/toolbox/cp/cp.c
@@ -95,7 +95,7 @@
static int copy(char *[], enum op, int);
-#ifndef ANDROID
+#ifndef __ANDROID__
static void
progress(int sig __unused)
{
@@ -112,9 +112,7 @@
int ch, fts_options, r, have_trailing_slash;
char *target, **src;
-#ifndef ANDROID
setprogname(argv[0]);
-#endif
(void)setlocale(LC_ALL, "");
Hflag = Lflag = Pflag = Rflag = 0;
@@ -222,7 +220,7 @@
/* Set end of argument list for fts(3). */
argv[argc] = NULL;
-#ifndef ANDROID
+#ifndef __ANDROID__
(void)signal(SIGINFO, progress);
#endif
diff --git a/toolbox/cp/utils.c b/toolbox/cp/utils.c
index 9d0390f..12c3d67 100644
--- a/toolbox/cp/utils.c
+++ b/toolbox/cp/utils.c
@@ -42,7 +42,7 @@
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
-#ifndef ANDROID
+#ifndef __ANDROID__
#include <sys/extattr.h>
#endif
@@ -58,7 +58,7 @@
#include "extern.h"
-#ifdef ANDROID
+#ifdef __ANDROID__
#define MAXBSIZE 65536
#endif
@@ -70,7 +70,7 @@
{
static struct timeval tv[2];
-#ifdef ANDROID
+#ifdef __ANDROID__
tv[0].tv_sec = fs->st_atime;
tv[0].tv_usec = 0;
tv[1].tv_sec = fs->st_mtime;
@@ -198,7 +198,9 @@
* There's no reason to do anything other than close the file
* now if it's empty, so let's not bother.
*/
+#ifndef __ANDROID__ // Files in /proc report length 0. mmap will fail but we'll fall back to read.
if (fs->st_size > 0) {
+#endif
struct finfo fi;
fi.from = entp->fts_path;
@@ -273,9 +275,11 @@
rval = 1;
}
}
+#ifndef __ANDROID__
}
+#endif
-#ifndef ANDROID
+#ifndef __ANDROID__
if (pflag && (fcpxattr(from_fd, to_fd) != 0))
warn("%s: error copying extended attributes", to.p_path);
#endif
@@ -381,9 +385,7 @@
setfile(struct stat *fs, int fd)
{
int rval = 0;
-#ifndef ANDROID
int islink = S_ISLNK(fs->st_mode);
-#endif
fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
@@ -401,7 +403,7 @@
}
fs->st_mode &= ~(S_ISUID | S_ISGID);
}
-#ifdef ANDROID
+#ifdef __ANDROID__
if (fd ? fchmod(fd, fs->st_mode) : chmod(to.p_path, fs->st_mode)) {
#else
if (fd ? fchmod(fd, fs->st_mode) : lchmod(to.p_path, fs->st_mode)) {
@@ -410,7 +412,7 @@
rval = 1;
}
-#ifndef ANDROID
+#ifndef __ANDROID__
if (!islink && !Nflag) {
unsigned long fflags = fs->st_flags;
/*