diff options
author | Jin Qian <jinqian@google.com> | 2017-07-12 15:18:33 -0700 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2018-02-26 12:23:00 -0500 |
commit | 0a3d8041892cc53c7ea1414c8dc2b274b9956daa (patch) | |
tree | 2d60585dc31d1b04accb3520751550f6dae52179 | |
parent | 2d545e3762636a1f5d4be5ee831c3d188d007ed5 (diff) | |
download | e2fsprogs-0a3d8041892cc53c7ea1414c8dc2b274b9956daa.tar.gz |
AOSP: build mke2fs for windows using android mingw library
Bug: 23686092
Change-Id: I4c7b0c69e3e3c48321d3a0a964ad65c87fc32bbd
From AOSP commit: 83da0276c3ff0a1c33f9042798b319542e254060
-rw-r--r-- | include/mingw/grp.h | 16 | ||||
-rw-r--r-- | include/mingw/linux/types.h | 33 | ||||
-rw-r--r-- | include/mingw/pwd.h | 20 | ||||
-rw-r--r-- | include/mingw/sys/stat.h | 20 | ||||
-rw-r--r-- | include/mingw/sys/sysmacros.h | 11 | ||||
-rw-r--r-- | include/mingw/sys/types.h | 9 | ||||
-rw-r--r-- | include/mingw/unistd.h | 13 | ||||
-rw-r--r-- | lib/blkid/Android.bp | 11 | ||||
-rw-r--r-- | lib/blkid/list.h | 2 | ||||
-rw-r--r-- | lib/blkid/save.c | 8 | ||||
-rw-r--r-- | lib/config.h | 77 | ||||
-rw-r--r-- | lib/e2p/Android.bp | 7 | ||||
-rw-r--r-- | lib/e2p/fgetversion.c | 2 | ||||
-rw-r--r-- | lib/e2p/fsetversion.c | 2 | ||||
-rw-r--r-- | lib/e2p/getversion.c | 2 | ||||
-rw-r--r-- | lib/e2p/setversion.c | 2 | ||||
-rw-r--r-- | lib/ext2fs/Android.bp | 9 | ||||
-rw-r--r-- | lib/support/Android.bp | 7 | ||||
-rw-r--r-- | lib/uuid/Android.bp | 7 | ||||
-rw-r--r-- | lib/uuid/gen_uuid.c | 15 | ||||
-rw-r--r-- | misc/Android.bp | 16 | ||||
-rw-r--r-- | misc/create_inode.c | 9 | ||||
-rw-r--r-- | misc/mk_hugefiles.c | 2 | ||||
-rw-r--r-- | misc/mke2fs.c | 9 |
24 files changed, 291 insertions, 18 deletions
diff --git a/include/mingw/grp.h b/include/mingw/grp.h new file mode 100644 index 000000000..67f62d946 --- /dev/null +++ b/include/mingw/grp.h @@ -0,0 +1,16 @@ + +#pragma once + +#include <sys/types.h> + +__inline struct group * getgrnam(char* g){return 0;} + +struct group + { + char *gr_name; + char *gr_passwd; + __gid_t gr_gid; + char **gr_mem; + }; + +#define getgrgid(i) NULL diff --git a/include/mingw/linux/types.h b/include/mingw/linux/types.h new file mode 100644 index 000000000..eb870113b --- /dev/null +++ b/include/mingw/linux/types.h @@ -0,0 +1,33 @@ +#ifndef _LINUX_TYPES_H +#define _LINUX_TYPES_H + +//#ifndef _MSC_VER +//#error _MSC_VER not defined +//#endif + +#include <sys/types.h> + +typedef unsigned __int8 __u8; +typedef signed __int8 __s8; + +typedef signed __int64 __s64; +typedef unsigned __int64 __u64; + +typedef signed __int16 __s16; +typedef unsigned __int16 __u16; + +typedef signed __int32 __s32; +typedef unsigned __int32 __u32; + +typedef signed __int64 __s64; +typedef unsigned __int64 __u64; + + +//typedef __u32 ino_t; +typedef __u32 dev_t; +typedef __u32 uid_t; +typedef __u32 gid_t; + +#include <stdint.h> + +#endif /* LINUX_TYPES_H */ diff --git a/include/mingw/pwd.h b/include/mingw/pwd.h new file mode 100644 index 000000000..d048842be --- /dev/null +++ b/include/mingw/pwd.h @@ -0,0 +1,20 @@ + +#pragma once + +#include <sys/types.h> + +__inline struct passwd* getpwnam (char* g){return 0;} + +struct passwd +{ + char *pw_name; + char *pw_passwd; + __uid_t pw_uid; + __gid_t pw_gid; + char *pw_gecos; + char *pw_dir; + char *pw_shell; +}; + +#define getpwuid(i) NULL + diff --git a/include/mingw/sys/stat.h b/include/mingw/sys/stat.h new file mode 100644 index 000000000..0ca1d1b18 --- /dev/null +++ b/include/mingw/sys/stat.h @@ -0,0 +1,20 @@ + +#pragma once + +#if HAVE_SYS_STAT_H +#include_next <sys/stat.h> +#endif + +#ifndef lstat +#define lstat stat +#endif + +#ifndef S_ISLNK +#ifdef __S_IFLNK +#define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK) +#else +#define S_ISLNK(mode) 0 +#endif +#endif + +#define link(a, b) CreateHardLink((a), (b), NULL) diff --git a/include/mingw/sys/sysmacros.h b/include/mingw/sys/sysmacros.h new file mode 100644 index 000000000..18fcaaa34 --- /dev/null +++ b/include/mingw/sys/sysmacros.h @@ -0,0 +1,11 @@ + +#pragma once + +/* + * Fall back to Linux's definitions of makedev and major are needed. + * The search_sysfs_block() function is highly unlikely to work on + * non-Linux systems anyway. + */ +#ifndef makedev +#define makedev(maj, min) (((maj) << 8) + (min)) +#endif
\ No newline at end of file diff --git a/include/mingw/sys/types.h b/include/mingw/sys/types.h new file mode 100644 index 000000000..9d048fcbd --- /dev/null +++ b/include/mingw/sys/types.h @@ -0,0 +1,9 @@ + +#pragma once + +#include_next <sys/types.h> + +#include <linux/types.h> + +typedef unsigned short __uid_t; +typedef unsigned short __gid_t; diff --git a/include/mingw/unistd.h b/include/mingw/unistd.h new file mode 100644 index 000000000..9c0dc81ac --- /dev/null +++ b/include/mingw/unistd.h @@ -0,0 +1,13 @@ + +#pragma once + +#include_next <unistd.h> + +__inline __uid_t getuid(void){return 0;} +__inline int geteuid(void){return 1;} + +__inline __gid_t getgid(void){return 0;} +__inline __gid_t getegid(void){return 0;} + +// no-oped sync +__inline void sync(void){}; diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index 9b385f9c6..53381df82 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -20,11 +20,20 @@ cc_library { ], shared_libs: ["libext2_uuid"], + target: { + windows: { + include_dirs: [ "external/e2fsprogs/include/mingw" ], + cflags: [ + "-Wno-pointer-to-int-cast", + ], + enabled: true + }, + }, + cflags: [ "-W", "-Wall", "-fno-strict-aliasing", - "-Wno-macro-redefined", ], header_libs: ["libext2-headers"], diff --git a/lib/blkid/list.h b/lib/blkid/list.h index 26a5ac1b4..7e0ccd77d 100644 --- a/lib/blkid/list.h +++ b/lib/blkid/list.h @@ -146,7 +146,7 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head) * @member: the name of the list_struct within the struct. */ #define list_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) + ((type *)((char *)(ptr)-(unsigned long)(intptr_t)(&((type *)0)->member))) /** * list_for_each - iterate over elements in a list diff --git a/lib/blkid/save.c b/lib/blkid/save.c index 762ffefd7..036f07a4a 100644 --- a/lib/blkid/save.c +++ b/lib/blkid/save.c @@ -27,6 +27,10 @@ #endif #include "blkidP.h" +#ifdef _WIN32 +#include "windows.h" +#endif + static int save_dev(blkid_dev dev, FILE *file) { struct list_head *p; @@ -102,7 +106,11 @@ int blkid_flush_cache(blkid_cache cache) file = fdopen(fd, "w"); opened = tmp; } +#ifndef _WIN32 fchmod(fd, 0644); +#else + chmod(tmp, 0644); +#endif } } diff --git a/lib/config.h b/lib/config.h new file mode 100644 index 000000000..029f7da70 --- /dev/null +++ b/lib/config.h @@ -0,0 +1,77 @@ +#ifndef __APPLE__ +#define HAVE_MALLOC_H 1 +#endif + +#define ROOT_SYSCONFDIR "/etc" + +#define ENABLE_LIBSPARSE 1 + +#define DISABLE_BACKTRACE 1 +#define HAVE_DIRENT_H 1 +#define HAVE_ERRNO_H 1 +#define HAVE_GETOPT_H 1 +#define HAVE_GETPWUID_R 1 +#define HAVE_INTPTR_T 1 +#define HAVE_INTTYPES_H 1 +#ifdef __linux__ +#define HAVE_LSEEK64 1 +#define HAVE_LSEEK64_PROTOTYPE 1 +#endif +#define HAVE_MMAP 1 +#ifdef __linux__ +#define HAVE_MNTENT_H 1 +#endif +#define HAVE_SETJMP_H 1 +#ifdef __linux__ +#define HAVE_SETMNTENT 1 +#endif +#define HAVE_SNPRINTF 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRCASECMP 1 +#define HAVE_STRDUP 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRNLEN 1 +#define HAVE_STRPTIME 1 +#define HAVE_SYSCONF 1 +#define HAVE_TYPE_SSIZE_T 1 +#define HAVE_UNISTD_H 1 +#define HAVE_UTIME_H 1 + +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_TYPES_H 1 + +#if defined(_WIN32) +# define HAVE_LINUX_TYPES_H 1 +# define HAVE_WINSOCK_H 1 +# define HAVE_SYS_SYSMACROS_H 1 +#endif +#if defined(__APPLE__) || defined(__linux__) +# define HAVE_FCNTL 1 +# define HAVE_FSYNC 1 +# define HAVE_GETPAGESIZE 1 +# define HAVE_NET_IF_H 1 +# define HAVE_NETINET_IN_H 1 +# define HAVE_PREAD 1 +# define HAVE_PWRITE 1 +# define HAVE_POSIX_MEMALIGN 1 +# define HAVE_SYS_IOCTL_H 1 +# define HAVE_SYS_MMAN_H 1 +# define HAVE_SYS_MOUNT_H 1 +# define HAVE_SYS_PARAM_H 1 +# define HAVE_SYS_RESOURCE_H 1 +# define HAVE_SYS_SELECT_H 1 +# define HAVE_SYS_WAIT_H 1 +#endif +#if defined(__linux__) +# define HAVE_EXT2_IOCTLS 1 +# define HAVE_FALLOCATE 1 +# define HAVE_LINUX_FD_H 1 +# define HAVE_LINUX_TYPES_H 1 +# define HAVE_LSEEK64 1 +# define HAVE_LSEEK64_PROTOTYPE 1 +# define HAVE_PREAD64 1 +# define HAVE_PWRITE64 1 +# define HAVE_SYS_PRCTL_H 1 +# define HAVE_SYS_SYSMACROS_H 1 +#endif diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index db516707a..9d5b0b619 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -35,6 +35,13 @@ cc_library { "-Wno-macro-redefined", ], + target: { + windows: { + include_dirs: [ "external/e2fsprogs/include/mingw" ], + enabled: true + }, + }, + header_libs: ["libext2-headers"], export_include_dirs: ["."], export_header_lib_headers: ["libext2-headers"], diff --git a/lib/e2p/fgetversion.c b/lib/e2p/fgetversion.c index 33becfe35..a65e9a5c5 100644 --- a/lib/e2p/fgetversion.c +++ b/lib/e2p/fgetversion.c @@ -31,7 +31,9 @@ #include <unistd.h> #endif #include <fcntl.h> +#if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "e2p.h" diff --git a/lib/e2p/fsetversion.c b/lib/e2p/fsetversion.c index dcbff5b92..c2e045591 100644 --- a/lib/e2p/fsetversion.c +++ b/lib/e2p/fsetversion.c @@ -31,7 +31,9 @@ #include <unistd.h> #endif #include <fcntl.h> +#if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "e2p.h" diff --git a/lib/e2p/getversion.c b/lib/e2p/getversion.c index 71031ffc3..9f719b4a9 100644 --- a/lib/e2p/getversion.c +++ b/lib/e2p/getversion.c @@ -20,7 +20,9 @@ #if HAVE_ERRNO_H #include <errno.h> #endif +#if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "e2p.h" diff --git a/lib/e2p/setversion.c b/lib/e2p/setversion.c index 202834f15..2bc933749 100644 --- a/lib/e2p/setversion.c +++ b/lib/e2p/setversion.c @@ -20,7 +20,9 @@ #if HAVE_ERRNO_H #include <errno.h> #endif +#if HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include "e2p.h" diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index df07a9b7e..cc28de17a 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -114,15 +114,10 @@ cc_library { ], }, windows: { - // include/nonunix is used as an overlay on top of the system - // include directory. Some empty header files in include/nonunix - // hide the ones in the system include path. This setup doesn't work - // unless we pass the include/nonunix as an -isystem flag. - // TODO(deymo): Enable windows - enabled: false, + enabled: true, + include_dirs: [ "external/e2fsprogs/include/mingw" ], cflags: [ "-Wno-format", - // "-isystem external/e2fsprogs/include/nonunix", ], host_ldlibs: ["-lws2_32"], }, diff --git a/lib/support/Android.bp b/lib/support/Android.bp index 24414a45e..4a89b8f32 100644 --- a/lib/support/Android.bp +++ b/lib/support/Android.bp @@ -18,10 +18,15 @@ cc_library { ], shared_libs: [ "libext2fs", - "libext2_com_err", "libext2_blkid", ], + target: { + windows: { + enabled: true + }, + }, + cflags: [ "-W", "-Wall", diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp index d173788a9..b6664f991 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -22,7 +22,12 @@ cc_library { "-Wno-unused-function", "-Wno-unused-parameter", ], - + target: { + windows: { + include_dirs: [ "external/e2fsprogs/include/mingw" ], + enabled: true + }, + }, header_libs: ["libext2-headers"], export_include_dirs: ["."], export_header_lib_headers: ["libext2-headers"], diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c index af5509352..43ecc8ae4 100644 --- a/lib/uuid/gen_uuid.c +++ b/lib/uuid/gen_uuid.c @@ -60,7 +60,9 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif +#ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> +#endif #include <sys/stat.h> #ifdef HAVE_SYS_FILE_H #include <sys/file.h> @@ -113,6 +115,7 @@ THREAD_LOCAL unsigned short jrand_seed[3]; #endif #ifdef _WIN32 +#ifndef USE_MINGW static void gettimeofday (struct timeval *tv, void *dummy) { FILETIME ftime; @@ -129,11 +132,7 @@ static void gettimeofday (struct timeval *tv, void *dummy) tv->tv_sec = n / 1000000; tv->tv_usec = n % 1000000; } - -static int getuid (void) -{ - return 1; -} +#endif #endif static int get_random_fd(void) @@ -317,7 +316,9 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low, THREAD_LOCAL FILE *state_f; THREAD_LOCAL uint16_t clock_seq; struct timeval tv; +#ifndef _WIN32 struct flock fl; +#endif uint64_t clock_reg; mode_t save_umask; int len; @@ -335,6 +336,7 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low, } } } +#ifndef _WIN32 fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; fl.l_start = 0; @@ -350,6 +352,7 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low, break; } } +#endif if (state_fd >= 0) { unsigned int cl; unsigned long tv1, tv2; @@ -413,11 +416,13 @@ try_again: fflush(state_f); } rewind(state_f); +#ifndef _WIN32 fl.l_type = F_UNLCK; if (fcntl(state_fd, F_SETLK, &fl) < 0) { fclose(state_f); state_fd = -1; } +#endif } *clock_high = clock_reg >> 32; diff --git a/misc/Android.bp b/misc/Android.bp index e388d1ef4..0d315f20c 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -6,10 +6,17 @@ cc_library { name: "libext2_misc", host_supported: true, + target: { + windows: { + include_dirs: [ "external/e2fsprogs/include/mingw" ], + enabled: true + }, + }, + srcs: [ "create_inode.c", ], - cflags: ["-W", "-Wall", "-Wno-macro-redefined"], + cflags: ["-W", "-Wall"], shared_libs: [ "libext2_quota", "libext2fs", @@ -50,6 +57,13 @@ cc_binary { "libz", ], }, + windows: { + include_dirs: [ "external/e2fsprogs/include/mingw" ], + cflags: ["-D_POSIX", "-D__USE_MINGW_ALARM"], + ldflags: ["-static"], + host_ldlibs: ["-lws2_32"], + enabled: true + }, android: { shared_libs: [ "libext2fs", diff --git a/misc/create_inode.c b/misc/create_inode.c index 51d25f8fb..fb0a88f76 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -15,6 +15,7 @@ #include "config.h" #include <time.h> +#include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #include <limits.h> /* for PATH_MAX */ @@ -23,7 +24,9 @@ #elif defined HAVE_ATTR_XATTR_H #include <attr/xattr.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #ifdef HAVE_SYS_SYSMACROS_H #include <sys/sysmacros.h> #endif @@ -229,6 +232,7 @@ static errcode_t set_inode_xattr(ext2_filsys fs EXT2FS_ATTR((unused)), } #endif /* HAVE_LLISTXATTR */ +#ifndef _WIN32 /* Make a special files (block and character devices), fifo's, and sockets */ errcode_t do_mknod_internal(ext2_filsys fs, ext2_ino_t cwd, const char *name, struct stat *st) @@ -252,10 +256,12 @@ errcode_t do_mknod_internal(ext2_filsys fs, ext2_ino_t cwd, const char *name, mode = LINUX_S_IFIFO; filetype = EXT2_FT_FIFO; break; +#ifndef _WIN32 case S_IFSOCK: mode = LINUX_S_IFSOCK; filetype = EXT2_FT_SOCK; break; +#endif default: return EXT2_ET_INVALID_ARGUMENT; } @@ -313,6 +319,7 @@ errcode_t do_mknod_internal(ext2_filsys fs, ext2_ino_t cwd, const char *name, return retval; } +#endif /* Make a symlink name -> target */ errcode_t do_symlink_internal(ext2_filsys fs, ext2_ino_t cwd, const char *name, @@ -786,6 +793,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino, case S_IFCHR: case S_IFBLK: case S_IFIFO: +#ifndef _WIN32 case S_IFSOCK: retval = do_mknod_internal(fs, parent_ino, name, &st); if (retval) { @@ -830,6 +838,7 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino, goto out; } break; +#endif case S_IFREG: retval = do_write_internal(fs, parent_ino, name, name, root); diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c index f34fa411d..fe35a4baf 100644 --- a/misc/mk_hugefiles.c +++ b/misc/mk_hugefiles.c @@ -32,7 +32,9 @@ extern int optind; #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_SYS_SYSMACROS_H diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 7e8248236..0321fc4e2 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -43,7 +43,9 @@ extern int optind; #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> +#endif #include <libgen.h> #include <limits.h> #include <blkid/blkid.h> @@ -1899,10 +1901,15 @@ profile_error: dev_size = fs_blocks_count; retval = 0; } else +#ifndef _WIN32 retval = ext2fs_get_device_size2(device_name, EXT2_BLOCK_SIZE(&fs_param), &dev_size); - +#else + retval = ext2fs_get_device_size(device_name, + EXT2_BLOCK_SIZE(&fs_param), + &dev_size); +#endif if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) { com_err(program_name, retval, "%s", _("while trying to determine filesystem size")); |