Enlightenment CVS committal

Author  : lordchaos
Project : e17
Module  : apps/evfs

Dir     : e17/apps/evfs/src/common


Modified Files:
        evfs_io.c 


Log Message:
* Handle parsing of uris better`


===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evfs_io.c   16 Oct 2005 10:09:05 -0000      1.17
+++ evfs_io.c   18 Oct 2005 04:55:06 -0000      1.18
@@ -223,13 +223,24 @@
        /*Write the files*/
        /*Send them de-parsed to save time*/
        for (i=0;i<command->file_command.num_files;i++) {
-               snprintf(uri, 1024, "%s://%s", 
+
+               if (command->file_command.files[i]->username) {
+                       snprintf(uri, 1024, "%s://%s:[EMAIL PROTECTED]", 
+                       command->file_command.files[i]->plugin_uri,
+                       command->file_command.files[i]->username,
+                       command->file_command.files[i]->password,
+                       command->file_command.files[i]->path);
+
+               } else {
+                       snprintf(uri, 1024, "%s://%s", 
                        command->file_command.files[i]->plugin_uri, 
                        command->file_command.files[i]->path);
+               }
 
                evfs_write_ecore_ipc_server_message(conn->server, 
                        ecore_ipc_message_new(EVFS_COMMAND, 
-                       EVFS_FILE_REFERENCE, 0,0,0,uri, sizeof(uri)));  
+                       EVFS_FILE_REFERENCE, 0,0,0,uri, sizeof(uri)));
+
        }
 
        /*Send a final*/
@@ -251,14 +262,28 @@
        /*Write the files*/
        /*Send them de-parsed to save time*/
        for (i=0;i<command->file_command.num_files;i++) {
-               snprintf(uri, 1024, "%s://%s", 
+               if (command->file_command.files[i]->username) {
+                       snprintf(uri, 1024, "%s://%s:[EMAIL PROTECTED]", 
+                       command->file_command.files[i]->plugin_uri,
+                       command->file_command.files[i]->username,
+                       command->file_command.files[i]->password,
+                       command->file_command.files[i]->path);
+
+               } else {
+                       snprintf(uri, 1024, "%s://%s", 
                        command->file_command.files[i]->plugin_uri, 
                        command->file_command.files[i]->path);
+               }
 
 
                evfs_write_ecore_ipc_client_message(client->client, 
                        ecore_ipc_message_new(EVFS_COMMAND, 
                        EVFS_FILE_REFERENCE, client->id,0,0,uri, sizeof(uri))); 
+
+
+               
+
+               
        }
 
        /*Send a final*/
@@ -310,6 +335,25 @@
                }
                break;
 
+               case EVFS_FILE_REFERENCE_USERNAME:
+                       if (command->file_command.num_files) {
+                               
command->file_command.files[command->file_command.num_files-1]->username = 
strdup(message->data);
+                               printf("Received username: '%s'\n", 
command->file_command.files[command->file_command.num_files-1]->username);
+                       } else {
+                               printf("BAD: Received a username before a 
filerefereence!\n");
+                       }
+                       break;
+                       
+               case EVFS_FILE_REFERENCE_PASSWORD:
+                       if (command->file_command.num_files) {
+                               
command->file_command.files[command->file_command.num_files-1]->password = 
strdup(message->data);
+                               printf("Received password: 
'%s'\n",command->file_command.files[command->file_command.num_files-1]->password);
+                       } else {
+                               printf("BAD: Received a password before a 
filerefereence!\n");
+                       }
+                       break;
+
+
                case EVFS_COMMAND_END:  
                         /*TODO cleanp ref event*/
                         




-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to