1
0
mirror of https://github.com/rfivet/uemacs.git synced 2025-09-26 15:04:04 -04:00

Review usage of mlreply/ macarg/ gettokval according to execution context.

This commit is contained in:
2015-09-01 11:29:08 +08:00
parent 8d412dc388
commit c3f4666ff3
5 changed files with 19 additions and 17 deletions

24
exec.c
View File

@@ -79,6 +79,7 @@ static int mstore = FALSE ; /* storing text to macro flag */
static int dobuf( struct buffer *bp) ;
static void freewhile( struct while_block *wp) ;
static int macarg( char *tok, int toksz) ;
void ue_system( const char *cmd) {
int ret ;
@@ -179,8 +180,10 @@ static int docmd( char *cline) {
/* process leadin argument */
if( !is_it_cmd( tkn)) {
f = TRUE;
strncpy( tkn, getval( tkn), sizeof tkn - 1) ;
tkn[ sizeof tkn - 1] = '\0' ;
/* macarg already includes a getval, skip for now
strncpy( tkn, getval( tkn), sizeof tkn - 1) ;
tkn[ sizeof tkn - 1] = '\0' ;
*/
n = atoi(tkn);
/* and now get the command to execute */
@@ -308,16 +311,15 @@ boolean gettokval( char *tok, int size) {
*
* char *tok; buffer to place argument
*/
int macarg( char *tok, int toksz)
{
boolean savcle ; /* buffer to store original clexec */
int status;
static int macarg( char *tok, int toksz) {
int status ;
boolean savcle ; /* buffer to store original clexec */
savcle = clexec; /* save execution mode */
clexec = TRUE; /* get the argument */
status = mlreply( "", tok, toksz) ;
clexec = savcle; /* restore execution mode */
return status;
savcle = clexec ; /* save execution mode */
clexec = TRUE ; /* get the argument */
status = gettokval( tok, toksz) ;
clexec = savcle ; /* restore execution mode */
return status ;
}
/*