diff options
author | Steve Kondik <shade@chemlab.org> | 2013-08-16 14:55:31 -0700 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-08-16 14:59:55 -0700 |
commit | 437424c4f16a30e306a936854fac2032f072a271 (patch) | |
tree | 4ae14741aabe00e3dd28caacdba44b31e3f6b266 | |
parent | 6ff3a58bcd3223f15def43ddd39d3921d855494b (diff) | |
download | android_external_fsck_msdos-stable/cm-10.2.tar.gz android_external_fsck_msdos-stable/cm-10.2.tar.bz2 android_external_fsck_msdos-stable/cm-10.2.zip |
fsck_msdos: Static-ifycm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2
* Split out main() and libraryify so we can use in recovery.
Change-Id: I1b35d7f52f536145c3c465030391f86100fa2ac0
-rw-r--r-- | Android.mk | 16 | ||||
-rw-r--r-- | fsck_msdos.c | 6 | ||||
-rw-r--r-- | fsck_msdos.h | 7 | ||||
-rw-r--r-- | main.c | 3 |
4 files changed, 25 insertions, 7 deletions
@@ -2,18 +2,24 @@ ifneq ($(BOARD_USES_CUSTOM_FSCK_MSDOS),true) LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) +common_src_files := common_cflags := -O2 -g -W -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +include $(CLEAR_VARS) LOCAL_SRC_FILES := boot.c check.c dir.c fat.c main.c - +LOCAL_CFLAGS := $(common_cflags) LOCAL_C_INCLUDES := external/fsck_msdos/ +LOCAL_MODULE := libfsck_msdos +LOCAL_MODULE_TAGS := optional +include $(BUILD_STATIC_LIBRARY) -LOCAL_CFLAGS := -O2 -g -W -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - +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_STATIC_LIBRARIES := libfsck_msdos LOCAL_SYSTEM_SHARED_LIBRARIES := libc - include $(BUILD_EXECUTABLE) endif 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 + @@ -68,7 +68,7 @@ usage(void) } int -main(int argc, char **argv) +fsck_msdos_main(int argc, char **argv) { int ret = 0, erg; int ch; @@ -126,7 +126,6 @@ main(int argc, char **argv) return ret; } - /*VARARGS*/ int ask(int def, const char *fmt, ...) |