Changeset 1089

Timestamp:

07/21/08 00:42:39 (6 weeks ago)

Author:

gyoung

Message:

Delete orphaned tmp directories without deleting another active session's temp directory

Location:

trunk/dll

Files:

• fm3dll.h (modified) (1 diff)
• init.c (modified) (3 diffs)

trunk/dll/fm3dll.h

@@ -941 +941 @@
 /* killproc.c */
 MRESULT EXPENTRY KillDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+CHAR *GetDosPgmName(PID pid, CHAR * string);
+
 
 /* sysinfo.c */

trunk/dll/init.c

@@ -53 +53 @@
   19 Jul 08 GKY Use pFM2SaveDirectory, MakeTempName and move temp files to TMP subdirectory if (TMP).
   20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
+  20 Jul 08 GKY Add support to delete orphaned tmp directories without deleting tmp of other
+                running sessions
 
 ***********************************************************************/
@@ -523 +525 @@
     strcat(s, "\\");
   enddir = &s[strlen(s)];
-  strcat(s, "$FM2LI$T");
+  strcat(s, "$FM2LI$T.");
   strcat(s, "???");
   search_handle = HDIR_CREATE;
@@ -666 +668 @@
     rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
     if (!rc) {
+      CHAR *enddir, *p, szTempName[CCHMAXPATH], temp[CCHMAXPATH];
+      FILEFINDBUF3 ffb;
+      HDIR search_handle;
+      ULONG num_matches, ul;
+
+      strcpy(szTempName, env);
+      if (szTempName[strlen(szTempName) - 1] != '\\')
+        strcat(szTempName, "\\");
+      enddir = &szTempName[strlen(szTempName)];
+      strcat(szTempName, "$FM2????.");
+      strcat(szTempName, "???");
+      search_handle = HDIR_CREATE;
+      num_matches = 1;
+      if (!DosFindFirst(szTempName,
+                        &search_handle,
+                        FILE_NORMAL | FILE_DIRECTORY |
+                        FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                        FILE_ARCHIVED,
+                        &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
+        do {
+          strcpy(enddir, ffb.achName);
+          p = strrchr(szTempName, '.');
+          if (p) {
+            p++;
+            ul = strtol(p, &p + 2, 16);
+            GetDosPgmName(ul, temp);
+            if (!strstr(temp, "FM/2") &&
+                !strstr(temp, "AV/2")) {
+              wipeallf("%s\\*", szTempName);
+              DosDeleteDir(szTempName);
+            }
+          }
+        }
+      while (!DosFindNext(search_handle,
+                          &ffb, sizeof(ffb), &num_matches));
+      DosFindClose(search_handle);
+    }
       if (fs3.attrFile & FILE_DIRECTORY) {
-        CHAR szTempName[CCHMAXPATH];
         APIRET ret = 0;
-        // 17 Jul 08 SHL fixme to check writable someday
         strcpy(szTempName, env);
-        //if (szTempName[strlen(szTempName) - 1] != '\\')
-        //  strcat(szTempName, "\\");
         MakeTempName(szTempName, NULL, 1);
         ret = DosCreateDir(szTempName, 0);
-        if (!ret) {
+        if (!ret) {   //check writable
           pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);
-        }
+        } //fixme to check freespace > 5 MB
       }
     }