Changeset 1005

Timestamp:

May 6, 2008, 5:07:07 AM (18 years ago)

Author:

Steven Levine

Message:

Add baseline fortify support

Location:

trunk/dll

Files:

• fortify.c (added)
• makefile (modified) (5 diffs)
• ufortify.h (added)
• wrappers.c (modified) (2 diffs)

trunk/dll/makefile

@@ -38 +38 @@
 # 22 Feb 08 JBS Suppress lxlite processing when DEBUG=1
 # 01 Mar 08 SHL Add missing dependencies.  Add WARNALL support
+# 05 May 08 SHL Add FORTIFY support
 
 # Environment:
@@ -43 +44 @@
 # DEBUG - not defined = release build, defined = debug build
 # WARNALL - add more warnings if defined
+# FORTIFY - build with FORTIFYed memory
 
 BASE = fm3dll
@@ -79 +81 @@
 !ifdef %WARNALL                 # if defined in environment
 WARNALL = $(%WARNALL)           # use value from environment
+!endif
+
+!ifdef %FORTIFY                 # if defined in environment
+FORTIFY = $(%FORTIFY)           # use value from environment
 !endif
 
@@ -120 +126 @@
 !endif
 
+!ifdef FORTIFY
+CFLAGS += -dFORTIFY
+!endif
+
 # for fm3res only
 CFLAGSR = -bt=os2 -mf -bd -bm         -olirs -s     -j -we -wx -zfp -zgp -zp4 -zq
@@ -155 +165 @@
        dirs.obj dirsize.obj draglist.obj droplist.obj eas.obj errutil.obj &
        extract.obj filldir.obj filter.obj findrec.obj flesh.obj fm2cmd.obj &
-       fonts.obj fsopen.obj getnames.obj grep.obj grep2.obj info.obj inis.obj &
+       fonts.obj fortify.obj fsopen.obj &
+       getnames.obj grep.obj grep2.obj info.obj inis.obj &
        init.obj input.obj instant.obj key.obj killproc.obj literal.obj &
        loadbmp.obj mainwnd.obj mainwnd2.obj makelist.obj menu.obj misc.obj &

trunk/dll/wrappers.c

@@ -14 +14 @@
   01 Sep 07 GKY Add xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
   06 Oct 07 SHL Add xDos...() wrappers to support systems wo/large file support (Gregg, Steven)
+  05 May 08 SHL Add Add FORTIFY support
 
 ***********************************************************************/
@@ -31 +32 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+
+#include "fortify.h"                    // GetPString
 
 static PSZ pszSrcFile = __FILE__;