Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge

Conflicts:
	libbb/vfork_daemon_rexec.c
	networking/wget.c
	procps/ps.c

1 files changed, 4 insertions, 4 deletions

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index adbc2dea3..48aaf481d 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -78,9 +78,9 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
         /* NB: each struct stat is ~100 bytes */
         struct stat source_stat;
         struct stat dest_stat;
-        signed char retval = 0;
-        signed char dest_exists = 0;
-        signed char ovr;
+        smallint retval = 0;
+        smallint dest_exists = 0;
+        smallint ovr;
 
 /* Inverse of cp -d ("cp without -d") */
 #define FLAGS_DEREF (flags & (FILEUTILS_DEREFERENCE + FILEUTILS_DEREFERENCE_L0))
@@ -157,7 +157,6 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 }
 #endif
 
-                /* Create DEST */
                 if (dest_exists) {
                         if (!S_ISDIR(dest_stat.st_mode)) {
                                 bb_error_msg("target '%s' is not a directory", dest);
@@ -166,6 +165,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         /* race here: user can substitute a symlink between
                          * this check and actual creation of files inside dest */
                 } else {
+                        /* Create DEST */
                         mode_t mode;
                         saved_umask = umask(0);