diff options
| author |  Nikias Bassen | 2019-01-22 00:49:54 +0100 |
|---|---|---|
| committer | Nikias Bassen | 2019-01-22 00:49:54 +0100 |
| commit | e0b44cfb99c7e400c0fc51474f240dba3facd412 (patch) | |
| tree | a1b53f6d3d144de5b71b2fc6b54a4107ecd70066 | |
| parent | 95916028d8596727311509f75a599816c7689ee8 (diff) | |
| download | idevicerestore-e0b44cfb99c7e400c0fc51474f240dba3facd412.tar.gz idevicerestore-e0b44cfb99c7e400c0fc51474f240dba3facd412.tar.bz2 | |
win32: Use _fseeki64/_ftelli64 instead of fseeko/ftello
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/asr.c | 18 | ||||
| -rw-r--r-- | src/download.c | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 006d85d..94a9a79 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,7 @@ case "$host_os" in ;; mingw*) GLOBAL_CFLAGS+="-DWIN32 -D__LITTLE_ENDIAN__=1" - AC_LDFLAGS+="-static-libgcc" - AC_LDADD="-lsetupapi" + AC_LDFLAGS+="-static-libgcc -lmsvcr100" ;; *) ;; @@ -204,9 +204,15 @@ int asr_perform_validation(asr_client_t asr, const char* filesystem) { return -1; } +#ifdef WIN32 + _fseeki64(file, 0, SEEK_END); + length = _ftelli64(file); + _fseeki64(file, 0, SEEK_SET); +#else fseeko(file, 0, SEEK_END); length = ftello(file); fseeko(file, 0, SEEK_SET); +#endif payload_info = plist_new_dict(); plist_dict_set_item(payload_info, "Port", plist_new_uint(1)); @@ -300,7 +306,11 @@ int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, FILE* file) { return -1; } +#ifdef WIN32 + _fseeki64(file, oob_offset, SEEK_SET); +#else fseeko(file, oob_offset, SEEK_SET); +#endif if (fread(oob_data, 1, oob_length, file) != oob_length) { error("ERROR: Unable to read OOB data from filesystem offset: %s\n", strerror(errno)); @@ -320,7 +330,7 @@ int asr_handle_oob_data_request(asr_client_t asr, plist_t packet, FILE* file) { int asr_send_payload(asr_client_t asr, const char* filesystem) { char data[ASR_PAYLOAD_PACKET_SIZE]; FILE* file = NULL; - off_t i, length, bytes = 0; + uint64_t i, length, bytes = 0; double progress = 0; file = fopen(filesystem, "rb"); @@ -330,9 +340,15 @@ int asr_send_payload(asr_client_t asr, const char* filesystem) { return -1; } +#ifdef WIN32 + _fseeki64(file, 0, SEEK_END); + length = _ftelli64(file); + _fseeki64(file, 0, SEEK_SET); +#else fseeko(file, 0, SEEK_END); length = ftello(file); fseeko(file, 0, SEEK_SET); +#endif int chunk = 0; int add_checksum = 0; diff --git a/src/download.c b/src/download.c index fab6bba..bd8a40f 100644 --- a/src/download.c +++ b/src/download.c @@ -135,7 +135,11 @@ int download_to_file(const char* url, const char* filename, int enable_progress) curl_easy_perform(handle); curl_easy_cleanup(handle); +#ifdef WIN32 + uint64_t sz = _ftelli64(f); +#else off_t sz = ftello(f); +#endif fclose(f); if ((sz == 0) || (sz == (off_t)-1)) { |