Changeset 1625

Timestamp:

Aug 26, 2011, 11:36:20 PM (14 years ago)

Author:

Gregg Young

Message:

Fix arc container view for .tar.gz files when using tar 1.15+ as the archiver. Ticket 473

Location:

trunk

Files:

• archiver.tmp (modified) (2 diffs)
• dll/arccnrs.c (modified) (2 diffs)
• dll/avl.c (modified) (5 diffs)

trunk/archiver.tmp

@@ -64 +64 @@
 ;98-02-31 23:55:32      yy-mm-dd hh:mm:ss       4
 ;31-02-98  23:55        dd-mm-yy hh:mm          5
+;Aug 21 23:55 2011      mm-dd-yyyy hh:mm:ss     6 Fixes tar.gz date/time formatting when using tar 1..15+
 
 ; Dash (-) and slash (/) separators are both supported.
@@ -314 +315 @@
 2
 -1
-3,0
+3,6
 4
 7,1,0,0

trunk/dll/arccnrs.c

@@ -845 +845 @@
                 pai->cbComp = atol(nsize);
               if (info->datetype && fdate && *fdate)
-                ArcDateTime(fdate, info->datetype, &pai->date, &pai->time);
+                ArcDateTime(fdate, info->datetype, &pai->date, &pai->time);
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -2316 +2316 @@
       // Display parsed date/time columns if type specified
       AdjustCnrColVis(hwnd,
-                      GetPString(IDS_TIMECOLTEXT),
-                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
+                      GetPString(IDS_TIMECOLTEXT),
+                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
       AdjustCnrColVis(hwnd,
-                      GetPString(IDS_DATECOLTEXT),
-                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
+                      GetPString(IDS_DATECOLTEXT),
+                      dcd->info->fdpos != -1 && dcd->info->datetype, FALSE);
       WinSendMsg(hwnd, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
     }

trunk/dll/avl.c

@@ -41 +41 @@
   21 Nov 10 GKY Check if archiver.bb2 has been changed on disk before editing
   13 Aug 11 GKY Change to Doxygen comment format
+  26 Aug 11 GKY Add the code to correctly format the date time strings for tar.gz archives
+                viewed using tar 1.15+
 
 ***********************************************************************/
@@ -1126 +1128 @@
  *  96-02-08 23:55:32            4
  *  31-02-98  23:55              5
+ *  Aug 21 23:55 2011            6 Fixes tar.gz date/time formatting when using tar 1..15+
  */
 
@@ -1189 +1192 @@
           }
           if (x < 12) {
-            cdate->month = x;
+            cdate->month = x + 1;
             p = strchr(p, ' ');
             if (p) {
@@ -1230 +1233 @@
           }
           if (x < 12) {
-            cdate->month = x;
+            cdate->month = x + 1;
             p = strchr(p, ' ');
             if (p) {
@@ -1341 +1344 @@
           }
         }
-        break;
-
+        break;
+      case 6:
+        for (x = 0; x < 12; x++) {
+            if (!strnicmp(p, GetPString(IDS_JANUARY + x), 3))
+              break;
+          }
+          if (x < 12) {
+            cdate->month = x + 1;
+            p = strchr(p, ' ');
+            if (p) {
+              p++;
+              cdate->day = atoi(p);
+              p = strchr(p, ' ');
+              if (p) {
+                p++;
+                ctime->hours = atoi(p);
+                p = to_delim(pd, ":.");
+                if (p) {
+                  p++;
+                  ctime->minutes = atoi(p);
+                  p = to_delim(pd, ":.");
+                  p = strchr(p, ' ');
+                  if (p) {
+                    p++;
+                    cdate->year = atoi(p);
+                    if (cdate->year > 80 && cdate->year < 1900)
+                      cdate->year += 1900;
+                    else if (cdate->year < 1900)
+                      cdate->year += 2000;
+                    ret = TRUE;
+                  }
+                }
+              }
+            }
+          }
+        break;
       default:
         break;