Changeset 1298 for trunk/dll/arccnrs.c

Timestamp:

Nov 23, 2008, 9:48:15 PM (17 years ago)

Author:

John Small

Message:

ARCCNRS.C: Support archivers with no Start or End of list strings (Ticket 284)

File:

• trunk/dll/arccnrs.c (modified) (9 diffs)

trunk/dll/arccnrs.c

@@ -61 +61 @@
   08 Nov 08 GKY Add WaitChildThread to fix hang caused by viewer trying to open a file before
                 the archiver process closes. (Ticket 58)
+  23 Nov 08 JBS Ticket 284: Support archivers with no Start or End of list strings
 
 ***********************************************************************/
@@ -552 +553 @@
   BOOL wasquote;
   BOOL nomove = FALSE;                  // fixme to be gone?
-  INT highest = 0, x, counter = 0, numarcfiles = 0;
+  INT highest = 0, fieldnum, counter = 0, numarcfiles = 0;
   PARCITEM lastpai;
   ARC_TYPE *info;
@@ -670 +671 @@
 
     if (fp) {
-      gotstart = !info->startlist || !*info->startlist; // If list has no start marker
+      gotstart = !info->startlist ||            // If list has no start marker
+                 !*info->startlist ||
+                 (stricmp(info->startlist, "*#* None *#*") == 0);
+//       gotend =   !info->endlist ||
+//                       !*info->endlist ||     // If list has no end marker
+//                       (stricmp(info->endlist, "*#* None *#*") == 0); 
 
       while (!feof(fp) && !gotend && !*pStopFlag) {
@@ -701 +707 @@
           osize = fdate = NullStr;
           p = s;
-          for (x = 0; x <= highest; x++) {
+          for (fieldnum = 0; fieldnum <= highest; fieldnum++) {
             pp = p;
             while (*pp && (*pp == ' ' || *pp == '\t'))  /* skip leading */
@@ -710 +716 @@
             p = pp;
             while (*p && (wasquote ||
-                          ((x != info->fnpos || !info->nameislast) ?
+                          ((fieldnum != info->fnpos || !info->nameislast) ?
                            (*p != ' ' && *p != '\t') : TRUE))) {
               if (*p == '\"') {
@@ -731 +737 @@
               p++;
             }
-            if (x == info->nsizepos)
+            if (fieldnum == info->nsizepos)
               nsize = pp;
-            else if (x == info->osizepos)
+            else if (fieldnum == info->osizepos)
               osize = pp;
-            else if (x == info->fdpos) {
+            else if (fieldnum == info->fdpos) {
               fdate = pp;
               if (info->fdflds > 1 && info->fdflds < 24) {
@@ -748 +754 @@
                     while (*p && (*p != ' ' && *p != '\t'))
                       p++;
-                    x++;
+                    fieldnum++;
                   }
                   if (*p) {
@@ -757 +763 @@
               }
             }
-            else if (x == info->fnpos) {
+            else if (fieldnum == info->fnpos) {
               fname = pp;
               if (pp && *pp == '*' && !*(pp + 1))       /* workaround for LH.EXE */
@@ -849 +855 @@
         numarcfiles = 0;                // Request close
       else if (!numarcfiles || !gotstart
-               || (!gotend && info->endlist && *info->endlist)) {
+               || (!gotend && info->endlist && *info->endlist && (stricmp(info->endlist, "*#* None *#*")))) {
         // Oops
         ARCDUMP ad;