Commit: 7160fb807d19f73e7f2432beacf9d19218a7e950 - ogatool (git)

oga's tools

Commit MetaInfo

• Revision: 7160fb807d19f73e7f2432beacf9d19218a7e950 (tree)
• Zeit: 2014-06-08 06:52:09
• Autor: oga <hyperoga@gmai...>
• Commiter: oga

Log Message

Merge branch 'master' of git.pf.sourceforge.jp:/gitroot/h/hy/hyperoga/ogatool

Ändern Zusammenfassung

• modified: dsync.c

Diff

--- a/dsync.c
+++ b/dsync.c
@@ -24,6 +24,7 @@
  *    V1.19 11/12/06  change default r/w buffer size for perf and support -b
  *    V1.20 11/12/09  support -ca compare all file for -t(test mode)
  *    V1.21 14/01/15  support -nr
+ *    V1.22 14/05/31  change file compare method
  *
  *  Known Bug
  *    07/04/31 Long UNC(upper 256) => app error  (WinNT stat() unsupport?)
@@ -54,7 +55,7 @@
 #include <utime.h>
 #endif  /* _WIN32 */
 
-#define VER "1.21"
+#define VER "1.22"
 
 #define	dprintf   if (vf) printf
 #define	dprintf2  if (vf >= 2) printf
@@ -677,6 +678,8 @@ int DirCheckDelete(char *d1, char *d2)
  *  IN  : fname1, fname2  compare files
  *  OUT : ret 0: same file
  *            1: different file
+ *            2: fname1(src) not exist
+ *            3: fname2(dst) not exist
  *
  */
 int Cmp(char *fname1, char *fname2)
@@ -691,12 +694,12 @@ int Cmp(char *fname1, char *fname2)
 
     if (!(fp1 = fopen(fname1,"rb"))) {
 	if (errno != ENOENT) perror(fname1);
-	return 1;
+	return 2;
     }
     if (!(fp2 = fopen(fname2,"rb"))) {
 	if (errno != ENOENT) perror(fname2);
 	fclose(fp1);
-	return 1;
+	return 3;
     }
     while (1) {
         c1 = getc(fp1);
@@ -746,6 +749,7 @@ int DirCopy(char *d1, char *d2)
     char          buf[2048];
     char          wkd1[512],wkd2[512];
     time_t	  time1,time2;
+    int           cmp;                             /* V1.22-A */
 
     dprintf2("## dir1=[%s], dir2=[%s]\n",d1,d2);
 
@@ -856,11 +860,17 @@ int DirCopy(char *d1, char *d2)
 
 		    /* V1.18-A V1.20-C start */
 		    if (cf || caf) {
-		        if (!Cmp(wkd1, wkd2)) {
-	                    strcpy(wkmsg, " (same)\n");
-		        } else {
-	                    strcpy(wkmsg, " (different)\n");  /* V1.20-A */
-			}
+		        cmp = Cmp(wkd1, wkd2);                 /* V1.22-A */
+		        if (cmp == 0) {                        /* V1.22-C */
+		            /* コピー対象のものはsameでも表示する */
+		            strcpy(wkmsg, " (same)");
+		        } else if (cmp == 1) {                 /* V1.22-A */
+		            strcpy(wkmsg, " (different)");     /* V1.20-A */
+		        } else if (cmp == 2) {                 /* V1.22-A */
+		            strcpy(wkmsg, " (src not exist)"); /* V1.20-A */
+		        } else if (cmp == 3) {                 /* V1.22-A */
+		            strcpy(wkmsg, " (dst not exist)"); /* V1.20-A */
+		        }
 		    }
 	            fprintf(logfp, "## TEST: Copy %s to %s%s\n", wkd1, wkd2, wkmsg);
 		    /* V1.18-A V1.20-C end   */
@@ -873,9 +883,16 @@ int DirCopy(char *d1, char *d2)
 	        fprintf(logfp, "## %s copy skipped.\n", wkd1);
 	    }
 	} else if (tf && caf && (stbuf.st_mode & S_IFREG)) {
-	    if (Cmp(wkd1, wkd2)) {
-	        fprintf(logfp, "## TEST: %s and %s is different.\n", wkd1, wkd2);  /* V1.20-A */
+	    if (cmp = Cmp(wkd1, wkd2)) {                                               /* V1.22-C */
+	        if (cmp == 2) {                                                        /* V1.22-C */
+	            fprintf(logfp, "## TEST: %s does not exist.\n", wkd1);             /* V1.22-C */
+	        } else if (cmp == 3) {                                                 /* V1.22-C */
+	            fprintf(logfp, "## TEST: %s does not exist.\n", wkd2);
+	        } else {                                                               /* V1.22-C */
+	            fprintf(logfp, "## TEST: %s and %s is different.\n", wkd1, wkd2);  /* V1.20-A */
+	        }                                                                      /* V1.22-C */
 	    } else {
+	        /* ファイルが同じ場合は-vの場合のみ出力する */
 	        if (vf) fprintf(logfp, "## TEST: %s and %s is same.\n", wkd1, wkd2);  /* V1.20-A */
 	    }
 	}