Merge korg/donut into korg/master

3 files changed, 4 insertions, 25 deletions

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3c3cb61..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifneq ($(TARGET_SIMULATOR),true)
-  include $(call all-subdir-makefiles)
-endif
diff --git a/src/Android.mk b/src/Android.mk
deleted file mode 100644
index a76a23a..0000000
--- a/src/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-ifneq ($(TARGET_SIMULATOR), true)
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-		boot.c check.c common.c fat.c file.c io.c lfn.c dosfsck.c
-
-LOCAL_C_INCLUDES := external/dosfstools/src
-
-LOCAL_CFLAGS := -O2 -g -W -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-LOCAL_MODULE := dosfsck
-LOCAL_MODULE_TAGS :=
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc
-
-include $(BUILD_EXECUTABLE)
-
-endif
diff --git a/src/io.c b/src/io.c
index 0ab0bbf..e1b07fc 100644
--- a/src/io.c
+++ b/src/io.c
@@ -76,8 +76,10 @@ void fs_open(char *path,int rw)
 {
     struct stat stbuf;
 
-    if ((fd = open(path,rw ? O_RDWR : O_RDONLY)) < 0)
-	pdie("open %s",path);
+    if ((fd = open(path,rw ? O_RDWR : O_RDONLY)) < 0) {
+        perror("open");
+        exit(6);   
+    }
     changes = last = NULL;
     did_change = 0;