Fixed codes which may occur potential bugs.

[sdk/target/sdbd.git] / src / file_sync_client.c

diff --git a/src/file_sync_client.c b/src/file_sync_client.c
index 95e8632..3ba3770 100644 (file)
--- a/src/file_sync_client.c
+++ b/src/file_sync_client.c
@@ -216,7 +216,7 @@ static int write_data_file(int fd, const char *path, syncsendbuf *sbuf)
 
     lfd = sdb_open(path, O_RDONLY);
     if(lfd < 0) {
-        fprintf(stderr,"cannot open '%s': %s\n", path, strerror(errno));
+        fprintf(stderr,"cannot open '%s': errno:%d\n", path, errno);
         return -1;
     }
 
@@ -231,7 +231,7 @@ static int write_data_file(int fd, const char *path, syncsendbuf *sbuf)
         if(ret < 0) {
             if(errno == EINTR)
                 continue;
-            fprintf(stderr,"cannot read '%s': %s\n", path, strerror(errno));
+            fprintf(stderr,"cannot read '%s': errno:%d\n", path, errno);
             break;
         }
 
@@ -279,7 +279,7 @@ static int write_data_link(int fd, const char *path, syncsendbuf *sbuf)
 
     len = readlink(path, sbuf->data, SYNC_DATA_MAX-1);
     if(len < 0) {
-        fprintf(stderr, "error reading link '%s': %s\n", path, strerror(errno));
+        fprintf(stderr, "error reading link '%s': errno:%d\n", path, errno);
         return -1;
     }
     sbuf->data[len] = '\0';
@@ -324,7 +324,7 @@ static int sync_send(int fd, const char *lpath, const char *rpath,
         // this requires that we read the entire file into memory.
         lfd = sdb_open(lpath, O_RDONLY);
         if(lfd < 0) {
-            fprintf(stderr,"cannot open '%s': %s\n", lpath, strerror(errno));
+            fprintf(stderr,"cannot open '%s': errno:%d\n", lpath, errno);
             return -1;
         }
 
@@ -469,7 +469,7 @@ int sync_recv(int fd, const char *rpath, const char *lpath)
         mkdirs((char *)lpath);
         lfd = sdb_creat(lpath, 0644);
         if(lfd < 0) {
-            fprintf(stderr,"cannot create '%s': %s\n", lpath, strerror(errno));
+            fprintf(stderr,"cannot create '%s': errno:%d\n", lpath, errno);
             return -1;
         }
         goto handle_data;
@@ -499,7 +499,7 @@ int sync_recv(int fd, const char *rpath, const char *lpath)
         }
 
         if(writex(lfd, buffer, len)) {
-            fprintf(stderr,"cannot write '%s': %s\n", rpath, strerror(errno));
+            fprintf(stderr,"cannot write '%s': errno:%d\n", rpath, errno);
             sdb_close(lfd);
             return -1;
         }
@@ -614,7 +614,7 @@ static int local_build_list(copyinfo **filelist,
 
     d = opendir(lpath);
     if(d == 0) {
-        fprintf(stderr,"cannot open '%s': %s\n", lpath, strerror(errno));
+        fprintf(stderr,"cannot open '%s': errno:%d\n", lpath, errno);
         return -1;
     }
 
@@ -644,13 +644,13 @@ static int local_build_list(copyinfo **filelist,
         } else {
             ci = mkcopyinfo(lpath, rpath, name, 0);
             if(lstat(ci->src, &st)) {
-                fprintf(stderr,"cannot stat '%s': %s\n", ci->src, strerror(errno));
+                fprintf(stderr,"cannot stat '%s': errno:%d\n", ci->src, errno);
                 closedir(d);
 
                 return -1;
             }
             if(!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) {
-                fprintf(stderr, "skipping special file '%s'\n", ci->src);
+                fprintf(stderr, "skipping special file\n");
                 free(ci);
             } else {
                 ci->time = st.st_mtime;
@@ -758,7 +758,7 @@ int do_sync_push(const char *lpath, const char *rpath, int verifyApk, int isUtf8
     }
 
     if(stat(lpath, &st)) {
-        fprintf(stderr,"cannot stat '%s': %s\n", lpath, strerror(errno));
+        fprintf(stderr,"cannot stat '%s': errno:%d\n", lpath, errno);
         sync_quit(fd);
         return 1;
     }
@@ -978,7 +978,8 @@ int do_sync_pull(const char *rpath, const char *lpath)
         return 1;
     }
     if(mode == 0) {
-        fprintf(stderr,"remote object '%s' does not exist\n", rpath);
+        fprintf(stderr,"'%s': No such file or directory\n", rpath);
+        sync_quit(fd);
         return 1;
     }
 
@@ -1019,7 +1020,7 @@ int do_sync_pull(const char *rpath, const char *lpath)
             return 0;
         }
     } else {
-        fprintf(stderr,"remote object '%s' not a file or directory\n", rpath);
+        fprintf(stderr,"'%s': No such file or directory\n", rpath);
         return 1;
     }
 }