Changeset 1556

Timestamp:

Nov 22, 2010, 12:17:01 AM (15 years ago)

Author:

Gregg Young

Message:

Check if archiver.bb2 has been changed on disk before editing (ticket 441)

Location:

trunk/dll

Files:

• avl.c (modified) (4 diffs)
• fm3res.rc (modified) (1 diff)
• fm3str.h (modified) (1 diff)

trunk/dll/avl.c

@@ -46 +46 @@
 #include <ctype.h>
 #include <share.h>
+#include <sys/stat.h>
 
 #define INCL_DOS
@@ -86 +87 @@
 BOOL arcsigsloaded;
 BOOL arcsigsmodified;
+static struct stat Archiverbb2Stats;
 
 #define ARCHIVER_LINE_BYTES     256
@@ -378 +380 @@
     return -1;
   }
+  stat(psz, &Archiverbb2Stats);
   fp = xfsopen(psz, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
   DosReleaseMutexSem(hmtxFM2Globals);
@@ -783 +786 @@
     if (!arcsigsloaded)
       load_archivers();
+    else {
+      struct stat Buffer;
+
+      stat(searchpath(PCSZ_ARCHIVERBB2), &Buffer);
+      if (Archiverbb2Stats.st_size != Buffer.st_size ||
+          Archiverbb2Stats.st_mtime != Buffer.st_mtime)        
+        if (saymsg(MB_YESNO,                                   
+                   hwnd,
+                   GetPString(IDS_ADCHANGESONDISKTEXT),
+                   GetPString(IDS_ADRELOADMEMTEXT)) == MBID_YES)
+          load_archivers();
+    }
     if (!(ARC_TYPE **) mp2) {
       Runtime_Error(pszSrcFile, __LINE__, NULL);

trunk/dll/fm3res.rc

@@ -2857 +2857 @@
     IDS_ADSTARTLISTTEXT                   "The string that comes before files in a listing."
     IDS_ADENDLISTTEXT                     "The string that comes after files in a listing."
+    IDS_ADCHANGESONDISKTEXT               "Archiverbb2 has changed on disk" 
+    IDS_ADRELOADMEMTEXT                   "Do you wish to reload it"
     IDS_ADCHANGESINMEMTEXT                "Changes recorded in memory."
     IDS_ADREWRITETEXT                     "Rewrite ARCHIVER.BB2 file?%s"

trunk/dll/fm3str.h

@@ -611 +611 @@
 #define IDS_BLURB1TEXT                                        591 // Other font test strings removed 11 Jan 09 GKY move to StrinTable
 #define IDS_COPYRIGHT                                         592
+#define IDS_ADCHANGESONDISKTEXT                               593
+#define IDS_ADRELOADMEMTEXT                                   594
 #define IDS_ITALICTEXT                                        605
 #define IDS_OUTLINETEXT                                       606