Fix integer overflow in ap_pregsub. This can be triggered e.g.

[apache] / support / NWGNUhtcacheclean

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index aa9e6ea852b9d636ce5a90bcbd3886d0a0af0772..f81352781def41b151166440d43f16be1febf8fa 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
+include $(AP_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -16,10 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(NWOS) \
+                       $(STDMOD)/cache \
                        $(APR)/include \
                        $(APRUTIL)/include \
+                       $(AP_WORK)/include \
                        $(APR)/misc/netware \
+                       $(NWOS) \
                        $(EOLIST)
 
 #
@@ -55,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -91,7 +93,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = htcacheclean
+NLM_NAME       = htcacheclean
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,9 +115,9 @@ NLM_SCREEN_NAME = DEFAULT
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -126,12 +128,12 @@ NLM_STACK_SIZE    = 8192
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM  = _LibCPrelude
+NLM_ENTRY_SYM  =
 
 #
 # If this is specified it will be used by the link '-exit' directive
 #
-NLM_EXIT_SYM   = _LibCPostlude
+NLM_EXIT_SYM   =
 
 #
 # If this is specified it will be used by the link '-check' directive
@@ -141,14 +143,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      =
 
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA                = 
 
 #
 # If there is an NLM target, put it here
@@ -176,7 +178,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       $(PRELUDE) \
        $(EOLIST)
 
 #
@@ -207,7 +209,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
+       @aprlib.imp \
        @libc.imp \
        $(EOLIST)
  
@@ -216,13 +218,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -234,7 +236,7 @@ nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -247,5 +249,5 @@ install :: nlms FORCE
 # in this makefile
 #
 
-include $(AP_WORK)\build\NWGNUtail.inc
+include $(APBUILD)/NWGNUtail.inc