Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/lib
Modified Files:
evfs_commands.c libevfs.c
Log Message:
Indenting
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/lib/evfs_commands.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evfs_commands.c 2 Feb 2006 21:56:29 -0000 1.17
+++ evfs_commands.c 3 Feb 2006 23:12:13 -0000 1.18
@@ -1,168 +1,183 @@
#include "evfs.h"
-void evfs_monitor_add(evfs_connection* conn, evfs_filereference* ref) {
- evfs_command* command = NEW(evfs_command);
-
- /*printf("Adding a monitor on: '%s' using '%s'\n", ref->path,
ref->plugin_uri);*/
+void
+evfs_monitor_add(evfs_connection * conn, evfs_filereference * ref)
+{
+ evfs_command *command = NEW(evfs_command);
- command->type = EVFS_CMD_STARTMON_FILE;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*));
- command->file_command.files[0] = ref;
+ /*printf("Adding a monitor on: '%s' using '%s'\n", ref->path,
ref->plugin_uri); */
+ command->type = EVFS_CMD_STARTMON_FILE;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *));
+ command->file_command.files[0] = ref;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
-
-
- free(command);
+ free(command);
}
-void evfs_monitor_remove(evfs_connection* conn, evfs_filereference* ref) {
- evfs_command* command = NEW(evfs_command);
-
-
- command->type = EVFS_CMD_STOPMON_FILE;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*));
- command->file_command.files[0] = ref;
+void
+evfs_monitor_remove(evfs_connection * conn, evfs_filereference * ref)
+{
+ evfs_command *command = NEW(evfs_command);
- evfs_write_command(conn, command);
+ command->type = EVFS_CMD_STOPMON_FILE;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *));
+ command->file_command.files[0] = ref;
-
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
-void evfs_client_file_remove(evfs_connection* conn, evfs_filereference* ref) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_file_remove(evfs_connection * conn, evfs_filereference * ref)
+{
+ evfs_command *command = NEW(evfs_command);
+ command->type = EVFS_CMD_REMOVE_FILE;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *));
+ command->file_command.files[0] = ref;
- command->type = EVFS_CMD_REMOVE_FILE;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*));
- command->file_command.files[0] = ref;
+ evfs_write_command(conn, command);
- evfs_write_command(conn, command);
-
- free(command);
+ free(command);
}
-void evfs_client_file_rename(evfs_connection* conn, evfs_filereference* from,
evfs_filereference* to) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_file_rename(evfs_connection * conn, evfs_filereference * from,
+ evfs_filereference * to)
+{
+ evfs_command *command = NEW(evfs_command);
- printf("Renaming a file..\n");
+ printf("Renaming a file..\n");
- command->type = EVFS_CMD_RENAME_FILE;
- command->file_command.num_files = 2;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*2);
- command->file_command.files[0] = from;
- command->file_command.files[1] = to;
+ command->type = EVFS_CMD_RENAME_FILE;
+ command->file_command.num_files = 2;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 2);
+ command->file_command.files[0] = from;
+ command->file_command.files[1] = to;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
-void evfs_client_file_stat(evfs_connection* conn, evfs_filereference* file) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_file_stat(evfs_connection * conn, evfs_filereference * file)
+{
+ evfs_command *command = NEW(evfs_command);
- printf("Stat'ing a file..\n");
+ printf("Stat'ing a file..\n");
- command->type = EVFS_CMD_FILE_STAT;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*1);
- command->file_command.files[0] = file;
+ command->type = EVFS_CMD_FILE_STAT;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 1);
+ command->file_command.files[0] = file;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
-void evfs_client_dir_list(evfs_connection* conn, evfs_filereference* file) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_dir_list(evfs_connection * conn, evfs_filereference * file)
+{
+ evfs_command *command = NEW(evfs_command);
- printf("Listing a directory..\n");
+ printf("Listing a directory..\n");
- command->type = EVFS_CMD_LIST_DIR;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*1);
- command->file_command.files[0] = file;
+ command->type = EVFS_CMD_LIST_DIR;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 1);
+ command->file_command.files[0] = file;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
-void evfs_client_file_copy(evfs_connection* conn, evfs_filereference* from,
evfs_filereference* to) {
-
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_file_copy(evfs_connection * conn, evfs_filereference * from,
+ evfs_filereference * to)
+{
+
+ evfs_command *command = NEW(evfs_command);
- /*printf("Copying a file..\n");*/
+ /*printf("Copying a file..\n"); */
- command->type = EVFS_CMD_FILE_COPY;
- command->file_command.num_files = 2;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*2);
- command->file_command.files[0] = from;
- command->file_command.files[1] = to;
+ command->type = EVFS_CMD_FILE_COPY;
+ command->file_command.num_files = 2;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 2);
+ command->file_command.files[0] = from;
+ command->file_command.files[1] = to;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
-void evfs_client_file_open(evfs_connection* conn, evfs_filereference* file) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_file_open(evfs_connection * conn, evfs_filereference * file)
+{
+ evfs_command *command = NEW(evfs_command);
- fprintf(stderr, "Opening a file..\n");
+ fprintf(stderr, "Opening a file..\n");
- command->type = EVFS_CMD_FILE_OPEN;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*1);
- command->file_command.files[0] = file;
+ command->type = EVFS_CMD_FILE_OPEN;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 1);
+ command->file_command.files[0] = file;
- evfs_write_command(conn, command);
+ evfs_write_command(conn, command);
- free(command);
+ free(command);
}
+void
+evfs_client_file_read(evfs_connection * conn, evfs_filereference * file,
+ int read_size)
+{
+ evfs_command *command = NEW(evfs_command);
-void evfs_client_file_read(evfs_connection* conn, evfs_filereference* file,
int read_size) {
- evfs_command* command = NEW(evfs_command);
+ //printf("Reading a file..\n");
- //printf("Reading a file..\n");
+ command->type = EVFS_CMD_FILE_READ;
+ command->file_command.num_files = 1;
+ command->file_command.files = malloc(sizeof(evfs_filereference *) * 1);
+ command->file_command.files[0] = file;
+ command->file_command.extra = read_size;
- command->type = EVFS_CMD_FILE_READ;
- command->file_command.num_files = 1;
- command->file_command.files = malloc(sizeof(evfs_filereference*)*1);
- command->file_command.files[0] = file;
- command->file_command.extra = read_size;
+ evfs_write_command(conn, command);
- evfs_write_command(conn, command);
-
- free(command);
+ free(command);
}
-void evfs_client_operation_respond(evfs_connection* conn, long opid,
evfs_operation_response response) {
- evfs_command* command = NEW(evfs_command);
+void
+evfs_client_operation_respond(evfs_connection * conn, long opid,
+ evfs_operation_response response)
+{
+ evfs_command *command = NEW(evfs_command);
- //printf("Reading a file..\n");
+ //printf("Reading a file..\n");
- command->type = EVFS_CMD_OPERATION_RESPONSE;
+ command->type = EVFS_CMD_OPERATION_RESPONSE;
- printf("Command type for op response: %d\n", command->type);
- command->op = NEW(evfs_operation);
- command->op->id = opid;
- command->op->response = response;
+ printf("Command type for op response: %d\n", command->type);
+ command->op = NEW(evfs_operation);
+ command->op->id = opid;
+ command->op->response = response;
- printf("Command type for op response: %d\n", command->type);
- evfs_write_command(conn, command);
-
- free(command->op);
- free(command);
-}
+ printf("Command type for op response: %d\n", command->type);
+ evfs_write_command(conn, command);
+ free(command->op);
+ free(command);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/lib/libevfs.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- libevfs.c 23 Jan 2006 10:59:33 -0000 1.31
+++ libevfs.c 3 Feb 2006 23:12:13 -0000 1.32
@@ -1,503 +1,592 @@
#include "evfs.h"
-
#define MAX_ATTEMPTS 5
-Ecore_List* client_list = NULL;
+Ecore_List *client_list = NULL;
static int libevfs_registered_callback = 0;
/*It would seem a good idea to convert this to a hash - but we'd need the
actual pointer to the int, or make an ecore_int_hash*/
-evfs_connection* evfs_get_connection_for_id(int id) {
- evfs_connection* conn;
-
- ecore_list_goto_first(client_list);
-
- while ( (conn = ecore_list_next(client_list))) {
- if (conn->id == id) return conn;
- }
+evfs_connection *
+evfs_get_connection_for_id(int id)
+{
+ evfs_connection *conn;
+
+ ecore_list_goto_first(client_list);
+
+ while ((conn = ecore_list_next(client_list)))
+ {
+ if (conn->id == id)
+ return conn;
+ }
+
+ return NULL;
- return NULL;
-
}
-int evfs_server_data (void* data, int type, void* event) {
+int
+evfs_server_data(void *data, int type, void *event)
+{
Ecore_Ipc_Event_Server_Data *e;
- if ((e = (Ecore_Ipc_Event_Server_Data *) event)) {
- /*Special case, if it's an id notify, we can't really id the client
without it*/
-
- if (e->major == EVFS_EV_NOTIFY_ID) {
- /*We have an id, assign it to the most recent client*/
- /*This assumes we don't drop anything - this could be
dangerous*/
-
- evfs_connection* client;
- ecore_list_goto_first(client_list);
- if ( (client = ecore_list_next(client_list))) {
-
-
- /*We have a client, let's see if it needs an id*/
- if (client->id == MAX_CLIENT) {
- memcpy(&client->id, e->data, sizeof(unsigned
long));
- } else {
- fprintf(stderr, "Error, client already has
an assigned id. Dropped packet?\n");
- return 1;
- }
- }
-
- } else {
-
- /*Get the connection associated with this ipc ref*/
- /*we should probably use a hash here, but we aren't, for two
reasons:
- * 1: We don't even have a key until the server assigns us
one
- * 2: Most clients will only have one connection, giving
us O(n) (worst) -> O(1) (best)
- */
-
- evfs_connection* conn = evfs_get_connection_for_id(e->ref);
-
- if (conn) {
- ecore_ipc_message *msg =
ecore_ipc_message_new(e->major, e->minor, e->ref, e->ref_to, e->response,
e->data, e->size);
-
- if (conn->prog_event == NULL) {
- /*We haven't started an event yet - make a
new one*/
- conn->prog_event = NEW(evfs_event);
- }
-
- if (evfs_read_event(conn->prog_event, msg)) {
- /*True return == Event fully read*/
-
- /*Execute callback if registered..*/
- if (conn->callback_func) {
-
- evfs_event* ev = conn->prog_event;
- (*conn->callback_func)(ev,
conn->obj);
- } else {
- printf("EVFS: Alert - no callback
registered for event\n");
- }
-
- /*Now cleanup the event we send back*/
- evfs_cleanup_event(conn->prog_event);
- conn->prog_event = NULL; /*Detach this event
from the conn. Client is responsible for it now*/
-
- }
- free(msg);
-
- } else {
- fprintf(stderr, "EVFS: Could not find connection for
clientId\n");
- }
- }
- }
-}
-int evfs_server_spawn() {
- const char* server_exe = BINDIR "/evfs";
+ if ((e = (Ecore_Ipc_Event_Server_Data *) event))
+ {
+ /*Special case, if it's an id notify, we can't really id the client
without it */
+
+ if (e->major == EVFS_EV_NOTIFY_ID)
+ {
+ /*We have an id, assign it to the most recent client */
+ /*This assumes we don't drop anything - this could be dangerous */
+
+ evfs_connection *client;
+
+ ecore_list_goto_first(client_list);
+ if ((client = ecore_list_next(client_list)))
+ {
+
+ /*We have a client, let's see if it needs an id */
+ if (client->id == MAX_CLIENT)
+ {
+ memcpy(&client->id, e->data, sizeof(unsigned long));
+ }
+ else
+ {
+ fprintf(stderr,
+ "Error, client already has an assigned id.
Dropped packet?\n");
+ return 1;
+ }
+ }
+
+ }
+ else
+ {
+
+ /*Get the connection associated with this ipc ref */
+ /*we should probably use a hash here, but we aren't, for two
reasons:
+ * 1: We don't even have a key until the server assigns us one
+ * 2: Most clients will only have one connection, giving us
O(n) (worst) -> O(1) (best)
+ */
+
+ evfs_connection *conn = evfs_get_connection_for_id(e->ref);
+
+ if (conn)
+ {
+ ecore_ipc_message *msg =
+ ecore_ipc_message_new(e->major, e->minor, e->ref,
+ e->ref_to, e->response, e->data,
+ e->size);
+
+ if (conn->prog_event == NULL)
+ {
+ /*We haven't started an event yet - make a new one */
+ conn->prog_event = NEW(evfs_event);
+ }
+
+ if (evfs_read_event(conn->prog_event, msg))
+ {
+ /*True return == Event fully read */
+
+ /*Execute callback if registered.. */
+ if (conn->callback_func)
+ {
+
+ evfs_event *ev = conn->prog_event;
+
+ (*conn->callback_func) (ev, conn->obj);
+ }
+ else
+ {
+ printf
+ ("EVFS: Alert - no callback registered for
event\n");
+ }
+
+ /*Now cleanup the event we send back */
+ evfs_cleanup_event(conn->prog_event);
+ conn->prog_event = NULL; /*Detach this event from the
conn. Client is responsible for it now */
+
+ }
+ free(msg);
+
+ }
+ else
+ {
+ fprintf(stderr,
+ "EVFS: Could not find connection for clientId\n");
+ }
+ }
+ }
+}
- if (!access(server_exe, X_OK | R_OK)) {
- setsid();
- if (fork() == 0) {
- execl(server_exe, server_exe, NULL);
- }
- return 1;
- } else {
- fprintf(stderr, "You don't have rights to execute the
server\n");
- return 1;
- }
+int
+evfs_server_spawn()
+{
+ const char *server_exe = BINDIR "/evfs";
+
+ if (!access(server_exe, X_OK | R_OK))
+ {
+ setsid();
+ if (fork() == 0)
+ {
+ execl(server_exe, server_exe, NULL);
+ }
+ return 1;
+ }
+ else
+ {
+ fprintf(stderr, "You don't have rights to execute the server\n");
+ return 1;
+ }
- return 0;
+ return 0;
}
-evfs_connection* evfs_connect(void (*callback_func)(evfs_event*, void*), void
*obj) {
- ecore_init();
- ecore_ipc_init();
- int connect_attempts = 0;
-
- evfs_connection* connection = NEW(evfs_connection);
- connection->id = MAX_CLIENT;
- connection->prog_event = NULL;
- connection->callback_func = callback_func;
- connection->obj = obj;
-
- evfs_io_initialise();
- evfs_vfolder_initialise();
-
- if (!libevfs_registered_callback) {
- libevfs_registered_callback = 1;
- ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA,
evfs_server_data, NULL);
- client_list = ecore_list_new();
-
- ecore_list_append(client_list, connection);
- } else {
- ecore_list_prepend(client_list, connection);
- }
-
- retry:
-
- if (connect_attempts > MAX_ATTEMPTS) {
- fprintf(stderr, "Could not start server after max attempts\n");
- exit(1); /*We shouldn't really kill the libraries parent!*/
- return NULL;
- }
-
- if ( !(connection->server =
ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, EVFS_IPC_TITLE, 0, NULL)) ) {
- fprintf(stderr, "Cannot connect to evfs server with '%s',
making new server and trying again..\n", EVFS_IPC_TITLE);
-
- if (!connect_attempts) {
- if (evfs_server_spawn()) {
- printf ("Failure to start evfs server!\n");
- }
- }
-
- connect_attempts++;
- usleep(100000*connect_attempts);
- goto retry;
-
- }
-
+evfs_connection *
+evfs_connect(void (*callback_func) (evfs_event *, void *), void *obj)
+{
+ ecore_init();
+ ecore_ipc_init();
+ int connect_attempts = 0;
+
+ evfs_connection *connection = NEW(evfs_connection);
+
+ connection->id = MAX_CLIENT;
+ connection->prog_event = NULL;
+ connection->callback_func = callback_func;
+ connection->obj = obj;
+
+ evfs_io_initialise();
+ evfs_vfolder_initialise();
+
+ if (!libevfs_registered_callback)
+ {
+ libevfs_registered_callback = 1;
+ ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, evfs_server_data,
+ NULL);
+ client_list = ecore_list_new();
+
+ ecore_list_append(client_list, connection);
+ }
+ else
+ {
+ ecore_list_prepend(client_list, connection);
+ }
+
+ retry:
+
+ if (connect_attempts > MAX_ATTEMPTS)
+ {
+ fprintf(stderr, "Could not start server after max attempts\n");
+ exit(1); /*We shouldn't really kill the libraries
parent! */
+ return NULL;
+ }
+
+ if (!
+ (connection->server =
+ ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, EVFS_IPC_TITLE, 0,
+ NULL)))
+ {
+ fprintf(stderr,
+ "Cannot connect to evfs server with '%s', making new server
and trying again..\n",
+ EVFS_IPC_TITLE);
+
+ if (!connect_attempts)
+ {
+ if (evfs_server_spawn())
+ {
+ printf("Failure to start evfs server!\n");
+ }
+ }
+
+ connect_attempts++;
+ usleep(100000 * connect_attempts);
+ goto retry;
+ }
-
+ return connection;
+}
- return connection;
+void
+evfs_disconnect(evfs_connection * connection)
+{
+ ecore_ipc_server_del(connection->server);
}
+Ecore_DList *
+evfs_tokenize_uri(char *uri)
+{
+ Ecore_DList *tokens = ecore_dlist_new();
+ Ecore_List *reserved = ecore_dlist_new();
+ Ecore_List *plugin = ecore_dlist_new();
+
+ char *dup_uri = malloc(strlen(uri) + 2);
+
+ /*dup_uri = realloc(dup_uri, strlen(uri)+2);
+ * strcat(dup_uri," "); */
+
+ char *l_uri = dup_uri;
+ int solid_alpha = 0;
+ int new_alpha = 0;
+ evfs_uri_token *token;
+ char *cmp;
+ char tmp_tok[255]; /*This need to be longer? */
+ int i = 0;
+ int j = 1;
+ char c = '1';
+ int len = 0;
+
+ snprintf(dup_uri, strlen(uri) + 1, "%s ", uri);
+
+ ecore_list_append(plugin, "smb"); /*Shift these to register when a
plugin registers */
+ ecore_list_append(plugin, "posix");
+ ecore_list_append(plugin, "tar");
+ ecore_list_append(plugin, "bzip2");
+ ecore_list_append(plugin, "ftp");
+ ecore_list_append(plugin, "gzip");
+
+ ecore_list_append(reserved, "://");
+ ecore_list_append(reserved, "@");
+ ecore_list_append(reserved, "/");
+ ecore_list_append(reserved, ":");
+ ecore_list_append(reserved, "#");
+ ecore_list_append(reserved, ";");
+
+ //printf ("Lexing '%s'\n", dup_uri);
+ //printf("Strlen(uri): %d\n", strlen(uri));
+
+ while (j <= strlen(dup_uri))
+ {
+ new_alpha = isalnum(l_uri[i]) | l_uri[i] == '.';
+ len = 0;
+
+ strncpy(tmp_tok, l_uri, 3);
+ tmp_tok[3] = '\0';
+ //printf("Current token is: '%s'\n", tmp_tok);
+
+ /*Check if it's an operator */
+ ecore_list_goto_first(reserved);
+ while ((cmp = ecore_list_next(reserved)))
+ {
+ if (!strncmp(tmp_tok, cmp, strlen(cmp)))
+ {
+ //printf("Found token (operator) %s, added %d to l_uri\n",
cmp, strlen(cmp));
+ l_uri += strlen(cmp);
+ len = strlen(cmp);
+ i = 0;
+
+ //printf("L_URI becomes '%s'\n", l_uri);
+ token = NEW(evfs_uri_token);
+ token->token_s = strdup(cmp);
+ token->type = EVFS_URI_TOKEN_OPERATOR;
+ ecore_dlist_append(tokens, token);
+ bzero(tmp_tok, 255);
+
+ goto cont_loop;
+ }
+ }
+
+ /*Check if it's a keyword */
+ strncpy(tmp_tok, l_uri, i);
+ tmp_tok[i] = '\0';
+ //printf("Current token (keyword match) is: '%s'\n", tmp_tok);
+
+ ecore_list_goto_first(plugin);
+ while ((cmp = ecore_list_next(plugin)))
+ {
+ if (!strncmp(tmp_tok, cmp, strlen(cmp)))
+ {
+ //printf("Found token (keyword) %s, added %d to l_uri\n",
cmp, strlen(cmp));
+
+ l_uri += strlen(cmp);
+ i = 0;
+ //printf("L_URI becomes '%s'\n", l_uri);
+
+ token = NEW(evfs_uri_token);
+ token->token_s = strdup(cmp);
+ token->type = EVFS_URI_TOKEN_KEYWORD;
+ ecore_dlist_append(tokens, token);
+ bzero(tmp_tok, 255);
+
+ goto cont_loop; /*Eww goto - but we're in two while
loops */
+ }
+
+ }
+
+ if (solid_alpha && !new_alpha)
+ {
+ strncpy(tmp_tok, l_uri, i);
+
+ /*There is a lexer position bug for now- this will fix it FIXME */
+ if (tmp_tok[0] == '\0')
+ goto lexer_done;
+
+ tmp_tok[i] = '\0';
+
+ //printf ("Looks like a string..\n");
+ //printf("Found string: '%s', i is %d, j is %d, strlen(dup_uri)
is %d\n", tmp_tok,i,j,strlen(dup_uri));
+
+ token = NEW(evfs_uri_token);
+ token->token_s = strdup(tmp_tok);
+ token->type = EVFS_URI_TOKEN_STRING;
+ ecore_dlist_append(tokens, token);
+ bzero(tmp_tok, 255);
+
+ l_uri += i;
+ i = 0;
+ }
+
+ solid_alpha = new_alpha;
+
+ cont_loop:
+ if (!len)
+ j++;
+ else if (len - 1 > 0)
+ j += len - 1;
+ else
+ j += len;
+ i++;
+ //printf("i:J (%d:%d) - %d\n", i,j,strlen(dup_uri));
+ }
+
+ lexer_done:
+
+ /*This is really evil - we assume the last token is a string */
+ /*There is something wrong with the offsets above if this is
+ * the case*/
+ if (strlen(tmp_tok) > 0)
+ {
+ token = NEW(evfs_uri_token);
+ token->token_s = strdup(tmp_tok);
+ token->type = EVFS_URI_TOKEN_STRING;
+ ecore_dlist_append(tokens, token);
+ }
-void evfs_disconnect(evfs_connection* connection) {
- ecore_ipc_server_del(connection->server);
-}
+ ecore_dlist_destroy(plugin);
+ ecore_dlist_destroy(reserved);
-Ecore_DList* evfs_tokenize_uri(char* uri) {
- Ecore_DList* tokens = ecore_dlist_new();
- Ecore_List* reserved = ecore_dlist_new();
- Ecore_List* plugin = ecore_dlist_new();
-
- char* dup_uri = malloc(strlen(uri) + 2);
-
- /*dup_uri = realloc(dup_uri, strlen(uri)+2);
- strcat(dup_uri," ");*/
-
- char* l_uri = dup_uri;
- int solid_alpha = 0;
- int new_alpha = 0;
- evfs_uri_token* token;
- char* cmp;
- char tmp_tok[255]; /*This need to be longer?*/
- int i = 0;
- int j=1;
- char c='1';
- int len=0;
-
- snprintf(dup_uri, strlen(uri)+1, "%s ", uri);
-
- ecore_list_append(plugin, "smb"); /*Shift these to register when a
plugin registers*/
- ecore_list_append(plugin, "posix");
- ecore_list_append(plugin, "tar");
- ecore_list_append(plugin, "bzip2");
- ecore_list_append(plugin, "ftp");
- ecore_list_append(plugin, "gzip");
-
-
- ecore_list_append(reserved, "://");
- ecore_list_append(reserved, "@");
- ecore_list_append(reserved, "/");
- ecore_list_append(reserved, ":");
- ecore_list_append(reserved, "#");
- ecore_list_append(reserved, ";");
-
- //printf ("Lexing '%s'\n", dup_uri);
- //printf("Strlen(uri): %d\n", strlen(uri));
-
- while (j <= strlen(dup_uri)) {
- new_alpha = isalnum(l_uri[i]) | l_uri[i] == '.';
- len=0;
-
- strncpy(tmp_tok, l_uri, 3);
- tmp_tok[3] = '\0';
- //printf("Current token is: '%s'\n", tmp_tok);
-
- /*Check if it's an operator*/
- ecore_list_goto_first(reserved);
- while ( (cmp = ecore_list_next(reserved))) {
- if (!strncmp(tmp_tok, cmp, strlen(cmp)) ) {
- //printf("Found token (operator) %s, added %d
to l_uri\n", cmp, strlen(cmp));
- l_uri += strlen(cmp);
- len=strlen(cmp);
- i = 0;
-
- //printf("L_URI becomes '%s'\n", l_uri);
- token = NEW(evfs_uri_token);
- token->token_s = strdup(cmp);
- token->type = EVFS_URI_TOKEN_OPERATOR;
- ecore_dlist_append(tokens, token);
- bzero(tmp_tok, 255);
-
- goto cont_loop;
- }
- }
-
- /*Check if it's a keyword*/
- strncpy(tmp_tok, l_uri, i);
- tmp_tok[i] = '\0';
- //printf("Current token (keyword match) is: '%s'\n", tmp_tok);
-
- ecore_list_goto_first(plugin);
- while ( (cmp = ecore_list_next(plugin))) {
- if (!strncmp(tmp_tok, cmp, strlen(cmp)) ) {
- //printf("Found token (keyword) %s, added %d to
l_uri\n", cmp, strlen(cmp));
-
- l_uri += strlen(cmp);
- i = 0;
- //printf("L_URI becomes '%s'\n", l_uri);
-
- token = NEW(evfs_uri_token);
- token->token_s = strdup(cmp);
- token->type = EVFS_URI_TOKEN_KEYWORD;
- ecore_dlist_append(tokens, token);
- bzero(tmp_tok,255);
-
- goto cont_loop; /*Eww goto - but we're in two
while loops*/
- }
-
- }
-
- if (solid_alpha && !new_alpha) {
- strncpy(tmp_tok, l_uri, i);
-
- /*There is a lexer position bug for now- this will fix
it FIXME*/
- if (tmp_tok[0] == '\0') goto lexer_done;
-
- tmp_tok[i] = '\0';
-
- //printf ("Looks like a string..\n");
- //printf("Found string: '%s', i is %d, j is %d,
strlen(dup_uri) is %d\n", tmp_tok,i,j,strlen(dup_uri));
-
- token = NEW(evfs_uri_token);
- token->token_s = strdup(tmp_tok);
- token->type = EVFS_URI_TOKEN_STRING;
- ecore_dlist_append(tokens, token);
- bzero(tmp_tok, 255);
-
- l_uri += i;
- i=0;
- }
-
-
- solid_alpha = new_alpha;
-
- cont_loop:
- if (!len)
- j++;
- else
- if (len-1>0)
- j+=len-1;
- else
- j+=len;
- i++;
- //printf("i:J (%d:%d) - %d\n", i,j,strlen(dup_uri));
- }
-
- lexer_done:
-
- /*This is really evil - we assume the last token is a string*/
- /*There is something wrong with the offsets above if this is
- * the case*/
- if (strlen(tmp_tok) > 0) {
- token = NEW(evfs_uri_token);
- token->token_s = strdup(tmp_tok);
- token->type = EVFS_URI_TOKEN_STRING;
- ecore_dlist_append(tokens, token);
- }
-
-
- ecore_dlist_destroy(plugin);
- ecore_dlist_destroy(reserved);
-
- free(dup_uri);
- return tokens;
+ free(dup_uri);
+ return tokens;
}
-evfs_uri_token* evfs_token_expect(Ecore_DList* tokens, evfs_uri_token_type
type, char* tok) {
- evfs_uri_token* token;
-
- token = ecore_dlist_next(tokens);
- /*if (token) {
- printf("Token string:\n");
- printf("'%s'\n", token->token_s);
- }*/
-
-
- if (token && token->type == type && (tok == NULL ||
!strcmp(token->token_s, tok))) {
- //printf("Got expected token type, '%s'\n", token->token_s);
- return token;
- } else {
- ecore_dlist_previous(tokens);
- //printf("Didn't get expected token type, '%s'\n",
token->token_s);
- return NULL;
- }
+evfs_uri_token *
+evfs_token_expect(Ecore_DList * tokens, evfs_uri_token_type type, char *tok)
+{
+ evfs_uri_token *token;
+
+ token = ecore_dlist_next(tokens);
+ /*if (token) {
+ * printf("Token string:\n");
+ * printf("'%s'\n", token->token_s);
+ * } */
+
+ if (token && token->type == type
+ && (tok == NULL || !strcmp(token->token_s, tok)))
+ {
+ //printf("Got expected token type, '%s'\n", token->token_s);
+ return token;
+ }
+ else
+ {
+ ecore_dlist_previous(tokens);
+ //printf("Didn't get expected token type, '%s'\n", token->token_s);
+ return NULL;
+ }
}
-void evfs_token_list_free(Ecore_DList* tokens) {
- evfs_uri_token* token;
-
- ecore_dlist_goto_first(tokens);
- while ( (token = ecore_dlist_next(tokens))) {
- free(token->token_s);
- free(token);
- }
- ecore_dlist_destroy(tokens);
+void
+evfs_token_list_free(Ecore_DList * tokens)
+{
+ evfs_uri_token *token;
+
+ ecore_dlist_goto_first(tokens);
+ while ((token = ecore_dlist_next(tokens)))
+ {
+ free(token->token_s);
+ free(token);
+ }
+ ecore_dlist_destroy(tokens);
}
-
/*Function to parse a uri*/
/*We should rewrite this,use a proper parser*/
-evfs_file_uri_path* evfs_parse_uri(char* uri) {
- char* pos;
- char* tok;
- evfs_uri_token* token;
- int i;
- evfs_filereference* ref= NULL, *new_ref = NULL, *root_ref = NULL,
*bottom_ref = NULL;
- evfs_file_uri_path* path = NEW(evfs_file_uri_path);
- Ecore_DList* tokens;
-
- //printf("Parsing URI '%s'\n", uri);
-
- /*for (i=0;i<strlen(uri);i++) {
- printf("URI Input: '%s'\n", uri);
- }*/
-
- tokens = evfs_tokenize_uri(uri);
- ecore_dlist_goto_first(tokens);
- while ( (token = ecore_dlist_next(tokens)) ) {
- //printf("Token str: '%s'\n", token->token_s);
- }
- ecore_dlist_goto_first(tokens);
-
-
- start_uri_section:
-
- new_ref = NEW(evfs_filereference);
- if (!ref) {
- new_ref->parent = NULL;
- } else {
- new_ref->parent = ref;
- }
-
-
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_KEYWORD, NULL);
- if (token) {
- /*Should be a plugin, assume it is (bad)*/
- new_ref->plugin_uri = strdup(token->token_s);
- } else {
- printf("Couldn't get a plugin uri, token was (instead):
'%s'\n", token->token_s);
- }
-
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "://"); /*
'://' */
-
- /*Auth included?*/
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "/");
- if (!token) {
- /*Looks like we have an auth structure...*/
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_STRING, NULL);
- if (token) {
- //printf("Username is '%s'\n", token->token_s);
- new_ref->username = strdup(token->token_s);
- }
-
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR,
":"); /* ':' */
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_STRING, NULL);
-
- if (token) {
- //printf("Password is '%s'\n", token->token_s);
- new_ref->password = strdup(token->token_s);
- }
-
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR,
"@"); /* '@' */
-
- token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR,
"/"); /* '/' */
- }
-
- if (token) {
- new_ref->path = malloc(strlen(token->token_s) + 1);
- strcpy(new_ref->path, token->token_s);
- } else {
- new_ref->path = calloc(1,1);
- }
-
- /*Blindly get the rest of the tokens and append*/
- while ((token = ecore_dlist_next(tokens))) {
-
- if (!strcmp(token->token_s, "#")) break;
-
-
- new_ref->path = realloc(new_ref->path, strlen(new_ref->path) +
strlen(token->token_s) + 1);
- new_ref->path = strcat(new_ref->path, token->token_s);
- }
-
- if (token && !strcmp(token->token_s, "#")) {
- ref = new_ref;
- if (!root_ref) root_ref = new_ref;
-
- goto start_uri_section;
- }
-
- if (!root_ref) root_ref = new_ref;
- bottom_ref = new_ref;
-
-
- path->files = malloc(sizeof(evfs_filereference*));
- path->num_files = 1;
- path->files[0] = bottom_ref;
+evfs_file_uri_path *
+evfs_parse_uri(char *uri)
+{
+ char *pos;
+ char *tok;
+ evfs_uri_token *token;
+ int i;
+ evfs_filereference *ref = NULL, *new_ref = NULL, *root_ref =
+ NULL, *bottom_ref = NULL;
+ evfs_file_uri_path *path = NEW(evfs_file_uri_path);
+ Ecore_DList *tokens;
+
+ //printf("Parsing URI '%s'\n", uri);
+
+ /*for (i=0;i<strlen(uri);i++) {
+ * printf("URI Input: '%s'\n", uri);
+ * } */
+
+ tokens = evfs_tokenize_uri(uri);
+ ecore_dlist_goto_first(tokens);
+ while ((token = ecore_dlist_next(tokens)))
+ {
+ //printf("Token str: '%s'\n", token->token_s);
+ }
+ ecore_dlist_goto_first(tokens);
+
+ start_uri_section:
+
+ new_ref = NEW(evfs_filereference);
+ if (!ref)
+ {
+ new_ref->parent = NULL;
+ }
+ else
+ {
+ new_ref->parent = ref;
+ }
+
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_KEYWORD, NULL);
+ if (token)
+ {
+ /*Should be a plugin, assume it is (bad) */
+ new_ref->plugin_uri = strdup(token->token_s);
+ }
+ else
+ {
+ printf("Couldn't get a plugin uri, token was (instead): '%s'\n",
+ token->token_s);
+ }
+
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "://"); /*
'://' */
+
+ /*Auth included? */
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "/");
+ if (!token)
+ {
+ /*Looks like we have an auth structure... */
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_STRING, NULL);
+ if (token)
+ {
+ //printf("Username is '%s'\n", token->token_s);
+ new_ref->username = strdup(token->token_s);
+ }
+
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, ":");
/* ':' */
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_STRING, NULL);
+
+ if (token)
+ {
+ //printf("Password is '%s'\n", token->token_s);
+ new_ref->password = strdup(token->token_s);
+ }
+
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "@");
/* '@' */
+
+ token = evfs_token_expect(tokens, EVFS_URI_TOKEN_OPERATOR, "/");
/* '/' */
+ }
+
+ if (token)
+ {
+ new_ref->path = malloc(strlen(token->token_s) + 1);
+ strcpy(new_ref->path, token->token_s);
+ }
+ else
+ {
+ new_ref->path = calloc(1, 1);
+ }
+
+ /*Blindly get the rest of the tokens and append */
+ while ((token = ecore_dlist_next(tokens)))
+ {
+
+ if (!strcmp(token->token_s, "#"))
+ break;
+
+ new_ref->path =
+ realloc(new_ref->path,
+ strlen(new_ref->path) + strlen(token->token_s) + 1);
+ new_ref->path = strcat(new_ref->path, token->token_s);
+ }
+
+ if (token && !strcmp(token->token_s, "#"))
+ {
+ ref = new_ref;
+ if (!root_ref)
+ root_ref = new_ref;
+
+ goto start_uri_section;
+ }
+
+ if (!root_ref)
+ root_ref = new_ref;
+ bottom_ref = new_ref;
+
+ path->files = malloc(sizeof(evfs_filereference *));
+ path->num_files = 1;
+ path->files[0] = bottom_ref;
-
- evfs_token_list_free(tokens);
+ evfs_token_list_free(tokens);
- return path;
+ return path;
}
+char *
+evfs_filereference_to_string(evfs_filereference * ref)
+{
+ int length = 0;
+ char *uri;
+ Ecore_List *parent_list = ecore_list_new();
+ evfs_filereference *parent;
+
+ ecore_list_prepend(parent_list, ref);
+ length += strlen(ref->plugin_uri) + strlen("://");
+ if (ref->username)
+ {
+ length +=
+ strlen(ref->username) + strlen(ref->password) + strlen(":") +
+ strlen("@");
+ }
+ length += strlen(ref->path);
+
+ while ((parent = ref->parent))
+ {
+ ecore_list_prepend(parent_list, parent);
+
+ length += strlen(parent->plugin_uri) + strlen("://");
+ if (parent->username)
+ {
+ length +=
+ strlen(parent->username) + strlen(parent->password) +
+ strlen(":") + strlen("@");
+
+ }
+
+ length += strlen(parent->path);
+ length += strlen("#");
+
+ }
+ length += 1;
+ uri = calloc(length, sizeof(char));
+
+ while ((parent = ecore_list_remove_first(parent_list)))
+ {
+ strcat(uri, parent->plugin_uri);
+ strcat(uri, "://");
+ if (parent->username)
+ {
+ strcat(uri, parent->username);
+ strcat(uri, ":");
+ strcat(uri, parent->password);
+ strcat(uri, "@");
+ }
+ strcat(uri, parent->path);
+ if (ecore_list_next(parent_list))
+ strcat(uri, "#");
+ }
-char* evfs_filereference_to_string(evfs_filereference* ref) {
- int length=0;
- char* uri;
- Ecore_List* parent_list = ecore_list_new();
- evfs_filereference* parent;
-
- ecore_list_prepend(parent_list, ref);
- length += strlen(ref->plugin_uri) + strlen("://");
- if (ref->username) {
- length += strlen(ref->username) + strlen(ref->password) +
strlen(":") + strlen("@");
- }
- length += strlen(ref->path);
-
- while ( (parent = ref->parent)) {
- ecore_list_prepend(parent_list, parent);
-
- length += strlen(parent->plugin_uri) + strlen("://");
- if (parent->username) {
- length += strlen(parent->username) +
strlen(parent->password) + strlen(":") + strlen("@");
-
- }
-
- length += strlen(parent->path);
- length += strlen("#");
-
- }
- length += 1;
- uri = calloc(length,sizeof(char));
-
-
- while ( (parent = ecore_list_remove_first(parent_list))) {
- strcat(uri, parent->plugin_uri);
- strcat(uri, "://");
- if (parent->username) {
- strcat(uri, parent->username);
- strcat(uri, ":");
- strcat(uri, parent->password);
- strcat(uri, "@");
- }
- strcat(uri, parent->path);
- if (ecore_list_next(parent_list)) strcat(uri, "#");
- }
+ ecore_list_destroy(parent_list);
- ecore_list_destroy(parent_list);
+ return uri;
- return uri;
-
}
-
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
