Changes in cmd.c [f25df21:4c7c21f]
Legend:
- Unmodified
- Added
- Removed
-
cmd.c
rf25df21 r4c7c21f 12 12 13 13 int owl_cmddict_setup(owl_cmddict *cd) { 14 if (0 != owl_cmddict_init(cd)) return(-1);14 owl_cmddict_init(cd); 15 15 if (0 != owl_cmddict_add_from_list(cd, commands_to_init)) return(-1); 16 16 return(0); 17 17 } 18 18 19 int owl_cmddict_init(owl_cmddict *cd) { 20 if (owl_dict_create(cd)) return(-1); 21 return(0); 19 void owl_cmddict_init(owl_cmddict *cd) { 20 owl_dict_create(cd); 22 21 } 23 22 … … 99 98 100 99 char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) { 101 GString *buf = g_string_new(""); 102 int i; 103 char *retval; 104 105 /* We weren't given a command line, so fabricate a valid one. */ 106 for(i = 0; i < argc; i++) { 107 if (i != 0) 108 g_string_append_c(buf, ' '); 109 owl_string_append_quoted_arg(buf, argv[i]); 110 } 111 112 retval = _owl_cmddict_execute(cd, ctx, argv, argc, buf->str); 113 114 g_string_free(buf, true); 100 char *buff; 101 char *retval = NULL; 102 103 buff = g_strjoinv(" ", (char**)argv); 104 retval = _owl_cmddict_execute(cd, ctx, argv, argc, buff); 105 g_free(buff); 106 115 107 return retval; 116 108 } … … 142 134 void owl_cmd_cleanup(owl_cmd *cmd) 143 135 { 144 if (cmd->name)g_free(cmd->name);145 if (cmd->summary)g_free(cmd->summary);146 if (cmd->usage)g_free(cmd->usage);147 if (cmd->description)g_free(cmd->description);148 if (cmd->cmd_aliased_to)g_free(cmd->cmd_aliased_to);136 g_free(cmd->name); 137 g_free(cmd->summary); 138 g_free(cmd->usage); 139 g_free(cmd->description); 140 g_free(cmd->cmd_aliased_to); 149 141 if (cmd->cmd_perl) owl_perlconfig_cmd_cleanup(cmd); 150 142 }
Note: See TracChangeset
for help on using the changeset viewer.