Snapshot adjustments to aug 9 2011 demo.

Needs testing and adjusting. Exploits need to be adjusted for dynamic linking case.

.gitattributes

@@ -2,6 +2,7 @@
 /Makefile -text
 chopzero_src/Makefile -text
 chopzero_src/chopzero.c -text
+demos/Makefile -text
 demos/demo.aug_9_2011/Makefile -text
 demos/demo.aug_9_2011/dumbledore.c -text
 demos/demo.aug_9_2011/dumbledore.exploits/Makefile -text

Makefile

@@ -6,4 +6,5 @@ all:
 clean:
 	cd chopzero_src; make clean
 	cd examples; make clean
+    cd demos; make clean
 	

demos/Makefile

+clean:
+	cd demo.jan_21_2011; make clean
+	cd demo.aug_9_2011; make clean

demos/demo.aug_9_2011/Makefile

@@ -3,18 +3,18 @@ TOOLBASE=${PEASOUP_HOME}/tools
 all: dumbledore.original dumbledore.protected heap_overflow.original heap_overflow.protected
 
 heap_overflow.original: heap_overflow.o
-	${TOOLBASE}/ps_link.sh heap_overflow.o -o heap_overflow.original
+	gcc -g heap_overflow.o -o heap_overflow.original
 
 heap_overflow.protected: heap_overflow.original
-	${TOOLBASE}/ps_analyze.sh heap_overflow.original heap_overflow.protected
-	echo "Note: this step will end in an error for now, but that's OK"
+    # assume IDA Pro 6.0
+	TVHEADLESS=1 ${TOOLBASE}/ps_analyze.sh heap_overflow.original heap_overflow.protected
 
 dumbledore.original: dumbledore.o
-	${TOOLBASE}/ps_link.sh dumbledore.o -o dumbledore.original
+	gcc -g dumbledore.o -o dumbledore.original
 
 dumbledore.protected: dumbledore.original
-	${TOOLBASE}/ps_analyze.sh dumbledore.original dumbledore.protected
-	echo "Note: this step will end in an error for now, but that's OK"
+    # assume IDA Pro 6.0
+	TVHEADLESS=1 ${TOOLBASE}/ps_analyze.sh dumbledore.original dumbledore.protected
 
 .c.o:
 	${TOOLBASE}/ps_comp.sh  $<