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

(servercmd, prompt, doexecute): Refactor: collect control of

Browse source 
executing, input_fd and send_eof in servercmd().  No functional
change.
This commit is contained in:
Markus Armbruster 2007-11-28 07:17:20 +00:00
parent 2dbc45eff7
commit e6882c1e7f
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/client/servcmd.c
View file

@ -57,12 +57,12 @@ static size_t input_to_forget;
static void prompt(int, char *, char *); static void prompt(int, char *, char *);
static void doredir(char *p); static void doredir(char *p);
static void dopipe(char *p); static void dopipe(char *p);
static void doexecute(char *p); static int doexecute(char *p);
void void
servercmd(int code, char *arg, int len) servercmd(int code, char *arg, int len)
{ {
static int nmin, nbtu; static int nmin, nbtu, fd;
static char the_prompt[1024]; static char the_prompt[1024];
static char teles[64]; static char teles[64];
@ -74,13 +74,20 @@ 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);
prompt(code, the_prompt, teles); prompt(code, the_prompt, teles);
executing = 0;
break; break;
case C_FLUSH: case C_FLUSH:
snprintf(the_prompt, sizeof(the_prompt), "%.*s", len - 1, arg); snprintf(the_prompt, sizeof(the_prompt), "%.*s", len - 1, arg);
prompt(code, the_prompt, teles); prompt(code, the_prompt, teles);
break; break;
case C_EXECUTE: case C_EXECUTE:
doexecute(arg); fd = doexecute(arg);
if (fd < 0)
send_eof++;
else {
input_fd = fd;
executing = 1;
}
break; break;
case C_EXIT: case C_EXIT:
printf("Exit: %s", arg); printf("Exit: %s", arg);
@ -127,7 +134,6 @@ prompt(int code, char *prompt, char *teles)
(void)pclose(pipe_fp); (void)pclose(pipe_fp);
pipe_fp = NULL; pipe_fp = NULL;
} }
executing = 0;
if (input_to_forget) { if (input_to_forget) {
forget_input(input_to_forget); forget_input(input_to_forget);
input_to_forget = 0; input_to_forget = 0;
@ -243,32 +249,27 @@ dopipe(char *p)
} }
} }
static void static int
doexecute(char *p) doexecute(char *p)
{ {
int fd; int fd;
if (!redir_authorized(p, "execute script file")) { if (!redir_authorized(p, "execute script file"))
send_eof++; return -1;
return;
}
p = fname(p); p = fname(p);
if (*p == 0) { if (*p == 0) {
fprintf(stderr, "Need a file to execute\n"); fprintf(stderr, "Need a file to execute\n");
send_eof++; return -1;
return;
} }
if ((fd = open(p, O_RDONLY)) < 0) { if ((fd = open(p, O_RDONLY)) < 0) {
fprintf(stderr, "Can't open execute file %s: %s\n", fprintf(stderr, "Can't open execute file %s: %s\n",
p, strerror(errno)); p, strerror(errno));
send_eof++; return -1;
return;
} }
input_fd = fd; return fd;
executing = 1;
} }
void void