Changeset 897 for trunk/dll/rename.c

Timestamp:

Dec 31, 2007, 12:34:00 AM (18 years ago)

Author:

Gregg Young

Message:

Use CommaFmtULL for additional file, EA etc sizes display; Modify/Create TestFDates & TestCDates for comparing/sorting files or CNRITEMS by date/time.

File:

• trunk/dll/rename.c (modified) (5 diffs)

trunk/dll/rename.c

@@ -12 +12 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   27 Sep 07 SHL Correct ULONGLONG size formatting
+  30 Dec 07 GKY Use TestFDates for comparing dates
 
 ***********************************************************************/
@@ -75 +76 @@
 
         FILESTATUS3L fs1, fs2;
-        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH];
+        CHAR s[CCHMAXPATH * 2], *p, chkname[CCHMAXPATH], szCmmaFmtFileSize[81];
         INT sourceexists = 0, targetexists = 0,
             sourcenewer = 0, sourcesmaller = 0;
@@ -90 +91 @@
           WinSetDlgItemText(hwnd, REN_SOURCE, mv->source);
         if (!DosQueryPathInfo(mv->source, FIL_STANDARDL, &fs1, sizeof(fs1))) {
-          // 27 Sep 07 SHL fixme to use CommaFmtULL
+          CommaFmtULL(szCmmaFmtFileSize,
+                      sizeof(szCmmaFmtFileSize), fs1.cbFile, ' ');
           sprintf(s,
-                  " %s%llu %ss %04u/%02u/%02u %02u:%02u:%02u",
+                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
                   fs1.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
-                  fs1.cbFile,
+                  szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
                   fs1.fdateLastWrite.year + 1980,
@@ -117 +119 @@
         }
         if (!DosQueryPathInfo(chkname, FIL_STANDARDL, &fs2, sizeof(fs2))) {
-          // 27 Sep 07 SHL fixme to use CommaFmtULL
+          CommaFmtULL(szCmmaFmtFileSize,
+                      sizeof(szCmmaFmtFileSize), fs2.cbFile, ' ');
           sprintf(s,
-                  " %s%llu %ss %04u/%02u/%02u %02u:%02u:%02u",
+                  " %s%s %ss %04u/%02u/%02u %02u:%02u:%02u",
                   fs2.attrFile & FILE_DIRECTORY ?
                     GetPString(IDS_DIRBRKTTEXT) : NullStr,
-                  fs2.cbFile,
+                  szCmmaFmtFileSize,
                   GetPString(IDS_BYTETEXT),
                   fs2.fdateLastWrite.year + 1980,
@@ -169 +172 @@
 
         if (targetexists == 1 && sourceexists == 1) {
-          sourcenewer =
-            (fs1.fdateLastWrite.year < fs2.fdateLastWrite.year) ? 1 :
-              (fs1.fdateLastWrite.year > fs2.fdateLastWrite.year) ? -1 :
-               (fs1.fdateLastWrite.month < fs2.fdateLastWrite.month) ? 1 :
-                 (fs1.fdateLastWrite.month > fs2.fdateLastWrite.month) ? -1 :
-                   (fs1.fdateLastWrite.day < fs2.fdateLastWrite.day) ? 1 :
-                     (fs1.fdateLastWrite.day > fs2.fdateLastWrite.day) ? -1 :
-                       (fs1.ftimeLastWrite.hours < fs2. ftimeLastWrite. hours) ? 1 :
-                         (fs1.ftimeLastWrite.hours > fs2.ftimeLastWrite.hours) ? -1 :
-                           (fs1.ftimeLastWrite.minutes < fs2.ftimeLastWrite.minutes) ? 1 :
-                             (fs1.ftimeLastWrite.minutes > fs2.ftimeLastWrite.minutes) ? -1 :
-                               (fs1.ftimeLastWrite.twosecs < fs2.ftimeLastWrite.twosecs) ? 1 :
-                                 (fs1.ftimeLastWrite.twosecs > fs2.ftimeLastWrite.twosecs) ? -1 : 0;
+          sourcenewer = TestFDates(NULL, NULL,
+                                   &fs1.fdateLastWrite, &fs1.ftimeLastWrite,
+                                   &fs2.fdateLastWrite, &fs2.ftimeLastWrite);
           sourcesmaller = (fs1.cbFile < fs2.cbFile) ? -1 :
-                          (fs1.cbFile > fs2.cbFile) ? 1 :
-                          0;
+                          (fs1.cbFile > fs2.cbFile) ? 1 : 0;
           sprintf(&s[strlen(s)], GetPString(IDS_SOURCEISTEXT),
                   (sourcenewer == -1) ? GetPString(IDS_NEWERTEXT) :