diff options
author | beber <beber> | 2005-10-08 23:41:12 +0000 |
---|---|---|
committer | beber <beber> | 2005-10-08 23:41:12 +0000 |
commit | 0522028e875e10ca2c6c009db07094afba6b7e6d (patch) | |
tree | 2099e51ccc20199f3346c365493dd46c23c77546 /src | |
parent | indent (diff) | |
download | espik-0522028e875e10ca2c6c009db07094afba6b7e6d.tar.xz |
indent
Diffstat (limited to 'src')
-rw-r--r-- | src/espik_common_handler.c | 80 | ||||
-rw-r--r-- | src/espik_config.c | 90 | ||||
-rw-r--r-- | src/espik_irc.c | 212 |
3 files changed, 191 insertions, 191 deletions
diff --git a/src/espik_common_handler.c b/src/espik_common_handler.c index 2f81f8d..68a23e8 100644 --- a/src/espik_common_handler.c +++ b/src/espik_common_handler.c @@ -46,49 +46,49 @@ int server_data (void* data __UNUSED__, int ev_type __UNUSED__, int kb_get (void* data __UNUSED__, Ecore_Fd_Handler* fd_handler) { - char* kb; - char* tmp; - int count; - - kb = malloc (sizeof (char) * 200); - - do - { - memset (kb, 0, 200); - count = read (ecore_main_fd_handler_fd_get (fd_handler), kb, 198); - - if (count > 1) - { - del_backslash (kb); - tmp = irc_send (kb); - - if (tmp) - { - espik_raw_send (tmp); - free (tmp); - } - } - } - while (count >= 198); - - if (count == -1) - perror ("read"); - - if (count == 0) - { - tmp = irc_quit ("", "^D pressed"); - printf ("kb_get:\ntmp: %s\n", tmp); - espik_raw_send (tmp); - printf ("AFTER espik_raw_send\n"); + char* kb; + char* tmp; + int count; + + kb = malloc (sizeof (char) * 200); + + do + { + memset (kb, 0, 200); + count = read (ecore_main_fd_handler_fd_get (fd_handler), kb, 198); + + if (count > 1) + { + del_backslash (kb); + tmp = irc_send (kb); + + if (tmp) + { + espik_raw_send (tmp); + free (tmp); + } + } + } + while (count >= 198); + + if (count == -1) + perror ("read"); + + if (count == 0) + { + tmp = irc_quit ("", "^D pressed"); + printf ("kb_get:\ntmp: %s\n", tmp); + espik_raw_send (tmp); + printf ("AFTER espik_raw_send\n"); /* irc_disconnect(); */ - espik_con_shutdown (); + espik_con_shutdown (); - ecore_main_loop_quit (); + ecore_main_loop_quit (); - free (tmp); - return (0); - } + free (tmp); + return (0); + } - return (1); + return (1); } diff --git a/src/espik_config.c b/src/espik_config.c index 88e9097..5b00fb5 100644 --- a/src/espik_config.c +++ b/src/espik_config.c @@ -12,95 +12,95 @@ t_servinfo* espik_server_config_set (char* server, unsigned short port) { - t_servinfo* s_info; + t_servinfo* s_info; - s_info = malloc (sizeof (t_servinfo)); + s_info = malloc (sizeof (t_servinfo)); - s_info->host = server; - s_info->port = port; + s_info->host = server; + s_info->port = port; - return (s_info); + return (s_info); } t_userinfo* espik_user_sysinfo_get () { - struct passwd* pw; - t_userinfo* u_info; + struct passwd* pw; + t_userinfo* u_info; - pw = getpwuid (getuid ()); + pw = getpwuid (getuid ()); - u_info = malloc (sizeof (t_userinfo)); + u_info = malloc (sizeof (t_userinfo)); - u_info->nickname = pw->pw_name; - u_info->username = pw->pw_name; - u_info->realname = pw->pw_gecos; + u_info->nickname = pw->pw_name; + u_info->username = pw->pw_name; + u_info->realname = pw->pw_gecos; - return (u_info); + return (u_info); } void espik_config_default_set () { - t_userinfo* user_sysinfo; + t_userinfo* user_sysinfo; - ecore_config_string_default ("/config/server/0/host", "beber.melee"); - ecore_config_int_default ("/config/server/0/port", 6667); + ecore_config_string_default ("/config/server/0/host", "beber.melee"); + ecore_config_int_default ("/config/server/0/port", 6667); - user_sysinfo = espik_user_sysinfo_get (); + user_sysinfo = espik_user_sysinfo_get (); - ecore_config_string_default ("/config/user/nickname", + ecore_config_string_default ("/config/user/nickname", user_sysinfo->nickname); - ecore_config_string_default ("/config/user/username", + ecore_config_string_default ("/config/user/username", user_sysinfo->username); - ecore_config_string_default ("/config/user/realname", + ecore_config_string_default ("/config/user/realname", user_sysinfo->realname); - ecore_config_string_default ("/espik/version", ESPIK_VERSION); + ecore_config_string_default ("/espik/version", ESPIK_VERSION); - free (user_sysinfo); + free (user_sysinfo); } void espik_config_init () { - if (ecore_config_init (APPS_NAME) != ECORE_CONFIG_ERR_SUCC) - { - printf ("Cannot init Ecore_Config"); - exit (-1); - } + if (ecore_config_init (APPS_NAME) != ECORE_CONFIG_ERR_SUCC) + { + printf ("Cannot init Ecore_Config"); + exit (-1); + } - ecore_config_load (); + ecore_config_load (); } void espik_config_get (t_info *s_info) { - s_info->server = malloc (sizeof (t_servinfo)); - s_info->client = malloc (sizeof (t_userinfo)); + s_info->server = malloc (sizeof (t_servinfo)); + s_info->client = malloc (sizeof (t_userinfo)); - espik_config_default_set (); + espik_config_default_set (); - s_info->server->host = ecore_config_string_get ("/config/server/0/host"); - s_info->server->port + s_info->server->host = ecore_config_string_get ("/config/server/0/host"); + s_info->server->port = (unsigned short)ecore_config_int_get ("/config/server/0/port"); - s_info->client->nickname + s_info->client->nickname = ecore_config_string_get ("/config/user/nickname"); - s_info->client->username + s_info->client->username = ecore_config_string_get ("/config/user/username"); - s_info->client->realname + s_info->client->realname = ecore_config_string_get ("/config/user/realname"); - ecore_config_save (); + ecore_config_save (); } void espik_config_set (t_info config) { - ecore_config_int_set ("/config/server/len", 1); - ecore_config_string_set ("/config/server/0/host", config.server->host); - ecore_config_int_set ("/config/server/0/port", (int)config.server->port); - ecore_config_int_set ("/config/server/0/autoconnect", 1); + ecore_config_int_set ("/config/server/len", 1); + ecore_config_string_set ("/config/server/0/host", config.server->host); + ecore_config_int_set ("/config/server/0/port", (int)config.server->port); + ecore_config_int_set ("/config/server/0/autoconnect", 1); - ecore_config_string_set ("/config/user/nickname", config.client->nickname); - ecore_config_string_set ("/config/user/username", config.client->username); - ecore_config_string_set ("/config/user/realname", config.client->realname); + ecore_config_string_set ("/config/user/nickname", config.client->nickname); + ecore_config_string_set ("/config/user/username", config.client->username); + ecore_config_string_set ("/config/user/realname", config.client->realname); - ecore_config_save (); + ecore_config_save (); } diff --git a/src/espik_irc.c b/src/espik_irc.c index 83412dc..8d62c29 100644 --- a/src/espik_irc.c +++ b/src/espik_irc.c @@ -21,147 +21,147 @@ typedef struct } cmd_t; cmd_t cmd_tab[] = { - { "JOIN", irc_join }, - { "PART", irc_part }, - { "PRIVMSG", irc_privmsg }, - { "QUIT", irc_quit }, - { "RAW", irc_raw }, + { "JOIN", irc_join }, + { "PART", irc_part }, + { "PRIVMSG", irc_privmsg }, + { "QUIT", irc_quit }, + { "RAW", irc_raw }, { "NICK", irc_nick }, /* { "ACTION", irc_action }, */ - { 0, 0 } + { 0, 0 } }; char** separate_commandline (char *msg) { - unsigned int len; - char** two_words; + unsigned int len; + char** two_words; - /* Yes, do nothing, just get len ! */ + /* Yes, do nothing, just get len ! */ for (len = 0; msg[len] != ' '; len++); - two_words = malloc (sizeof(char*) * 2); + two_words = malloc (sizeof(char*) * 2); - msg[len] = '\0'; - two_words[0] = msg; - two_words[1] = msg + len + 1; + msg[len] = '\0'; + two_words[0] = msg; + two_words[1] = msg + len + 1; - return (two_words); + return (two_words); } void string_upper (char *str) { - unsigned int len, i; + unsigned int len, i; - len = strlen (str); + len = strlen (str); - for (i = 0; i < len; i++) - { - if (str[i] >= 0x61 && str[i] <= 0x7A) - str[i] -= 0x20; - } + for (i = 0; i < len; i++) + { + if (str[i] >= 0x61 && str[i] <= 0x7A) + str[i] -= 0x20; + } printf("string_upper: %s\n", str); } unsigned short sendmsg_len (char* msg) { - return (strlen (msg) + 2); + return (strlen (msg) + 2); } char* irc_privmsg (char* chan, char* msg) { - char* out; - unsigned int len; + char* out; + unsigned int len; - len = strlen ("PRIVMSG") + 1 /* space */ + len = strlen ("PRIVMSG") + 1 /* space */ + strlen (chan) + 2 /* space: */ + strlen (msg) + 1; /* EOF */ - out = malloc (sizeof(char) * len); + out = malloc (sizeof(char) * len); - snprintf (out, len, "PRIVMSG %s :%s", chan, msg); + snprintf (out, len, "PRIVMSG %s :%s", chan, msg); - return (out); + return (out); } char* irc_join (char* chan __UNUSED__, char* msg) { - char* out; - int len; + char* out; + int len; /* COuld also by '&' and so one ... * have to look on RFC, dev will be done with # only */ - if (msg[0] != '#') - { - printf ("%s is not a channel\n", msg); - printf ("Usage: /JOIN #channel\n"); - return (0); - } - - len = strlen ("JOIN") + 1 + if (msg[0] != '#') + { + printf ("%s is not a channel\n", msg); + printf ("Usage: /JOIN #channel\n"); + return (0); + } + + len = strlen ("JOIN") + 1 + strlen (msg) + 1; - out = malloc (sizeof(char) * len); + out = malloc (sizeof(char) * len); - snprintf (out, len, "JOIN %s", msg); + snprintf (out, len, "JOIN %s", msg); - return (out); + return (out); } char* irc_part (char* chan, char* msg) { - char* out; - int len; + char* out; + int len; - if (msg[0] != '#') - { - len = strlen ("PART") + 1 + if (msg[0] != '#') + { + len = strlen ("PART") + 1 + strlen (chan) + 2 + strlen (msg) + 1; - printf ("irc_part: len: %d\n", len); - out = malloc (sizeof(char) * len); - snprintf (out, len, "PART %s :%s", chan, msg); - } - else - { - char** sep; - - sep = separate_commandline (msg); - len = strlen ("PART") + 1 + printf ("irc_part: len: %d\n", len); + out = malloc (sizeof(char) * len); + snprintf (out, len, "PART %s :%s", chan, msg); + } + else + { + char** sep; + + sep = separate_commandline (msg); + len = strlen ("PART") + 1 + strlen (sep[0]) + 2 + strlen (sep[1]) + 1; - out = malloc (sizeof(char) * len); - snprintf (out, len, "PART %s :%s", sep[0], sep[1]); - } + out = malloc (sizeof(char) * len); + snprintf (out, len, "PART %s :%s", sep[0], sep[1]); + } - return (out); + return (out); } char* irc_quit (char* chan __UNUSED__, char* msg) { - char* out; - int len; + char* out; + int len; - len = strlen ("QUIT") + 2 + len = strlen ("QUIT") + 2 + strlen (msg) + 1; - out = malloc (sizeof (char) * len); + out = malloc (sizeof (char) * len); - snprintf (out, len, "QUIT :%s", msg); + snprintf (out, len, "QUIT :%s", msg); - printf ("msg : %s\nout: %s\n", msg, out); + printf ("msg : %s\nout: %s\n", msg, out); -/* - espik_raw_send (out); - espik_con_shutdown (); + /* + espik_raw_send (out); + espik_con_shutdown (); - irc_disconnect(sock); -*/ + irc_disconnect(sock); + */ - return (out); + return (out); } char* irc_raw (char* chan __UNUSED__, char* msg) { - return (msg); + return (msg); } char* irc_nick (char* chan __UNUSED__, char* nick) @@ -199,53 +199,53 @@ void irc_disconnect (Ecore_Con_Server *sock) char* irc_send (char* msg) { - char* out; + char* out; - out = NULL; + out = NULL; - current_chan = "#test"; + current_chan = "#test"; - if (msg[0] == '/') - { + if (msg[0] == '/') + { #if 1 printf ("irc_send: msg[0] == '/'\n"); #endif - char** cmd_and_message; + char** cmd_and_message; - cmd_t* cmd; + cmd_t* cmd; - cmd_and_message = separate_commandline (msg + 1); + cmd_and_message = separate_commandline (msg + 1); #if 1 printf ("irc_send: <separate_commandline\n"); #endif - string_upper (cmd_and_message[0]); + string_upper (cmd_and_message[0]); - for (cmd = cmd_tab; cmd->cmd_name != 0; cmd++) - { - if ((strcmp (cmd_and_message[0], cmd->cmd_name)) == 0) + for (cmd = cmd_tab; cmd->cmd_name != 0; cmd++) + { + if ((strcmp (cmd_and_message[0], cmd->cmd_name)) == 0) { - out = cmd->format (current_chan, cmd_and_message[1]); - /* WHy do job after found the good to do ? */ - break; + out = cmd->format (current_chan, cmd_and_message[1]); + /* WHy do job after found the good to do ? */ + break; } - } - if (!out) - { - printf ("%s is not a know command\n", cmd_and_message[0]); - return (0); - } - } - else - { - out = irc_privmsg (current_chan, msg); - } - - if (!out) - return (0); - - printf ("%s\n", out); - - return (out); + } + if (!out) + { + printf ("%s is not a know command\n", cmd_and_message[0]); + return (0); + } + } + else + { + out = irc_privmsg (current_chan, msg); + } + + if (!out) + return (0); + + printf ("%s\n", out); + + return (out); } |