dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #494 - endless read when wt

This commit is contained in:
pancake 2013-12-29 05:33:55 +01:00
parent 1edf950d00
commit 56396ce443
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libr/cmd/macro.c
View File

@ -47,6 +47,9 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
if (pbody) { if (pbody) {
*pbody = '\0'; *pbody = '\0';
pbody++; pbody++;
} else {
eprintf ("Invalid macro body\n");
return R_FALSE;
} }
if (name[strlen (name)-1]==')') { if (name[strlen (name)-1]==')') {
@ -102,9 +105,12 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
pbody[lidx]='\0'; pbody[lidx]='\0';
} }
strncpy (macro->code, pbody, macro->codelen); strncpy (macro->code, pbody, macro->codelen);
macro->code[macro->codelen] = 0;
//strcat (macro->code, ","); //strcat (macro->code, ",");
#if 0
} else { } else {
int lbufp, codelen = 0; int lbufp, codelen = 0, nl = 0;
eprintf ("Reading macro from stdin:\n");
for (;codelen<R_CMD_MAXLEN;) { // XXX input from mac->fd for (;codelen<R_CMD_MAXLEN;) { // XXX input from mac->fd
#if 0 #if 0
if (stdin == r_cons_stdin_fd) { if (stdin == r_cons_stdin_fd) {
@ -114,6 +120,9 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
fgets(buf, 1023, r_cons_stdin_fd); fgets(buf, 1023, r_cons_stdin_fd);
#endif #endif
fgets (buf, sizeof (buf)-1, stdin); fgets (buf, sizeof (buf)-1, stdin);
if (*buf=='\n' && nl)
break;
nl = (*buf == '\n')?1:0;
if (*buf==')') if (*buf==')')
break; break;
for (bufp=buf;*bufp==' '||*bufp=='\t';bufp++); for (bufp=buf;*bufp==' '||*bufp=='\t';bufp++);
@ -129,6 +138,7 @@ R_API int r_cmd_macro_add(RCmdMacro *mac, const char *oname) {
codelen += lbufp; codelen += lbufp;
} }
} }
#endif
} }
if (macro_update == 0) if (macro_update == 0)
r_list_append (mac->macros, macro); r_list_append (mac->macros, macro);