Changeset 75c3ff7

Timestamp:

2010-05-21T00:09:29Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2c5fabc

Parents:

e7dc02a

Message:

Fixed sending with proper filenames by creating a temporary directory with
the file in it; protocol modules are mostly hardcoded to use the filename
from the filesystem with no way to override this.

Also improved robustness a little bit.

Location:

protocols/purple

Files:

• ft.c (modified) (8 diffs)
• purple.c (modified) (1 diff)

protocols/purple/ft.c

@@ -40 +40 @@
         struct im_connection *ic;
         int fd;
-        char *fn, *orig_fn, *handle;
+        char *fn, *handle;
         gboolean ui_wants_data;
 };
@@ -89 +89 @@
                 xfer->ui_data = px;
                 px->xfer = xfer;
-                
-                purple_xfer_set_filename( xfer, px->orig_fn );
-                purple_xfer_set_local_filename( xfer, px->fn );
                 
                 next_ft = NULL;
@@ -152 +149 @@
         if( lseek( px->fd, 0, SEEK_CUR ) == px->xfer->size )
         {
-                purple_xfer_end( px->xfer );
+                /*purple_xfer_end( px->xfer );*/
                 imcb_file_finished( ft );
         }
@@ -177 +174 @@
         
         g_free( px->fn );
-        g_free( px->orig_fn );
         g_free( px->handle );
         if( px->fd >= 0 )
@@ -195 +191 @@
                 if( *px->fn )
                 {
-                        //unlink( px->fn );
+                        char *slash;
+                        
+                        unlink( px->fn );
+                        if( ( slash = strrchr( px->fn, '/' ) ) )
+                        {
+                                *slash = '\0';
+                                rmdir( px->fn );
+                        }
                         *px->fn = '\0';
                 }
@@ -226 +229 @@
         struct prpl_xfer_data *px = xfer->ui_data;
         
-        imcb_file_canceled( px->ft, "Canceled by remote end" );
-}
-
-static void prplcb_xfer_add( PurpleXfer *xfer )
-{
-        if( purple_xfer_get_type( xfer ) == PURPLE_XFER_SEND )
-        {
-                struct prpl_xfer_data *px = xfer->ui_data;
-                
-                purple_xfer_set_filename( xfer, px->orig_fn );
-        }
+        if( px->ft )
+                imcb_file_canceled( px->ft, "Canceled by remote end" );
+        else
+                /* px->ft == NULL for sends, because of the two stages. :-/ */
+                imcb_error( px->ic, "File transfer cancelled by remote end" );
 }
 
@@ -252 +249 @@
 {
         struct prpl_xfer_data *px = g_new0( struct prpl_xfer_data, 1 );
+        char *dir, *basename;
         
         ft->data = px;
         px->ft = ft;
-        px->fn = g_strdup( "/tmp/bitlbee-purple-ft.XXXXXX" );
-        px->fd = mkstemp( px->fn );
+        
+        dir = g_strdup( "/tmp/bitlbee-purple-ft.XXXXXX" );
+        if( !mkdtemp( dir ) )
+        {
+                imcb_error( ic, "Could not create temporary file for file transfer" );
+                g_free( px );
+                g_free( dir );
+                return;
+        }
+        
+        if( ( basename = strrchr( ft->file_name, '/' ) ) )
+                basename++;
+        else
+                basename = ft->file_name;
+        px->fn = g_strdup_printf( "%s/%s", dir, basename );
+        px->fd = open( px->fn, O_WRONLY | O_CREAT, 0600 );
+        g_free( dir );
+        
+        if( px->fd < 0 )
+        {
+                imcb_error( ic, "Could not create temporary file for file transfer" );
+                g_free( px );
+                g_free( px->fn );
+                return;
+        }
         
         px->ic = ic;
         px->handle = g_strdup( handle );
-        px->orig_fn = g_strdup( ft->file_name );
         
         imcb_log( ic, "Due to libpurple limitations, the file has to be cached locally before proceeding with the actual file transfer. Please wait..." );
@@ -324 +344 @@
         prplcb_xfer_new,
         prplcb_xfer_destroy,
-        prplcb_xfer_add,
+        NULL, /* prplcb_xfer_add, */
         prplcb_xfer_progress,
         prplcb_xfer_dbg,

protocols/purple/purple.c

@@ -841 +841 @@
         purple_notify_set_ui_ops( &bee_notify_uiops );
         purple_xfers_set_ui_ops( &bee_xfer_uiops );
-        //purple_debug_set_ui_ops( &bee_debug_uiops );
+        purple_debug_set_ui_ops( &bee_debug_uiops );
 }