Automatic OS detection and additional reformatting.

Added best-guess automatic OS detection to GNUmakefile.

Made a few minor textual changes and typo corrections,
and additional adjustments newline and whitespace fixes.

Author: johnsonjh

CHANGELOG

@@ -1,4 +1,3 @@
-
 CHANGELOG:
 ==========
 
@@ -702,3 +701,4 @@ CHANGELOG:
 
 2.0.5 20-January-1995
   Port to Linux.
+

COPYING-LGPL

@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

GNUmakefile

@@ -102,13 +102,17 @@ AR=ar
 RANLIB=ranlib
 INSTALL=install
 
+ifndef $(OS)
+ OS=$(shell uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]' 2>/dev/null || true)
+endif
+
 # dynamic dependencies
 DUMA_DYN_DEPS=$(DUMASO) tstheap_so$(EXEPOSTFIX) dumatestpp_so$(EXEPOSTFIX)
 
-# some OS specific:
-
+# some OS specifics:
 ifeq ($(OS), Windows_NT)
   ifeq ($(OSTYPE), msys)
+	$(info using settings for OS=Windows_NT, OSTYPE=msys)
     # call mingw32-make OSTYPE=msys
     # from Windows command prompt
     # having added the PATH for MINGW/bin
@@ -129,6 +133,7 @@ ifeq ($(OS), Windows_NT)
     EXEPOSTFIX=.exe
   endif
   ifeq ($(OSTYPE), msys-sh)
+	$(info using settings for OS=Windows_NT, OSTYPE=msys-sh)
     # call mingw32-make OSTYPE=msyssh
     # from MSYS shell
     # having added the PATH for MINGW/bin
@@ -151,6 +156,7 @@ ifeq ($(OS), Windows_NT)
     EXEPOSTFIX=.exe
   endif
   ifeq ($(OSTYPE), cygwin)
+	$(info using settings for OS=Windows_NT, OSTYPE=cygwin)
     # call make OSTYPE=cygwin
     BSWITCH=103
     DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
@@ -163,6 +169,7 @@ ifeq ($(OS), Windows_NT)
     EXEPOSTFIX=.exe
   endif
   ifndef BSWITCH
+	$(info using settings for OS=Windows_NT)
     BSWITCH=100
     DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
     CURPATH=./
@@ -176,6 +183,7 @@ ifeq ($(OS), Windows_NT)
 endif
 
 ifeq ($(OS), osx)
+  $(info using settings for OS=osx)
   # tested on darwin 8.0, which is the base for mac-osx
   # call: make OS=osx
   BSWITCH=210
@@ -193,6 +201,7 @@ ifeq ($(OS), osx)
 endif
 
 ifeq ($(OS), freebsd)
+  $(info using settings for OS=freebsd)
   BSWITCH=310
   DUMA_OPTIONS += -DDUMA_NO_THREAD_SAFETY
   DUMA_OPTIONS += -DDUMA_EXPLICIT_INIT
@@ -206,7 +215,8 @@ ifeq ($(OS), freebsd)
   EXEPOSTFIX=
 endif
 
-ifeq ($(OS), netbsd)
+ifeq ($(OS), netbsd) 
+  $(info using settings for OS=netbsd)
   BSWITCH=320
   CURPATH=./
   DUMASO=libduma.so.0.0.0
@@ -219,6 +229,7 @@ ifeq ($(OS), netbsd)
 endif
 
 ifeq ($(OS), solaris)
+  $(info using settings for OS=solaris)
   BSWITCH=410
   DUMA_OPTIONS += -DDUMA_NO_STRERROR
   CURPATH=./
@@ -235,6 +246,7 @@ ifeq ($(OS), solaris)
 endif
 
 ifeq ($(OS), linux)
+  $(info using settings for OS=linux)
   # Linux with GNU compiler and tools.
   CC=gcc
   CXX=g++
@@ -356,6 +368,8 @@ endif
 	@ $(ECHOLF)
 	@ $(ECHO) "DUMA dynamic confidence test PASSED."
 	@ $(ECHOLF)
+	@ $(ECHO) "You may now run make install and then installcheck"
+	@ $(ECHOLF)
 endif
 
 # Perform installation tests (if any).
@@ -502,7 +516,7 @@ libduma.a: duma_config.h verinfo.h $(OBJECTS)
 
 verinfo.h: FORCE
 	- $(CURPATH)make_git_source_version.sh > $(CURPATH)verinfo.h
