Changeset 1077 for trunk/dll/init.c

Timestamp:

Jul 18, 2008, 8:11:54 PM (17 years ago)

Author:

Steven Levine

Message:

Enhance Fortify infrastructure
Add Fortify_SetOwner Fortify_ChangeOwner Fortify_ChangeScope
Add FORTIFY_VERBOSE_SCOPE_ENTER_EXIT support
Add more fm/2 Fortify tooling and rework existing tooling for correct nesting
Still lots to do for cross-thread allocations
Add misc.h
Add walkem.h

File:

• trunk/dll/init.c (modified) (7 diffs)

trunk/dll/init.c

@@ -44 +44 @@
   29 Feb 08 GKY Refactor global command line variables to notebook.h
   08 Mar 08 JBS Ticket 230: Replace prefixless INI keys for default directory containers with
-                keys using a "DirCnr." prefix
+                keys using a "DirCnr." prefix
   20 Apr 08 GKY Change default cmd line length to 1024 Ask once if user wants to reset it.
   11 Jul 08 JBS Ticket 230: Simplified code and eliminated some local variables by incorporating
-                all the details view settings (both the global variables and those in the
-                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+                all the details view settings (both the global variables and those in the
+                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
   16 JUL 08 GKY Use TMP directory for temp files
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
@@ -81 +81 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
-#include "notebook.h"                   // command line variables (editor etc)
+#include "notebook.h"                   // command line variables (editor etc)
 #include "fortify.h"
 
@@ -660 +660 @@
       if (fs3.attrFile & FILE_DIRECTORY) {
         // 17 Jul 08 SHL fixme to check writable someday
-        pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
+        pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
       }
     }
   }
-  BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
+  BldFullPathName(ArcTempRoot, pTmpDir, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
   /* initialize random number generator */
@@ -731 +731 @@
     else {
       if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
-        saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,
-               "Check INI header failed will attempt to replace with backup \\
-               if backup fails or not found will open with new ini");
-        DosCopy("FM3.INI", "FM3INI.BAD", DCPY_EXISTING);
-        DosCopy("FM3INI.BAK", "FM3.INI", DCPY_EXISTING);
-        if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
-          DosCopy("FM3.INI", "FM3INI2.BAD", DCPY_EXISTING);
-          fWantFirstTimeInit = TRUE;
-        }
+        saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,
+               "Check INI header failed will attempt to replace with backup \\
+               if backup fails or not found will open with new ini");
+        DosCopy("FM3.INI", "FM3INI.BAD", DCPY_EXISTING);
+        DosCopy("FM3INI.BAK", "FM3.INI", DCPY_EXISTING);
+        if (!CheckFileHeader(inipath, "\xff\xff\xff\xff\x14\x00\x00\x00", 0L)) {
+          DosCopy("FM3.INI", "FM3INI2.BAD", DCPY_EXISTING);
+          fWantFirstTimeInit = TRUE;
+        }
       }
       if (!fWantFirstTimeInit) {
-        fIniExisted = TRUE;
-        if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
-          fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM);
-          rc = xDosSetPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3), 0);
-          if (rc) {
-            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        GetPString(IDS_INIREADONLYTEXT), inipath);
-          }
-        }
+        fIniExisted = TRUE;
+        if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
+          fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM);
+          rc = xDosSetPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3), 0);
+          if (rc) {
+            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                        GetPString(IDS_INIREADONLYTEXT), inipath);
+          }
+        }
       }
     }
@@ -763 +763 @@
     if (!fmprof) {
       Win_Error(NULLHANDLE, NULLHANDLE, pszSrcFile, __LINE__,
-                "PrfOpenProfile");
+                "PrfOpenProfile");
       return FALSE;
     }
@@ -1019 +1019 @@
     if (!MaxComLineChecked) {
       ret = saymsg(MB_YESNO,
-                   HWND_DESKTOP,
-                   NullStr,
-                   GetPString(IDS_CHANGECMDLINELENGTHDEFAULT));
+                   HWND_DESKTOP,
+                   NullStr,
+                   GetPString(IDS_CHANGECMDLINELENGTHDEFAULT));
       if (ret == MBID_YES)
-        MaxComLineStrg = 1024;
+        MaxComLineStrg = 1024;
       MaxComLineChecked = TRUE;
       PrfWriteProfileData(fmprof, appname, "MaxComLineChecked", &MaxComLineChecked, sizeof(BOOL));
@@ -1525 +1525 @@
       if (!DosRead(handle, buffer, l, &len) && len == l) {
         if (!memcmp(signature, buffer, l))
-          ret = TRUE;                   // Matched
+          ret = TRUE;                   // Matched
       }
     }