version 1.5, 2013/03/25 11:36:08 |
version 1.6, 2013/03/25 11:41:16 |
|
|
} |
} |
|
|
/* Print a guard line. */ |
/* Print a guard line. */ |
void |
int |
cmdq_guard(struct cmd_q *cmdq, const char *guard) |
cmdq_guard(struct cmd_q *cmdq, const char *guard) |
{ |
{ |
struct client *c = cmdq->client; |
struct client *c = cmdq->client; |
|
|
if (c == NULL || c->session == NULL) |
if (c == NULL || c->session == NULL) |
return; |
return 0; |
if (!(c->flags & CLIENT_CONTROL)) |
if (!(c->flags & CLIENT_CONTROL)) |
return; |
return 0; |
|
|
evbuffer_add_printf(c->stdout_data, "%%%s %ld %u\n", guard, |
evbuffer_add_printf(c->stdout_data, "%%%s %ld %u\n", guard, |
(long) cmdq->time, cmdq->number); |
(long) cmdq->time, cmdq->number); |
server_push_stdout(c); |
server_push_stdout(c); |
|
return 1; |
} |
} |
|
|
/* Add command list to queue and begin processing if needed. */ |
/* Add command list to queue and begin processing if needed. */ |
|
|
{ |
{ |
struct cmd_q_item *next; |
struct cmd_q_item *next; |
enum cmd_retval retval; |
enum cmd_retval retval; |
int empty; |
int empty, guard; |
char s[1024]; |
char s[1024]; |
|
|
notify_disable(); |
notify_disable(); |
|
|
cmdq->time = time(NULL); |
cmdq->time = time(NULL); |
cmdq->number++; |
cmdq->number++; |
|
|
cmdq_guard(cmdq, "begin"); |
guard = cmdq_guard(cmdq, "begin"); |
retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq); |
retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq); |
if (retval == CMD_RETURN_ERROR) |
if (guard) { |
cmdq_guard(cmdq, "error"); |
if (retval == CMD_RETURN_ERROR) |
else |
cmdq_guard(cmdq, "error"); |
cmdq_guard(cmdq, "end"); |
else |
|
cmdq_guard(cmdq, "end"); |
|
} |
|
|
if (retval == CMD_RETURN_ERROR) |
if (retval == CMD_RETURN_ERROR) |
break; |
break; |