commit acb3e90c7af9ff3997912790387df5d0e128ae86
from: matthias <matthias>
date: Sat Sep 02 01:29:51 2006 UTC

Modified several functions.  We do not need a global liste variable anymore.

commit - 2cfe27bf8828c71aafeaa4485297265943d34c5e
commit + acb3e90c7af9ff3997912790387df5d0e128ae86
blob - 802a366ca1941b2735bb7e3b8a1db5672ab3d109
blob + 6e6316d9a1c398917bb42f6e8df6d931fbe72274
--- defs.h
+++ defs.h
@@ -1,9 +1,9 @@
 #ifndef __DEFS_H
 #define __DEFS_H
 
-int display_fat_header(char *, int *);
-int display_mo_header(char *, int *, int *);
-void display_load_commands(char *, int *, int );
+int display_fat_header(struct list *lst, char *, int *);
+int display_mo_header(struct list *lst, char *, int *, int *);
+void display_load_commands(struct list *lst, char *, int *, int );
 void print_section(struct section *);
 void print_load_command(struct load_command *);
 void print_mo_header(struct mach_header *);
blob - 9171ef5addad2d28b2639fed6ae1ac6139252b50
blob + b9b493330b28d7df9870c8089cb43984d4ebfc7b
--- dermob-cli.c
+++ dermob-cli.c
@@ -24,7 +24,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: dermob-cli.c,v 1.10 2006/08/15 12:28:17 matthias Exp $ */
+/* $Id: dermob-cli.c,v 1.11 2006/09/02 01:29:51 matthias Exp $ */
 
 #include "dermob.h"
 #include "mach.h"
@@ -96,33 +96,33 @@ main (int argc, char **argv)
 	switch (flag) {
 		// -u
 		case 0x1:
-			display_fat_header(buffer, &offset);
+			display_fat_header(lst, buffer, &offset);
 			list_traverse_list(lst);
 			break;
 		// -h
 		case 0x2:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
 			list_traverse_list(lst);
 			break;
 		// -uh
 		case 0x3:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
 			list_traverse_list(lst);
 			break;
 		// -c
 		case 0x4:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
-			display_load_commands(buffer, &offset, ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
+			display_load_commands(lst, buffer, &offset, ncmds);
 			list_traverse_list(lst);
 			break;
 		// -t
 		case 0x8:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
-			display_load_commands(buffer, &offset, ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
+			display_load_commands(lst, buffer, &offset, ncmds);
 			display_buffer(buffer, text_addr, text_offset, text_size);
 			break;
 		// -x
@@ -131,23 +131,23 @@ main (int argc, char **argv)
 			break;
 		// -d
 		case 0x32:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
-			display_load_commands(buffer, &offset, ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
+			display_load_commands(lst, buffer, &offset, ncmds);
 			display_buffer(buffer, data_addr, data_offset, data_size);
 			break;
 		// -s
 		case 0x64:
-			display_fat_header(buffer, &offset);
-			display_mo_header(buffer, &offset, &ncmds);
-			display_load_commands(buffer, &offset, ncmds);
+			display_fat_header(lst, buffer, &offset);
+			display_mo_header(lst, buffer, &offset, &ncmds);
+			display_load_commands(lst, buffer, &offset, ncmds);
 			display_buffer(buffer, cs_addr, cs_offset, cs_size);
 			break;
 		default:
-			ret = display_fat_header(buffer, &offset);
+			ret = display_fat_header(lst, buffer, &offset);
 			if (ret > 0)
 				printf("- Universal Binary for %d architectures\n", ret);
-			ret = display_mo_header(buffer, &offset, &ncmds);
+			ret = display_mo_header(lst, buffer, &offset, &ncmds);
 			if (ret > 0)
 				printf("- Vaild mach-o binary\n");
 			else {
@@ -155,7 +155,7 @@ main (int argc, char **argv)
 				exit(1);
 			}
 			dyn_display = 1;
-			display_load_commands(buffer, &offset, ncmds);
+			display_load_commands(lst, buffer, &offset, ncmds);
 			printf("%s", dynamic ? "" : "- Statically linked\n");
 			break;
 	}
blob - 6d2d556430a03013fe452637b94f017d05a68c66
blob + 29f855b28020d5be47ee56d07efd1a16ce28d9b5
--- util.c
+++ util.c
@@ -24,7 +24,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $Id: util.c,v 1.19 2006/08/15 13:13:16 matthias Exp $ */
+/* $Id: util.c,v 1.20 2006/09/02 01:29:51 matthias Exp $ */
 
 #include "dermob.h"
 #include "mach.h"
@@ -38,7 +38,7 @@
 	((i & 0x000000FF) << 24))
 
 int
-display_fat_header(char *buffer, int *roffset)
+display_fat_header(struct list *lst, char *buffer, int *roffset)
 {
 	struct fat_header *fh;
 	struct fat_arch *fa;
@@ -74,7 +74,7 @@ display_fat_header(char *buffer, int *roffset)
 }
 
 int
-display_mo_header(char *buffer, int *offset, int *ncmds)
+display_mo_header(struct list *lst, char *buffer, int *offset, int *ncmds)
 {
 	struct mach_header *mh;
 	
@@ -92,7 +92,7 @@ display_mo_header(char *buffer, int *offset, int *ncmd
 }
 
 void
-display_load_commands(char *buffer, int *offset, int ncmds)
+display_load_commands(struct list *lst, char *buffer, int *offset, int ncmds)
 {
 	struct load_command *ld;
 	struct section *sec;