Minor changes so it can compile. Writing to file using binary mode si…

…nce windows will add one byte for each ending line. Updated README for windows instruction.

.gitignore

@@ -0,0 +1,20 @@
+*.o
+*.exe
+*.ko
+*.obj
+*.elf
+*.gch
+*.pch
+*.lib
+*.la
+*.lo
+*.dll
+*.so
+*.so.*
+*.dylib
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+*.dSYM/

Makefile

@@ -10,7 +10,7 @@ SYS := $(shell uname -s | tr -d "[0-9]" | tr -d "-" | tr "[A-Z]" "[a-z]")
 # You can cross compile this program for Win32 using Linux and the 
 # MinGW compiler. See the README for details. If you have already
 # installed MinGW, put the location ($PREFIX) here:
-CR_BASE = /usr/local/cross-tools/i386-mingw32msvc/bin
+CR_BASE = /opt/mingw32/bin
 
 # You shouldn't need to change anything below this line
 #---------------------------------------------------------------------
@@ -19,6 +19,7 @@ CR_BASE = /usr/local/cross-tools/i386-mingw32msvc/bin
 #RAW_FLAGS += -D__DEBUG -ggdb
 
 NAME = foremost
+NAME_OUTPUT = $(NAME)
 MAN_PAGES = $(NAME).8.gz
 
 RAW_FLAGS += -DVERSION=\"$(VERSION)\"
@@ -92,6 +93,7 @@ win_general: goals
 
 # Cross compiling from Linux to Windows. See README for more info
 cross: CC = $(CR_CC) $(CR_OPT)
+cross: NAME_OUTPUT = $(CR_GOAL)
 cross: STRIP = $(CR_STRIP)
 cross: win_general
 
@@ -110,7 +112,7 @@ cygwin: unix
 #---------------------------------------------------------------------
 
 foremost: $(OBJ)
-	$(CC) $(OBJ) -o $(NAME) $(LINK_OPT)
+	$(CC) $(OBJ) -o $(NAME_OUTPUT) $(LINK_OPT)
 
 
 #---------------------------------------------------------------------

README

@@ -1,3 +1,14 @@
+WINDOWS:
+Requires path to MinGW.
+Makefile defaults MinGW gcc path to /opt/mingw32/bin
+If you installed mingw32 in different location modify line 13 in Makefile.
+Requires libiberty.a to compile
+
+$ make cross
+
+
+----------------------------------------------------------------------
+
 
 FOREMOST 
 ----------------------------------------------------------------------

api.c

@@ -19,7 +19,6 @@ int				FATblk;
 int				currFATblk;
 int				highblk = 0;
 int				block_list[OUR_BLK_SIZE / sizeof(int)];
-extern int		errno;
 
 /*Inititialize those globals used by extract_ole*/
 void init_ole()

dir.c

@@ -53,7 +53,6 @@ int make_new_directory(f_state *s, char *fn)
 #ifdef __WIN32
 
 	#ifndef __CYGWIN
-fprint(stderr,"Calling mkdir with\n");	
 	if (mkdir(fn))
 	#endif
 
@@ -367,7 +366,7 @@ int write_to_disk(f_state *s, s_spec *needle, u_int64_t len, unsigned char *buf,
 		test = fopen(fn, "r");
 		}
 
-	if (!(f = fopen(fn, "w")))
+	if (!(f = fopen(fn, "wb"))) /* added b so it can extract correctly for windows */
 		{
 		printf("fn = %s  failed\n", fn);
 		fatal_error(s, "Can't open file for writing \n");

main.h

@@ -75,6 +75,7 @@
 
 #elif defined (__WIN32)
 #include <sys/param.h>
+#define __U16_TYPE unsigned short
 
 #elif defined (__MACOSX)
 #include <machine/endian.h>