Changeset 1321 for trunk/dll/arccnrs.c

Timestamp:

Dec 7, 2008, 2:48:06 AM (17 years ago)

Author:

Steven Levine

Message:

Rework casts variable types for OpenWatcom 1.8 compatibility
Add more FORTIFY support

File:

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

trunk/dll/arccnrs.c

@@ -637 +637 @@
       fp = xfopen(arctemp, "w", pszSrcFile, __LINE__);
       if (!fp) {
-        xfree(arctemp, pszSrcFile, __LINE__);
-        return 0;
+        xfree(arctemp, pszSrcFile, __LINE__);
+        return 0;
       }
       else {
@@ -646 +646 @@
         if (rc) {
           Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
-                    "DosDupHandle");
-          xfree(arctemp, pszSrcFile, __LINE__);
+                    "DosDupHandle");
+          xfree(arctemp, pszSrcFile, __LINE__);
           return 0;
         }
@@ -657 +657 @@
             Dos_Error(MB_CANCEL, rc, hwndCnr, pszSrcFile, __LINE__,
                       "DosDupHandle");
-            xfree(arctemp, pszSrcFile, __LINE__);
-            return 0;
+            xfree(arctemp, pszSrcFile, __LINE__);
+            return 0;
           }
           else {
@@ -812 +812 @@
                 pai->flags = ARCFLAGS_REALDIR;
               pai->pszFileName = xstrdup(fname,pszSrcFile, __LINE__);
+#             ifdef FORTIFY
+              // Will be freed by WM_DESTROY
+              Fortify_SetOwner(pai->pszFileName, 1);
+              // Fortify_ChangeScope(pai->pszFileName, -1);
+#             endif
+
               pai->pszDisplayName = pai->pszFileName;
               pai->rc.pszIcon = pai->pszDisplayName;
@@ -1656 +1662 @@
 
       if (li && li->list && li->list[0]) {
-        printf("%x/r", li->type); fflush(stdout);
+        // printf("%x/r", li->type); fflush(stdout);    // 24 Sep 08 SHL
         switch (li->type) {
         case IDM_ARCHIVE:
@@ -3706 +3712 @@
       }
       else {
+#       ifdef FORTIFY
+        // Will be freed by WM_DESTROY
+        Fortify_ChangeScope(dcd, -1);
+#       endif
         dcd->size = sizeof(DIRCNRDATA);
         dcd->id = id;
         dcd->type = ARC_FRAME;
         if (!pTmpDir)
-          strcpy(dcd->workdir, pFM2SaveDirectory);
-        MakeTempName(dcd->workdir, ArcTempRoot, 2);
-          /*if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
+          strcpy(dcd->workdir, pFM2SaveDirectory);
+        MakeTempName(dcd->workdir, ArcTempRoot, 2);
+#if 0 // 06 Sep 08 SHL fixme to be gone
+        if (dcd->workdir[strlen(dcd->workdir) - 1] != '\\')
             strcat(dcd->workdir, "\\");
           sprintf(dcd->workdir + strlen(dcd->workdir), "%s.%03x",
@@ -3718 +3729 @@
         else
           sprintf(dcd->workdir, "%s.%03x",
-                  ArcTempRoot, (clock() & 4095));*/
+                  ArcTempRoot, (clock() & 4095));
+#endif // 06 Sep 08 SHL fixme to be gone
         strcpy(dcd->arcname, fullname);
         if (*extractpath) {