fsck_msdos: Static-ify

 * Split out main() and libraryify so we can use in recovery.

Change-Id: I1b35d7f52f536145c3c465030391f86100fa2ac0

4 files changed, 28 insertions, 8 deletions

diff --git a/Android.mk b/Android.mk
index d959325..19ecec7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,14 +1,22 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := fragment.c fatcache.c boot.c check.c dir.c fat.c main.c
+common_src_files := fragment.c fatcache.c boot.c check.c dir.c fat.c main.c
 
-LOCAL_C_INCLUDES := external/fsck_msdos/
+common_cflags := -O2 -g -W -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-LOCAL_CFLAGS := -O2 -g -W -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(common_src_files)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_C_INCLUDES := external/fsck_msdos/
+LOCAL_MODULE := libfsck_msdos
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := fsck_msdos.c
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_C_INCLUDES := external/fsck_msdos/
 LOCAL_MODULE := fsck_msdos
 LOCAL_MODULE_TAGS :=
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc  libcutils
-
+LOCAL_STATIC_LIBRARIES := libfsck_msdos
 include $(BUILD_EXECUTABLE)
diff --git a/fsck_msdos.c b/fsck_msdos.c
new file mode 100644
index 0000000..8ef0d90
--- /dev/null
+++ b/fsck_msdos.c
@@ -0,0 +1,6 @@
+#include "fsck_msdos.h"
+
+int main(int argc, char** argv)
+{
+    return fsck_msdos_main(argc, argv);
+}
diff --git a/fsck_msdos.h b/fsck_msdos.h
new file mode 100644
index 0000000..1bbacc9
--- /dev/null
+++ b/fsck_msdos.h
@@ -0,0 +1,7 @@
+#ifndef _FSCK_MSDOS_H
+#define _FSCK_MSDOS_H
+
+int fsck_msdos_main(int argc, char** argv);
+
+#endif
+
diff --git a/main.c b/main.c
index 1c6d514..97fc27d 100644
--- a/main.c
+++ b/main.c
@@ -67,7 +67,7 @@ usage(void)
 }
 
 int
-main(int argc, char **argv)
+fsck_msdos_main(int argc, char **argv)
 {
 	int ret = 0, erg;
 	int ch;
@@ -125,7 +125,6 @@ main(int argc, char **argv)
 	return ret;
 }
 
-
 /*VARARGS*/
 int
 ask(int def, const char *fmt, ...)