X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=90c4b60846c5c6cade80316f57bef742fdc7e716;hb=672e27768e31a6eaa6854d4fc75ee6885db9abd8;hp=becd561b939f775427b552b831cc3413fb433fcb;hpb=b03fee78f6041e0f126125a5d209a201a86deaba;p=paraslash.git diff --git a/command.c b/command.c index becd561b..90c4b608 100644 --- a/command.c +++ b/command.c @@ -44,6 +44,7 @@ extern struct misc_meta_data *mmd; extern struct sender senders[]; int send_afs_status(struct rc4_context *rc4c, int parser_friendly); +const char *status_item_list[] = {STATUS_ITEM_ARRAY}; static void dummy(__a_unused int s) { @@ -366,6 +367,7 @@ int com_stat(struct rc4_context *rc4c, int argc, char * const * argv) parser_friendly = 1; continue; } + return -E_COMMAND_SYNTAX; } if (i != argc) return -E_COMMAND_SYNTAX; @@ -823,10 +825,14 @@ __noreturn void handle_connect(int fd, const char *peername) if (ret < 0) goto err_out; /* valid command and sufficient perms */ - argc = split_args(command, &argv, "\n"); + ret = create_argv(command, "\n", &argv); + if (ret < 0) + goto err_out; + argc = ret; PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name, peername); ret = cmd->handler(&rc4c, argc, argv); + free_argv(argv); mutex_lock(mmd_mutex); mmd->num_commands++; mutex_unlock(mmd_mutex); @@ -838,7 +844,6 @@ net_err: PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); out: free(command); - free(argv); mutex_lock(mmd_mutex); if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0) mmd->events++;