Merge branch 'linus' into x86/asm, before applying dependent patch

[firefly-linux-kernel-4.4.55.git] / tools / hv / hv_fcopy_daemon.c

diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index f437d739f37da6fca68165b983e4137c2622f317..9445d8f264a4612fb4ebd2b5c4251b999a21a6c3 100644 (file)
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -43,15 +43,9 @@ static int hv_start_fcopy(struct hv_start_fcopy *smsg)
        int error = HV_E_FAIL;
        char *q, *p;
 
-       /*
-        * If possile append a path seperator to the path.
-        */
-       if (strlen((char *)smsg->path_name) < (W_MAX_PATH - 2))
-               strcat((char *)smsg->path_name, "/");
-
        p = (char *)smsg->path_name;
        snprintf(target_fname, sizeof(target_fname), "%s/%s",
-               (char *)smsg->path_name, smsg->file_name);
+                (char *)smsg->path_name, (char *)smsg->file_name);
 
        syslog(LOG_INFO, "Target file name: %s", target_fname);
        /*
@@ -137,7 +131,7 @@ void print_usage(char *argv[])
 
 int main(int argc, char *argv[])
 {
-       int fd, fcopy_fd, len;
+       int fcopy_fd, len;
        int error;
        int daemonize = 1, long_index = 0, opt;
        int version = FCOPY_CURRENT_VERSION;