Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_metadata.c evfs_server_handle.c evfs_worker.c
Log Message:
* Handle auth requests/responses
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_metadata.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- evfs_metadata.c 11 Aug 2007 10:39:02 -0000 1.34
+++ evfs_metadata.c 13 Aug 2007 03:05:21 -0000 1.35
@@ -668,7 +668,7 @@
evfs_command* c = evfs_file_command_single_build(ref);
(*EVFS_PLUGIN_FILE(ref->plugin)->functions->evfs_dir_list)
- (NULL, c->file_command.files[0], &dir_list);
+ (NULL, c, &dir_list);
evfs_cleanup_file_command(c);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- evfs_server_handle.c 25 Jul 2007 17:00:53 -0000 1.77
+++ evfs_server_handle.c 13 Aug 2007 03:05:21 -0000 1.78
@@ -180,7 +180,7 @@
evfs_filereference *file = NULL;
/*First, we need a directory list... */
- (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list)
(client, command->file_command.files[0],
+ (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list)
(client, command,
&directory_list);
if (directory_list)
{
@@ -340,12 +340,12 @@
files[0]->plugin_uri);
if (plugin) {
Ecore_List *directory_list = NULL;
- (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list) (client,
command->file_command.files[0], &directory_list);
+ (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list) (client,
command, &directory_list);
if (directory_list) {
evfs_list_dir_event_create(client, command, directory_list);
} else {
printf
- ("evfs_handle_dir_list_command: Recevied null from plugin for
directory_list\n");
+ ("evfs_handle_dir_list_command: Received null from plugin for
directory_list\n");
}
} else {
printf("No plugin for '%s'\n",
@@ -388,6 +388,7 @@
{
evfs_plugin *plugin = NULL;
evfs_plugin *dst_plugin = NULL;
+ evfs_command* tmp_command;
int num_files;
int c_file;
@@ -556,8 +557,15 @@
evfs_operation_mkdir_task_add(EVFS_OPERATION(op),
evfs_filereference_clone(command->file_command.files[c_file]), newdir_rewrite);
/*First, we need a directory list... */
- (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list)
(client, command->file_command.files[c_file],
+
+ /*We have to make a temp command - list expects first file
in command to be list directory*/
+ tmp_command =
evfs_file_command_single_build(command->file_command.files[c_file]);
+
+ (*EVFS_PLUGIN_FILE(plugin)->functions->evfs_dir_list)
(client, tmp_command,
&directory_list);
+
+ evfs_cleanup_file_command(tmp_command);
+
if (directory_list) {
evfs_filereference *file = NULL;
@@ -739,5 +747,18 @@
printf("Original location: %s -- file: %s\n", desk->path, path);
evfs_handle_file_copy(client, f_command, f_command, 1);
+ }
+}
+
+void evfs_handle_auth_respond_command(evfs_client* client, evfs_command*
command)
+{
+ evfs_plugin* plugin = NULL;
+ int ret = 0;
+
+ plugin =
+
evfs_get_plugin_for_uri(client->server,command->file_command.files[0]->plugin_uri);
+
+ if (plugin) {
+
(*EVFS_PLUGIN_FILE(plugin)->functions->evfs_auth_push)(command);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evfs_worker.c 11 Aug 2007 10:39:02 -0000 1.1
+++ evfs_worker.c 13 Aug 2007 03:05:21 -0000 1.2
@@ -1,7 +1,7 @@
/*
-Copyright (C) 2005-2006 Alexander Taylor <[EMAIL PROTECTED]>.
+Copyright (C) 2005-2007 Alexander Taylor <[EMAIL PROTECTED]>.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
@@ -157,6 +157,11 @@
evfs_handle_trash_restore_command(client,command);
break;
+ case EVFS_CMD_AUTH_RESPONSE:
+ printf("Got auth response command..\n");
+ evfs_handle_auth_respond_command(client,command);
+ break;
+
default:
printf("Warning - unhandled command %d\n", command->type);
break;
@@ -473,6 +478,8 @@
int
main(int argc, char **argv)
{
+ char* search;
+
/*Init the ipc server */
if (ecore_ipc_init() < 1)
return (1);
@@ -508,8 +515,13 @@
worker_client->server = server;
if (argc > 0) {
- worker_client->id = atoi(argv[0]);
- printf("Created new worker, ID: %d\n", worker_client->id);
+ if (strstr(argv[0] , "worker")) {
+ worker_client->id = atoi(argv[1]);
+ printf("Created new worker, ID: %d\n", worker_client->id);
+ } else {
+ worker_client->id = atoi(argv[0]);
+ printf("Created new worker, ID: %d\n", worker_client->id);
+ }
}
printf("Created new worker, ID: %d\n", worker_client->id);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
