don't resize file on disk for file transfers

as requested; causes some issues with NTFS support on some systems
notsecure · May 18, 2015 · 2d7e38a · 2d7e38a
1 parent 6a4da3b
commit 2d7e38a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 32 deletions.
diff --git a/android/main.c b/android/main.c
@@ -241,10 +241,6 @@ void flush_file(FILE *file)
     fsync(fd);
 }
 
-int resize_file(FILE *file, uint64_t size){
-    // File transfers unsupported on android TODO
-}
-
 int ch_mod(uint8_t *file){
     /* You're probably looking for ./xlib as android isn't working when this was written. */
     return -1;
@@ -813,6 +809,6 @@ __attribute__ ((externally_visible)) void ANativeActivity_onCreate(ANativeActivi
     pthread_create(&thread, &myattr, (void*(*)(void*))android_main, NULL);
 }
 
-void launch_at_startup(int is_launch_at_startup) 
+void launch_at_startup(int is_launch_at_startup)
 {
 }
diff --git a/file_transfers.c b/file_transfers.c
@@ -577,13 +577,15 @@ static void incoming_file_callback_request(Tox *tox, uint32_t friend_number, uin
             if(file){
                 /* File exist, and is readable, now get current size! */
                 debug("FileTransfer:\tCool file exists, let try to restart it.\n");
+                /* Eventually we want to cancel the file if it's larger than the incoming size, but without an error
+                dialog we'll just wait for now...
                 fseeko(file, 0, SEEK_END); size = ftello(file); fclose(file);
-                if(file_size != size){
+                if(file_size <= size){
                     debug("FileTransfer:\tIncoming size (%lu), and size on disk (%lu) mismatch, aborting!\n", size, file_size);
                     file_transfer_local_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL);
                     free(file_handle->path);
                     return;
-                }
+                }*/
                 file = fopen((const char*)file_handle->path, "rb+");
                 /* We have to open as rb+, so we also need to re-seek to the start! */
                 fseeko(file, 0, SEEK_SET);
@@ -942,15 +944,6 @@ int utox_file_start_write(uint32_t friend_number, uint32_t file_number, void *fi
         utox_break_file(file_handle);
         return -1;
     }
-    if(resize_file(file_handle->file, file_handle->size) != 0){
-        debug("FileTransfer:\tThe file size was unable to be changed!\n");
-        fclose(file_handle->file);
-        file_handle->file = NULL;
-        utox_break_file(file_handle);
-        remove(filepath);
-        free(filepath);
-        return -1;
-    }
 
     file_handle->path = (uint8_t*)strdup((const char*)filepath);
     file_handle->path_length = strlen(filepath);

diff --git a/windows/main.7.c b/windows/main.7.c
@@ -4,10 +4,6 @@
 
 #include <windows.h>
 
-int resize_file(FILE *file, uint64_t size){
-    return _chsize_s(fileno(file), size);
-}
-
 void launch_at_startup(int is_launch_at_startup){
     HKEY hKey;
     const wchar_t* run_key_path = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";

diff --git a/windows/main.XP.c b/windows/main.XP.c
@@ -1,8 +1,3 @@
-int resize_file(FILE *file, uint64_t size){
-    return _chsize_s(fileno(file), size);
-}
-
-
 void launch_at_startup(int is_launch_at_startup){
     HKEY hKey;
     const wchar_t* run_key_path = L"Software\\Microsoft\\Windows\\CurrentVersion\\Run";

diff --git a/xlib/main.c b/xlib/main.c
@@ -482,7 +482,7 @@ void send_message(
      long data3    /* message data 3 */
 ){
     XEvent ev;
-  
+
     memset(&ev, 0, sizeof(ev));
     ev.xclient.type = ClientMessage;
     ev.xclient.window = w;
@@ -828,11 +828,6 @@ void flush_file(FILE *file)
     fsync(fd);
 }
 
-int resize_file(FILE *file, uint64_t size){
-    return posix_fallocate(fileno(file), 0, size);
-}
-
-
 void setscale(void)
 {
     int i;
@@ -1571,6 +1566,6 @@ int video_getframe(vpx_image_t *image)
     return v4l_getframe(image);
 }
 
-void launch_at_startup(int is_launch_at_startup) 
+void launch_at_startup(int is_launch_at_startup)
 {
 }