-	$(shell touch verinfo.h)
+	$(shell touch verinfo.h || true)
 
 duma_config.h: 
 	$(MAKE) reconfig

INSTALL

@@ -1,4 +1,3 @@
-
 This documents describes if and how the library is installed on your system.
 
 I. Linux/Unix environments (including Cygwin and MinGW):
@@ -18,15 +17,16 @@ I. Linux/Unix environments (including Cygwin and MinGW):
   Add option 'OS=freebsd' when calling make for FreeBSD.
   Add option 'OS=netbsd' when calling make for NetBSD.
   Add option 'OS=solaris' when calling make for Solaris.
+  Add option 'OS=linux' when calling make for Linux.
 
-  Get system user with 'su', if you are going to install into
-    system directories
+  Get system user with 'su' or 'sudo', if you are going
+  to install into system directories
 
-  Call 'gmake install' for installation in system directories.
+  Call 'make' or 'gmake install' to install into system directories.
 
   Note: You need not install DUMA. Setting system PATH for duma.sh
     or INCLUDE/LIBS variables after compilation may suffice, too.
-    The (outdated) manual page needs installation.
+    The (outdated) manual page should be installed as well.
 
 
 II. Windows 2000/XP, Visual Studio Environments:

LICENSE

@@ -842,5 +842,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

README.txt

@@ -1,4 +1,3 @@
-
 Title: README
 
 D.U.M.A. - Detect Unintended Memory Access - A Red-Zone memory allocator:
@@ -7,9 +6,11 @@ D.U.M.A. - Detect Unintended Memory Access - A Red-Zone memory allocator:
 DESCRIPTION:
 
 
-DUMA helps you detect two common programming bugs:
-software that overruns the boundaries of a malloc() memory allocation, and
-software that touches a memory allocation that has been released by free().
+DUMA helps you detect two of the most common programming errors:
+
+1. software that overruns the boundaries of a malloc() memory allocation,
+2. software that touches memory allocations already released by free().
+
 Unlike other malloc() debuggers, DUMA will detect read accesses as well as
 writes, and it will pinpoint the exact instruction that causes an error.
 It has been in use at Pixar since 1987, and at many other sites for years.

TODO

@@ -1,4 +1,3 @@
-
 TODO items (listed by general priority):
 ========================================
 

WIN32_DETOURS_HOWTO.txt

@@ -1,4 +1,3 @@
-
 Title: Win32 Detours Howto
 
 It is now possible to use detours with duma on already compiled binaries.

createconf.c

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  *

createconf_new.cpp

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  *

duma.c

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2006 Michael Eddington <[email protected]>

duma.h

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2006 Michael Eddington <[email protected]>
@@ -350,6 +349,4 @@
   #define CA_REF(NAME,INDEX) \
 	NAME[ DUMA_ASSERT( (NAME ## _checkedidx = (INDEX)) < NAME ## _checkedsize ), NAME ## _checkedidx ]
 
-
-
-#endif /* end ifdef DUMA_NO_DUMA */
+#endif /* end ifdef DUMA_NO_DUMA */

duma_hlp.h

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2009 Hayati Ayguen <[email protected]>, Procitec GmbH

duma_sem.h

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2005 Hayati Ayguen <[email protected]>, Procitec GmbH

dumapp.cpp

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2009 Hayati Ayguen <[email protected]>, Procitec GmbH

dumapp.h

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2008 Hayati Ayguen <[email protected]>, Procitec GmbH
@@ -214,5 +213,4 @@
 
 #endif /* end ifdef DUMA_NO_CPP_SUPPORT */
 
-
-#include "duma.h"
+#include "duma.h"

paging.h

@@ -1,4 +1,3 @@
-
 /* Title: paging.h */
 
 /*
@@ -403,5 +402,4 @@ Page_Size(void)
 #endif
 }
 
-
 #endif /* DUMA_PAGING_H */

print.c

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2006 Michael Eddington <[email protected]>

print.h

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2008 Hayati Ayguen <[email protected]>, Procitec GmbH

sem_inc.c

@@ -1,4 +1,3 @@
-
 /*
  * DUMA - Red-Zone memory allocator.
  * Copyright (C) 2002-2008 Hayati Ayguen <[email protected]>, Procitec GmbH