Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_server_handle.c
Log Message:
A few API updates to support recursive filesystem nesting (e.g. directory list
on posix:///dir/blah.tar.bz2#bzip2:///#tar:///)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evfs_server_handle.c 26 Oct 2005 03:44:49 -0000 1.11
+++ evfs_server_handle.c 31 Oct 2005 03:32:55 -0000 1.12
@@ -5,20 +5,21 @@
/*---------------------------------------------------*/
/*Move these functions somewhere*/
-void evfs_uri_open(evfs_server* server, evfs_filereference* uri) {
- evfs_plugin* plugin = evfs_get_plugin_for_uri(server,uri->plugin_uri);
+int evfs_uri_open(evfs_client* client, evfs_filereference* uri) {
+ evfs_plugin* plugin =
evfs_get_plugin_for_uri(client->server,uri->plugin_uri);
if (plugin) {
printf("Opening file..\n");
- (*plugin->functions->evfs_file_open)(uri);
+ return (*plugin->functions->evfs_file_open)(client, uri);
} else {
printf("Could not get plugin for uri '%s' at evfs_uri_open\n",
uri->plugin_uri);
+ return -1;
}
}
-int evfs_uri_read(evfs_filereference* uri, char* bytes, long size) {
- evfs_plugin* plugin =
evfs_get_plugin_for_uri(uri->server,uri->plugin_uri);
+int evfs_uri_read(evfs_client* client, evfs_filereference* uri, char* bytes,
long size) {
+ evfs_plugin* plugin =
evfs_get_plugin_for_uri(client->server,uri->plugin_uri);
if (plugin) {
- return (*plugin->functions->evfs_file_read)(uri,bytes,size);
+ return
(*plugin->functions->evfs_file_read)(client,uri,bytes,size);
} else {
printf("Could not get plugin for uri '%s' at evfs_uri_open\n",
uri->plugin_uri);
return -1;
@@ -152,7 +153,7 @@
if (plugin && dst_plugin) {
(*dst_plugin->functions->evfs_file_create)(command->file_command.files[1]);
-
(*plugin->functions->evfs_file_open)(command->file_command.files[0]);
+ (*plugin->functions->evfs_file_open)(client,
command->file_command.files[0]);
/*Get the source file size*/
(*plugin->functions->evfs_file_stat)(command, &file_stat);
@@ -166,7 +167,7 @@
read_write_bytes = (file_stat.st_size > count +
COPY_BLOCKSIZE) ? COPY_BLOCKSIZE : (file_stat.st_size - count);
/*printf("Reading/writing %d bytes\n",
read_write_bytes);*/
-
(*plugin->functions->evfs_file_read)(command->file_command.files[0], bytes,
read_write_bytes );
+
(*plugin->functions->evfs_file_read)(client,command->file_command.files[0],
bytes, read_write_bytes );
(*dst_plugin->functions->evfs_file_write)(command->file_command.files[1],
bytes, read_write_bytes );
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
