projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comet2monitorの修正
[YACASL2.git]
/
src
/
monitor.c
diff --git
a/src/monitor.c
b/src/monitor.c
index
4278c6a
..
a799f7c
100644
(file)
--- a/
src/monitor.c
+++ b/
src/monitor.c
@@
-132,7
+132,7
@@
MONARGS *monargstok(const char *str)
}
sepp = r + strcspn(r, " ");
sepc = *sepp;
}
sepp = r + strcspn(r, " ");
sepc = *sepp;
-
*sepp = '\0'
;
+
strcpy(sepp, "")
;
args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
q = r = sepp + 1;
} while(sepc == ' ');
args->argv[++(args->argc)-1] = strdup_chk(q, "args.argv[]");
q = r = sepp + 1;
} while(sepc == ' ');
@@
-146,7
+146,7
@@
MONCMDLINE *monlinetok(const char *line)
long l;
MONCMDLINE *moncmdl = NULL;
long l;
MONCMDLINE *moncmdl = NULL;
- if(
*line == '\n' || *line == '\0
') {
+ if(
!line[0] || line[0] == '\n
') {
return NULL;
}
p = tokens = strdup_chk(line, "tokens");
return NULL;
}
p = tokens = strdup_chk(line, "tokens");
@@
-340,7
+340,8
@@
void free_moncmdline(MONCMDLINE *moncmdl)
void monitor()
{
void monitor()
{
- char *buf, *p;
+ char *buf = NULL;
+ int i;
MONCMDLINE *moncmdl;
MONCMDTYPE cmdtype = MONREPEAT;
MONCMDLINE *moncmdl;
MONCMDTYPE cmdtype = MONREPEAT;
@@
-348,8
+349,12
@@
void monitor()
fprintf(stdout, "- ");
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
fprintf(stdout, "- ");
buf = malloc_chk(MONINSIZE + 1, "monitor.buf");
fgets(buf, MONINSIZE, stdin);
- if((p = strchr(buf, '\n')) != NULL) {
- *p = '\0';
+ fprintf(stdout, "%s", buf);
+ if(!buf[0]) {
+ cmdtype = MONQUIT;
+ }
+ if((i = strcspn(buf, "\n")) > 0 || buf[0] == '\n') {
+ buf[i] = '\0';
}
if((moncmdl = monlinetok(buf)) != NULL) {
cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
}
if((moncmdl = monlinetok(buf)) != NULL) {
cmdtype = monitorcmd(moncmdl->cmd, moncmdl->args);
@@
-359,7
+364,7
@@
void monitor()
if(cmdtype == MONQUIT) {
shutdown();
freebps();
if(cmdtype == MONQUIT) {
shutdown();
freebps();
- free_c
ode_cmdtype(
);
+ free_c
mdtable(HASH_CODE
);
freecerr();
exit(0);
}
freecerr();
exit(0);
}