aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Revert "Created command_t struct for command handling"

Browse Source 
This reverts commit 0c0a242972.
This commit is contained in:
James Booth 2012-04-28 19:08:33 +01:00
parent 2b51d41631
commit c511d7c99f
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
command.c
View File

@ -34,7 +34,6 @@
static gboolean _handle_command(const char * const command, static gboolean _handle_command(const char * const command,
const char * const inp); const char * const inp);
static struct command_t _parse_command(char *str);
static gboolean _cmd_quit(void); static gboolean _cmd_quit(void);
static gboolean _cmd_help(void); static gboolean _cmd_help(void);
static gboolean _cmd_who(void); static gboolean _cmd_who(void);
@ -46,11 +45,6 @@ static gboolean _cmd_set_beep(const char * const inp);
static gboolean _cmd_set_flash(const char * const inp); static gboolean _cmd_set_flash(const char * const inp);
static gboolean _cmd_default(const char * const inp); static gboolean _cmd_default(const char * const inp);
struct command_t {
char *command;
char **params;
};
gboolean process_input(char *inp) gboolean process_input(char *inp)
{ {
gboolean result = FALSE; gboolean result = FALSE;
@ -63,8 +57,10 @@ gboolean process_input(char *inp)
if (strlen(inp) == 0) { if (strlen(inp) == 0) {
result = TRUE; result = TRUE;
} else if (inp[0] == '/') { } else if (inp[0] == '/') {
struct command_t cmd = _parse_command(inp); char inp_cpy[strlen(inp) + 1];
result = _handle_command(cmd.command, inp); strcpy(inp_cpy, inp);
char *command = strtok(inp_cpy, " ");
result = _handle_command(command, inp);
} else { } else {
result = _cmd_default(inp); result = _cmd_default(inp);
} }
@ -76,16 +72,6 @@ gboolean process_input(char *inp)
return result; return result;
} }
static struct command_t _parse_command(char *str)
{
struct command_t cmd;
char **split = g_strsplit(str, " ", 0);
cmd.command = split[0];
cmd.params = NULL;
return cmd;
}
static gboolean _handle_command(const char * const command, const char * const inp) static gboolean _handle_command(const char * const command, const char * const inp)
{ {
gboolean result = FALSE; gboolean result = FALSE;