fastboot: Remove legacy MINGW workarounds
The version of MINGW we compile with has more advanced POSIX support.
Removing legacy MINGW workarounds as those are not needed anymore.
Change-Id: Id5d67176b719db6c3667be6d63c41432e0ba9f30
Signed-off-by: Rom Lemarchand <romlem@google.com>
diff --git a/fastboot/engine.c b/fastboot/engine.c
index 8d46991..b07e742 100644
--- a/fastboot/engine.c
+++ b/fastboot/engine.c
@@ -286,21 +286,7 @@
int fd;
struct stat st;
-#ifdef USE_MINGW
- /* Ideally we should use tmpfile() here, the same as with unix version.
- * But unfortunately it is not portable as it is not clear whether this
- * function opens file in TEXT or BINARY mode.
- *
- * There are also some reports it is buggy:
- * http://pdplab.it.uom.gr/teaching/gcc_manuals/gnulib.html#tmpfile
- * http://www.mega-nerd.com/erikd/Blog/Windiots/tmpfile.html
- */
- char *filename = tempnam(getenv("TEMP"), "fastboot-format.img");
- fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644);
- unlink(filename);
-#else
fd = fileno(tmpfile());
-#endif
make_ext4fs_sparse_fd(fd, image->partition_size, NULL, NULL);
fstat(fd, &st);
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 447b257..e469d97 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -135,21 +135,17 @@
return strdup(path);
}
-#ifdef _WIN32
-void *load_file(const char *fn, unsigned *_sz);
-int64_t file_size(const char *fn);
-#else
#if defined(__APPLE__) && defined(__MACH__)
#define lseek64 lseek
#define off64_t off_t
#endif
-int64_t file_size(const char *fn)
+static int64_t file_size(const char *fn)
{
off64_t off;
int fd;
- fd = open(fn, O_RDONLY);
+ fd = open(fn, O_RDONLY | O_BINARY);
if (fd < 0) return -1;
off = lseek64(fd, 0, SEEK_END);
@@ -158,7 +154,7 @@
return off;
}
-void *load_file(const char *fn, unsigned *_sz)
+static void *load_file(const char *fn, unsigned *_sz)
{
char *data;
int sz;
@@ -166,7 +162,7 @@
int errno_tmp;
data = 0;
- fd = open(fn, O_RDONLY);
+ fd = open(fn, O_RDONLY | O_BINARY);
if(fd < 0) return 0;
sz = lseek(fd, 0, SEEK_END);
@@ -190,7 +186,6 @@
errno = errno_tmp;
return 0;
}
-#endif
int match_fastboot_with_serial(usb_ifc_info *info, const char *local_serial)
{
diff --git a/fastboot/util_windows.c b/fastboot/util_windows.c
index 9e029fd..74a5c27 100644
--- a/fastboot/util_windows.c
+++ b/fastboot/util_windows.c
@@ -36,29 +36,6 @@
#include <windows.h>
-int64_t file_size(const char *fn)
-{
- HANDLE file;
- char *data;
- DWORD sz;
-
- file = CreateFile( fn,
- GENERIC_READ,
- FILE_SHARE_READ,
- NULL,
- OPEN_EXISTING,
- 0,
- NULL );
-
- if (file == INVALID_HANDLE_VALUE)
- return -1;
-
- sz = GetFileSize( file, NULL );
- CloseHandle( file );
-
- return sz;
-}
-
void get_my_path(char exe[PATH_MAX])
{
char* r;
@@ -70,47 +47,3 @@
*r = 0;
}
-
-void *load_file(const char *fn, unsigned *_sz)
-{
- HANDLE file;
- char *data;
- DWORD sz;
-
- file = CreateFile( fn,
- GENERIC_READ,
- FILE_SHARE_READ,
- NULL,
- OPEN_EXISTING,
- 0,
- NULL );
-
- if (file == INVALID_HANDLE_VALUE)
- return NULL;
-
- sz = GetFileSize( file, NULL );
- data = NULL;
-
- if (sz > 0) {
- data = (char*) malloc( sz );
- if (data == NULL) {
- fprintf(stderr, "load_file: could not allocate %ld bytes\n", sz );
- sz = 0;
- } else {
- DWORD out_bytes;
-
- if ( !ReadFile( file, data, sz, &out_bytes, NULL ) ||
- out_bytes != sz )
- {
- fprintf(stderr, "load_file: could not read %ld bytes from '%s'\n", sz, fn);
- free(data);
- data = NULL;
- sz = 0;
- }
- }
- }
- CloseHandle( file );
-
- *_sz = (unsigned) sz;
- return data;
-}