Changeset 897 for trunk/dll/seeall.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/seeall.c (modified) (8 diffs)

trunk/dll/seeall.c

@@ -31 +31 @@
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
   27 Sep 07 SHL Correct ULONGLONG size formatting
+  30 Dec 07 GKY Use CommaFmtULL
+  30 Dec 07 GKY Use TestFDates for comparing by date
 
 ***********************************************************************/
@@ -1572 +1574 @@
   int ret;
 
-  ret = (d1->date.year > d2->date.year) ? 1 :
+  ret = TestFDates(NULL, NULL,
+                  &d2->date, &d2->time,
+                  &d1->date, &d1->time);
+    /*(d1->date.year > d2->date.year) ? 1 :
     (d1->date.year < d2->date.year) ? -1 :
     (d1->date.month > d2->date.month) ? 1 :
@@ -1583 +1588 @@
     (d1->time.minutes < d2->time.minutes) ? -1 :
     (d1->time.twosecs > d2->time.twosecs) ? 1 :
-    (d1->time.twosecs < d2->time.twosecs) ? -1 : 0;
+    (d1->time.twosecs < d2->time.twosecs) ? -1 : 0;*/
 
   if (!ret)
@@ -2228 +2233 @@
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
   POINTL ptl;
-  CHAR szBuff[CCHMAXPATH + 80];
+  CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
   ULONG len, y;
 
@@ -2262 +2267 @@
                     standardcolors[Colors[COLORS_NORMALBACK]]);
   }
-  // 27 Sep 07 SHL fixme to use CommaFmtULL
+  CommaFmtULL(szCmmaFmtFileSize,
+              sizeof(szCmmaFmtFileSize), ad->afindex[y]->cbFile, ' ');
   len = sprintf(szBuff,
-                "%c%-*.*s  %-12llu  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
                 whichfile == ad->cursored - 1 ? '>' : ' ',
                 ad->fullnames ? ad->longestw : ad->longest,
@@ -2270 +2276 @@
                 ad->fullnames ? ad->afindex[y]->fullname :
                 ad->afindex[y]->filename,
-                ad->afindex[y]->cbFile,
+                szCmmaFmtFileSize,
                 "-A"[((ad->afindex[y]->attrFile & FILE_ARCHIVED) != 0)],
                 "-R"[((ad->afindex[y]->attrFile & FILE_READONLY) != 0)],
@@ -3345 +3351 @@
       register ULONG x;
       ULONG y, len, numlines;
-      CHAR szBuff[CCHMAXPATH + 80];
+      CHAR szBuff[CCHMAXPATH + 80], szCmmaFmtFileSize[81];
       BOOL inverted, hidsys, reado, wascursored;
 
@@ -3432 +3438 @@
                               standardcolors[Colors
                                              [COLORS_CURSOREDNORMALBACK]]);
-            // 27 Sep 07 SHL fixme to use CommaFmtULL
+            CommaFmtULL(szCmmaFmtFileSize,
+                        sizeof(szCmmaFmtFileSize), pAD->afindex[y]->cbFile, ' ');
             len =
               sprintf(szBuff,
-                      "%c%-*.*s  %-12llu  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
+                      "%c%-*.*s  %-12s  %c%c%c%c%c  %04u/%02u/%02u %02u:%02u:%02u ",
                       wascursored ? '>' : ' ',
                       pAD->fullnames ? pAD->longestw : pAD->longest,
                       pAD->fullnames ? pAD->longestw : pAD->longest,
                       (pAD->fullnames) ? pAD->afindex[y]->fullname : pAD->
-                      afindex[y]->filename, pAD->afindex[y]->cbFile,
+                      afindex[y]->filename, szCmmaFmtFileSize,
                       "-A"[((pAD->afindex[y]->attrFile & FILE_ARCHIVED) !=
                             0)],