Changeset 1306 for trunk/dll

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)

Location:

trunk/dll

Files:

• arccnrs.c (modified) (5 diffs)
• arccnrs.h (modified) (2 diffs)
• extract.c (modified) (1 diff)
• fm3dlg.h (modified) (2 diffs)
• fm3res.dlg (modified) (2 diffs)
• init.c (modified) (2 diffs)
• ipf/archive.ipf (modified) (3 diffs)
• ipf/hints.ipf (modified) (1 diff)
• ipf/notebook.ipf (modified) (1 diff)
• ipf/tutor.ipf (modified) (1 diff)
• notebook.c (modified) (3 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

trunk/dll/arccnrs.h

@@ -10 +10 @@
 
   05 Jan 08 SHL Move arccnrs.c definitions here
+  30 Nov 08 GKY Add the option of creating a subdirectory from the arcname
+                for the extract path to arc container.
 
 ***********************************************************************/
@@ -62 +64 @@
 extern CHAR lastextractpath[CCHMAXPATH];
 extern ULONGLONG ullDATFileSpaceNeeded;
+extern BOOL fFileNameCnrPath;
 
 #endif // ARCCNRS_H

trunk/dll/extract.c

@@ -319 +319 @@
           }
           if (!*arcdata->extractdir) {
-            if (*lastextractpath)
-              strcpy(arcdata->extractdir, lastextractpath);
-            else if (arcdata->arcname && *arcdata->arcname) {
+            if (arcdata->arcname && *arcdata->arcname) {
 
               CHAR *p;

trunk/dll/fm3dlg.h

@@ -23 +23 @@
   29 Nov 08 GKY Add the option of creating a subdirectory from the arcname
                 for the extract path.
+  30 Nov 08 GKY Add the option of creating a subdirectory from the arcname
+                for the extract path to arc container.
 
 ***********************************************************************/
@@ -715 +717 @@
 #define CFGA_VIRUS                                                                              25376
 #define CFGA_EXTRACTPATH                                                                25377
-#define CFGA_FIND                                                                                       25378
+#define CFGA_FIND                                                                               25378
+#define CFGA_FILENAMEPATH                                                               25379
 
 #define CFG5_FRAME                                                                              25500

trunk/dll/fm3res.dlg

@@ -39 +39 @@
   21 Nov 08 JBS Ticket 297: Added use of COPYRIGHT_YEAR in About dialog
   29 Nov 08 GKY Add the option of creating a subdirectory from the arcname
-                for the extract path to extract dialog.
+                for the extract path to extract dialog and arc container.
 
 ***********************************************************************/
@@ -1808 +1808 @@
         AUTOCHECKBOX    "Show archiver activity", CFGA_ARCSTUFFVISIBLE, 4,
                         74, 112, 10
+        AUTOCHECKBOX    "~Use archive name as extract path in container (Ext. Path over rides this setting)",
+                        CFGA_FILENAMEPATH, 4, 54, 312, 10
         LTEXT           "A/Virus:", -1, 4, 34, 48, 8
         ENTRYFIELD      "", CFGA_VIRUS, 54, 34, 196, 8, ES_MARGIN

trunk/dll/init.c

@@ -58 +58 @@
                 minimum size in future
   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.
 
 ***********************************************************************/
@@ -1490 +1492 @@
   size = sizeof(extractpath);
   PrfQueryProfileData(fmprof, appname, "ExtractPath", extractpath, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "FileNamePathCnr", &fFileNameCnrPath, &size);
   size = sizeof(printer);
   PrfQueryProfileData(fmprof, appname, "Printer", printer, &size);

trunk/dll/ipf/archive.ipf

@@ -27 +27 @@
 ones extracted earlier). :hp1.With Paths:ehp1. will extract the archive including the
 any directories in the archive structure. This can be made the default by checking the
-:hp1.Always Paths:ehp1. box. Refgardless of which method is the default you may
-select the other option on a one time basis without change the default for future archives.
+:hp1.Always Paths:ehp1. box. Regardless of which method is the default you may
+select the other option on a one time basis without changing the default for future archives.
 If you only wish to extract certain files you can select masks (i.e *.txt) for the files
 you wish to extract. The command line box allows you to change or add extraction options.
 See the help files for your archiver (e.g. zip.exe) for more information.
 You can select the extraction directory (the directory to which the files will be extracted.
-The default is the current directory or you can set a specific directory as the  on
-the Archiver page of the Setting Notebook. You can use the :hp1.Walk:ehp1. button
+The default is the current directory or you can set a specific directory as the default on
+the Archiver page of the Setting Notebook. You can set the :hp1.Filename as extract path :ehp1.
+to have FM/2 create an extract path based on the archive name.The path is made as a subdirectory
+to the directory the archive is in. You can use the :hp1.Walk:ehp1. button
 find the directory you wish to extract to or you can type a path directly into the listbox.
 If the path you type in doesn't exist FM/2 will offer to create it for you.
@@ -57 +59 @@
 files unless given a DOS filemask (for instance, to extract all files
 you need to enter *.* (not *) in the masks field). FM/2 normally gives
-:hp2.no:ehp2. filemasks as the argument when you want to extract
-everything, which every other archiver in the world understands.
+:hp2."*":ehp2. as the argument when you want to extract
+everything, which most other archiver in the world understand.
 :p.
 The ZIP/UNZIP programs are case sensitive even though OS/2 itself is
@@ -82 +84 @@
 FM/2 will ask you for the type of the archive by presenting you with a
 listbox from which to pick an archiver.
-After that, another dialog appears to let you modify how the archive
-will be created. Additional masks may be entered (remember that the ZIP
-and UNZIP programs are case sensitive), the archiver command line
+After that, another dialog appears to let you modify how the archive that
+will be created. Additional masks may be entered (remember that some versions
+of ZIP and UNZIP programs are case sensitive), the archiver command line
 tweaked, and so forth. Click :hp1.Okay:ehp1. to create the archive, or
 :hp1.Cancel:ehp1. if you change your mind.

trunk/dll/ipf/hints.ipf

@@ -87 +87 @@
 button. If you always want the extract directory to be the same as the
 directory in which the archive resides, enter * in the Ext. Path field
-of the internal Settings Notebook's :link reftype=hd res=99940.Archivers
-page:elink..
+of the internal Settings Notebook's or if you want FM/2 to create a subdirectory
+based on the archiver name leave Ext. Path blank and check the box Use archive
+name as extract path in container (Ext. Path over rides this setting)
+:link reftype=hd res=99940.Archivers page:elink..
 :p.
 You can drag files or directories onto an archive object in a Directory

trunk/dll/ipf/notebook.ipf

@@ -284 +284 @@
 to the foreground if you want to see them.
 :p.
+The :hp6.Use archive name as extract path in container:ehp6.allows
+you to have FM/2 create an extract path based on the archive name.
+The path is made as a subdirectory to the directory the archive
+is in. If a directory is listed in Ext. Path it over rides this setting.
+The setting only effects the arc container. The extract dialog has a
+separate setting for this function.
+:p.
 The :hp6.A/Virus:ehp6. field allow you to enter the command line
-(PATH/ANTIVIRUS&period.EXE parameters) for your antivirus software
+(PATH/ANTIVIRUS.EXE parameters) for your antivirus software
 This must be done to enable virus checking of archives from FM/2.
-NVCC&period.EXE &percent.p /C is one possible command line option
+NVCC.EXE &percent.p /C is one possible command line option
 if you are using Norman Antivirus.
 :p.

trunk/dll/ipf/tutor.ipf

@@ -439 +439 @@
 (make it the :hp1.current object:ehp1.), then select the :hp1.Extract:ehp1.
 command from the :hp1.Files:ehp1. menu, the context menu
-fc=default bc=cyan.B2:color fc=default bc=default., or press the :color fc=default bc=palegray.Ctrl:color fc=default bc=default.
+fc=default bc=cyan.B2:color fc=default bc=default., or press the
+:color fc=default bc=palegray.Ctrl:color fc=default bc=default.
  + :color fc=default bc=palegray.x:color fc=default bc=default. accelerator key.
 key.

trunk/dll/notebook.c

@@ -40 +40 @@
   31 Jul 08 JBS Ticket 114: Improved code to avoid traps.
   02 Aug 08 JBS Ticket 114: Improved code to avoid traps.
+  30 Nov 08 GKY Add the option of creating a subdirectory from the arcname
+                for the extract path to arc container.
 
 ***********************************************************************/
@@ -224 +226 @@
     WinCheckButton(hwnd, CFGA_QUICKARCFIND, fQuickArcFind);
     WinCheckButton(hwnd, CFGA_DEFARC, (*szDefArc != 0));
+    WinCheckButton(hwnd, CFGA_FILENAMEPATH, fFileNameCnrPath);
     WinSetDlgItemText(hwnd, CFGA_DEFARCNAME, szDefArc);
     WinSetDlgItemText(hwnd, CFGA_VIRUS, virus);
@@ -332 +335 @@
                         appname,
                         "ArcStuffVisible", &fArcStuffVisible, sizeof(BOOL));
+    fFileNameCnrPath = WinQueryButtonCheckstate(hwnd, CFGA_FILENAMEPATH);
+    PrfWriteProfileData(fmprof,
+                        appname,
+                        "FileNamePathCnr", &fFileNameCnrPath, sizeof(BOOL));
     fFolderAfterExtract = WinQueryButtonCheckstate(hwnd,
                                                    CFGA_FOLDERAFTEREXTRACT);