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