Changeset 1306 for trunk/dll/arccnrs.c

Timestamp:

Nov 30, 2008, 8:23:56 PM (17 years ago)

Author:

Gregg Young

Message:

Added option to use subdirectory based on the archive name for extraction from the arc container; it is set in the notebook and separate from the extract dialog setting; includes help file update, comments and cleanup (Ticket 22)

File:

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

trunk/dll/arccnrs.c

@@ -64 +64 @@
   29 Nov 08 GKY Add flag to tell CheckListProc file is in an archive so it won't try to open it.
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
+  30 Nov 08 GKY Add the option of creating a subdirectory from the arcname
+                for the extract path to arc container.
 
 ***********************************************************************/
@@ -158 +160 @@
 CHAR ArcTempRoot[CCHMAXPATH];
 BOOL fArcStuffVisible;
+BOOL fFileNameCnrPath;
 
 #pragma data_seg(GLOBAL2)
@@ -1818 +1821 @@
 
               for (x = 0; li->list[x]; x++) {
-                BldFullPathName(fullname, li->targetpath, li->list[x]);
+                BldFullPathName(fullname, li->targetpath, li->list[x]);
+                //Check if file already exists on disk warn if it does.
                 if (IsFile(fullname) != -1) {
                   AddToList(li->list[x], &exfiles, &numfiles, &numalloc);
@@ -1850 +1854 @@
                 else if (ckl.list)
                   li->list = CombineLists(li->list, ckl.list);
-              }
+              } // end check and warn
             }
             if (!li->list || !li->list[0])
@@ -3714 +3718 @@
           else
             strcpy(dcd->directory, extractpath);
-        }
+        }
+        if (!*dcd->directory && fFileNameCnrPath && dcd->arcname) {
+
+          strcpy(fullname, dcd->arcname);
+          p = strrchr(fullname, '.');
+          if (p)
+           *p = 0;
+          else {
+            p = fullname + strlen(dcd->arcname);
+            p--;
+            *p = 0;
+          }
+          strcpy(dcd->directory, fullname);
+        }
         if (!*dcd->directory && *lastextractpath) {
           //DosEnterCritSec();  //GKY 11-29-08