empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(prompt, servercmd): Move C_PROMPT code from prompt() to the only call

Browse source 
site that passes C_PROMPT.  No functional change.
This commit is contained in:
Markus Armbruster 2007-11-29 05:17:54 +00:00
parent e6882c1e7f
commit bde3d0c17d
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/client/servcmd.c
View file

@ -73,6 +73,17 @@ servercmd(int code, char *arg, int len)
} }
snprintf(the_prompt, sizeof(the_prompt), "[%d:%d] Command : ", snprintf(the_prompt, sizeof(the_prompt), "[%d:%d] Command : ",
nmin, nbtu); nmin, nbtu);
if (redir_fp) {
(void)fclose(redir_fp);
redir_fp = NULL;
} else if (pipe_fp) {
(void)pclose(pipe_fp);
pipe_fp = NULL;
}
if (input_to_forget) {
forget_input(input_to_forget);
input_to_forget = 0;
}
prompt(code, the_prompt, teles); prompt(code, the_prompt, teles);
executing = 0; executing = 0;
break; break;
@ -126,20 +137,6 @@ prompt(int code, char *prompt, char *teles)
{ {
char *nl; char *nl;
if (code == C_PROMPT) {
if (redir_fp) {
(void)fclose(redir_fp);
redir_fp = NULL;
} else if (pipe_fp) {
(void)pclose(pipe_fp);
pipe_fp = NULL;
}
if (input_to_forget) {
forget_input(input_to_forget);
input_to_forget = 0;
}
}
nl = code == C_PROMPT || code == C_INFORM ? "\n" : ""; nl = code == C_PROMPT || code == C_INFORM ? "\n" : "";
printf("%s%s%s", nl, teles, prompt); printf("%s%s%s", nl, teles, prompt);
fflush(stdout); fflush(stdout);