Merge lp:~lool/ujail/misc-fixes into lp:ujail/proof-of-concept

[Loïc Minier]

[Stephan Peijnik (speijnik)]

Thanks for those fixes.

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2009-12-29 15:50:28 +0000
@@ -0,0 +1,3 @@
+hello
+proof_of_concept
+proof_of_concept_nopatch
 
=== modified file 'Makefile'
--- Makefile	2009-12-08 09:46:47 +0000
+++ Makefile	2009-12-29 15:50:28 +0000
@@ -1,16 +1,17 @@
 #!/usr/bin/make -f
 
-OBJS=proof_of_concept.o
-OBJS_nopatch=proof_of_concept_nopatch.o
+# x86-64 not yet supported, but can build and run the x86 version
+ifeq ($(shell uname -m),x86_64)
+CFLAGS += -m32
+endif
+
+CFLAGS += -Wall -Werror
+
 all: build
 
-build: ${OBJS} ${OBJS_nopatch}
-	gcc -Wall -Werror -o ujail-poc ${OBJS}
-	gcc -Wall -Werror -o ujail-poc-nopatch ${OBJS_nopatch}
-	gcc -Wall -Werror -o hello hello.c
+PROGS := proof_of_concept proof_of_concept_nopatch hello
 
-.c.o:
-	gcc -Wall -Werror -o $@ -c $^
+build: $(PROGS)
 
 clean:
-	rm -f ujail-poc ujail-poc-nopatch hello ${OBJS} ${OBJS_nopatch}
 \ No newline at end of file
+	rm -f $(PROGS)
 
=== modified file 'proof_of_concept.c'
--- proof_of_concept.c	2009-12-07 16:16:56 +0000
+++ proof_of_concept.c	2009-12-29 15:50:28 +0000
@@ -40,7 +40,7 @@
   long patch_data = 0x01b80cd;
   long backup;
 
-  printf("test.c starting...\n");
+  printf(__FILE__ " starting...\n");
   child_pid = fork();
   
   if (child_pid == 0) {
 
=== modified file 'proof_of_concept_nopatch.c'
--- proof_of_concept_nopatch.c	2009-12-08 09:46:47 +0000
+++ proof_of_concept_nopatch.c	2009-12-29 15:50:28 +0000
@@ -1,5 +1,5 @@
 /*
- * proof_of_concept.c
+ * proof_of_concept_nopatch.c
  *
  * Copyright (C) 2009 Stephan Peijnik <debian at sp dot or dot at>
  *
@@ -39,7 +39,7 @@
   /* patch data: x86 opcodes for int $0x80 */
   int int_ins_size = 2;
 
-  printf("test.c starting...\n");
+  printf(__FILE__ " starting...\n");
   child_pid = fork();
   
   if (child_pid == 0) {