rfivet
/
uemacs
mirror of https://github.com/rfivet/uemacs.git
1
0
Fork 0
Code Releases Activity

Spawn commands based on newmlarg (replacement of mlreply).

This commit is contained in:
Renaud 2015-10-05 14:06:53 +08:00
parent bcba236265
commit 15453a9d52
1 changed files with 77 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
spawn.c
View File

@ -145,51 +145,24 @@ void rtfrmshell(void)
* character to be typed, then mark the screen as garbage so a full repaint is * character to be typed, then mark the screen as garbage so a full repaint is
* done. Bound to "C-X !". * done. Bound to "C-X !".
*/ */
int spawn(int f, int n) int spawn( int f, int n) {
{ int s ;
int s; char *line ;
char line[NLINE];
/* don't allow this command if restricted */ /* don't allow this command if restricted */
if (restflag) if( restflag)
return resterr(); return resterr();
#if VMS
if ((s = mlreply("!", line, NLINE)) != TRUE)
return s;
movecursor(term.t_nrow, 0);
TTflush();
s = sys(line); /* Run the command. */
if (clexec == FALSE) {
mlwrite("\r\n\n(End)"); /* Pause. */
TTflush();
tgetc();
}
sgarbf = TRUE;
return s;
#endif
#if MSDOS
if ((s = mlreply("!", line, NLINE)) != TRUE)
return s;
movecursor(term.t_nrow, 0);
TTkclose();
shellprog(line);
TTkopen();
/* if we are interactive, pause here */
if (clexec == FALSE) {
mlwrite("\r\n(End)");
tgetc();
}
sgarbf = TRUE;
return TRUE;
#endif
#if V7 | USG | BSD #if V7 | USG | BSD
if ((s = mlreply("!", line, NLINE)) != TRUE) s = newmlarg( &line, "!", 0) ;
return s; if( s != TRUE)
return s ;
TTflush(); TTflush();
TTclose(); /* stty to old modes */ TTclose(); /* stty to old modes */
TTkclose(); TTkclose();
ue_system( line) ; ue_system( line) ;
free( line) ;
fflush(stdout); /* to be sure P.K. */ fflush(stdout); /* to be sure P.K. */
TTopen(); TTopen();
@ -211,51 +184,25 @@ int spawn(int f, int n)
* done. Bound to "C-X $". * done. Bound to "C-X $".
*/ */
int execprg(int f, int n) int execprg( int f, int n) {
{ int s ;
int s; char *line ;
char line[NLINE];
/* don't allow this command if restricted */ /* don't allow this command if restricted */
if (restflag) if( restflag)
return resterr(); return resterr() ;
#if VMS
if ((s = mlreply("!", line, NLINE)) != TRUE)
return s;
TTflush();
s = sys(line); /* Run the command. */
mlwrite("\r\n\n(End)"); /* Pause. */
TTflush();
tgetc();
sgarbf = TRUE;
return s;
#endif
#if MSDOS
if ((s = mlreply("$", line, NLINE)) != TRUE)
return s;
movecursor(term.t_nrow, 0);
TTkclose();
execprog(line);
TTkopen();
/* if we are interactive, pause here */
if (clexec == FALSE) {
mlwrite("\r\n(End)");
tgetc();
}
sgarbf = TRUE;
return TRUE;
#endif
#if V7 | USG | BSD #if V7 | USG | BSD
if ((s = mlreply("!", line, NLINE)) != TRUE) s = newmlarg( &line, "$", 0) ;
return s; if( s != TRUE)
return s ;
TTputc('\n'); /* Already have '\r' */ TTputc('\n'); /* Already have '\r' */
TTflush(); TTflush();
TTclose(); /* stty to old modes */ TTclose(); /* stty to old modes */
TTkclose(); TTkclose();
ue_system( line) ; ue_system( line) ;
free( line) ;
fflush(stdout); /* to be sure P.K. */ fflush(stdout); /* to be sure P.K. */
TTopen(); TTopen();
mlwrite( "(End)") ; /* Pause. */ mlwrite( "(End)") ; /* Pause. */
@ -270,48 +217,32 @@ int execprg(int f, int n)
* Pipe a one line command into a window * Pipe a one line command into a window
* Bound to ^X @ * Bound to ^X @
*/ */
int pipecmd(int f, int n) int pipecmd( int f, int n) {
{ int s ; /* return status from CLI */
int s; /* return status from CLI */ struct window *wp ; /* pointer to new window */
struct window *wp; /* pointer to new window */ struct buffer *bp ; /* pointer to buffer to zot */
struct buffer *bp; /* pointer to buffer to zot */ char *mlarg ;
char line[NLINE]; /* command line send to shell */ char *line ; /* command line send to shell */
static char bname[] = "command"; static char bname[] = "command" ;
static char filnam[ NSTRING] = "command" ;
static char filnam[NSTRING] = "command";
#if MSDOS
char *tmp;
FILE *fp;
int len;
#endif
/* don't allow this command if restricted */ /* don't allow this command if restricted */
if (restflag) if( restflag)
return resterr(); return resterr() ;
#if MSDOS
if ((tmp = getenv("TMP")) == NULL
&& (tmp = getenv("TEMP")) == NULL)
strcpy(filnam, "command");
else {
strcpy(filnam, tmp);
len = strlen(tmp);
if (len <= 0 || filnam[len - 1] != '\\'
&& filnam[len - 1] != '/')
strcat(filnam, "\\");
strcat(filnam, "command");
}
#endif
#if VMS
mlwrite("Not available under VMS");
return FALSE;
#endif
/* get the command to pipe in */ /* get the command to pipe in */
if ((s = mlreply("@", line, NLINE)) != TRUE) s = newmlarg( &mlarg, "@", 0) ;
return s; if( s != TRUE)
return s ;
line = malloc( strlen( mlarg) + strlen( filnam) + 2) ;
if( line == NULL) {
free( mlarg) ;
return FALSE ;
}
strcpy( line, mlarg) ;
free( mlarg) ;
/* get rid of the command output buffer if it exists */ /* get rid of the command output buffer if it exists */
if ((bp = bfind(bname, FALSE, 0)) != FALSE) { if ((bp = bfind(bname, FALSE, 0)) != FALSE) {
@ -332,33 +263,20 @@ int pipecmd(int f, int n)
} }
wp = wp->w_wndp; wp = wp->w_wndp;
} }
if (zotbuf(bp) != TRUE)
return FALSE; if( zotbuf( bp) != TRUE) {
free( line) ;
return FALSE ;
}
} }
#if MSDOS
strcat(line, " >>");
strcat(line, filnam);
movecursor(term.t_nrow, 0);
TTkclose();
shellprog(line);
TTkopen();
sgarbf = TRUE;
if ((fp = fopen(filnam, "r")) == NULL) {
s = FALSE;
} else {
fclose(fp);
s = TRUE;
}
#endif
#if V7 | USG | BSD #if V7 | USG | BSD
TTflush(); TTflush();
TTclose(); /* stty to old modes */ TTclose(); /* stty to old modes */
TTkclose(); TTkclose();
strcat(line, ">"); strcat( line, ">") ;
strcat(line, filnam); strcat( line, filnam) ;
ue_system( line) ; ue_system( line) ;
free( line) ;
TTopen(); TTopen();
TTkopen(); TTkopen();
TTflush(); TTflush();
@ -394,32 +312,37 @@ int pipecmd(int f, int n)
* filter a buffer through an external DOS program * filter a buffer through an external DOS program
* Bound to ^X # * Bound to ^X #
*/ */
int filter_buffer(int f, int n) int filter_buffer( int f, int n) {
{ int s ; /* return status from CLI */
int s; /* return status from CLI */ struct buffer *bp ; /* pointer to buffer to zot */
struct buffer *bp; /* pointer to buffer to zot */ char *mlarg ;
char line[NLINE]; /* command line send to shell */ char *line ; /* command line send to shell */
fname_t tmpnam ; /* place to store real file name */ fname_t tmpnam ; /* place to store real file name */
static char bname1[] = "fltinp"; static char bname1[] = "fltinp" ;
static char filnam1[] = "fltinp"; static char filnam1[] = "fltinp" ;
static char filnam2[] = "fltout"; static char filnam2[] = "fltout" ;
/* don't allow this command if restricted */ /* don't allow this command if restricted */
if (restflag) if( restflag)
return resterr(); return resterr() ;
if (curbp->b_mode & MDVIEW) /* don't allow this command if */ if( curbp->b_mode & MDVIEW) /* don't allow this command if */
return rdonly(); /* we are in read only mode */ return rdonly() ; /* we are in read only mode */
#if VMS
mlwrite("Not available under VMS");
return FALSE;
#endif
/* get the filter name and its args */ /* get the filter name and its args */
if ((s = mlreply("#", line, NLINE)) != TRUE) s = newmlarg( &mlarg, "#", 0) ;
return s; if( s != TRUE)
return s ;
line = malloc( strlen( mlarg) + 16 + 1) ;
if( line == NULL) {
free( mlarg) ;
return FALSE ;
}
strcpy( line, mlarg) ;
free( mlarg) ;
/* setup the proper file names */ /* setup the proper file names */
bp = curbp; bp = curbp;
@ -427,20 +350,12 @@ int filter_buffer(int f, int n)
strcpy(bp->b_fname, bname1); /* set it to our new one */ strcpy(bp->b_fname, bname1); /* set it to our new one */
/* write it out, checking for errors */ /* write it out, checking for errors */
if (writeout(filnam1) != TRUE) { if( writeout( filnam1) != TRUE) {
mlwrite( "(Cannot write filter file)") ; mlwrite( "(Cannot write filter file)") ;
strcpy(bp->b_fname, tmpnam); strcpy( bp->b_fname, tmpnam) ;
return FALSE; free( line) ;
return FALSE ;
} }
#if MSDOS
strcat(line, " <fltinp >fltout");
movecursor(term.t_nrow - 1, 0);
TTkclose();
shellprog(line);
TTkopen();
sgarbf = TRUE;
s = TRUE;
#endif
#if V7 | USG | BSD #if V7 | USG | BSD
TTputc('\n'); /* Already have '\r' */ TTputc('\n'); /* Already have '\r' */
@ -449,6 +364,7 @@ int filter_buffer(int f, int n)
TTkclose(); TTkclose();
strcat(line, " <fltinp >fltout"); strcat(line, " <fltinp >fltout");
ue_system( line) ; ue_system( line) ;
free( line) ;
TTopen(); TTopen();
TTkopen(); TTkopen();
TTflush(); TTflush();