mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #624: wait for user input if cmd fails

Browse source
This commit is contained in:
Arun Prakash Jana 2020-06-01 21:21:01 +05:30
parent ca8bc8bf30
commit 0ebc6db163
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nnn.c
View file

@ -185,6 +185,7 @@
#define F_NOTRACE 0x04 /* suppress stdout and strerr (no traces) */ #define F_NOTRACE 0x04 /* suppress stdout and strerr (no traces) */
#define F_NORMAL 0x08 /* spawn child process in non-curses regular CLI mode */ #define F_NORMAL 0x08 /* spawn child process in non-curses regular CLI mode */
#define F_CONFIRM 0x10 /* run command - show results before exit (must have F_NORMAL) */ #define F_CONFIRM 0x10 /* run command - show results before exit (must have F_NORMAL) */
#define F_CHKRTN 0x20 /* wait for user prompt if cmd returns failure status */
#define F_CLI (F_NORMAL | F_MULTI) #define F_CLI (F_NORMAL | F_MULTI)
#define F_SILENT (F_CLI | F_NOTRACE) #define F_SILENT (F_CLI | F_NOTRACE)
@ -1715,7 +1716,7 @@ static int spawn(char *file, char *arg1, char *arg2, uchar flag)
DPRINTF_D(pid); DPRINTF_D(pid);
if (flag & F_CONFIRM) { if ((flag & F_CONFIRM) || ((flag & F_CHKRTN) && retstatus)) {
printf("%s", messages[MSG_CONTINUE]); printf("%s", messages[MSG_CONTINUE]);
#ifndef NORL #ifndef NORL
fflush(stdout); fflush(stdout);
@ -1794,7 +1795,7 @@ static void xrm(char *fpath)
char rm_opts[] = "-ir"; char rm_opts[] = "-ir";
rm_opts[1] = confirm_force(FALSE); rm_opts[1] = confirm_force(FALSE);
spawn("rm", rm_opts, fpath, F_NORMAL); spawn("rm", rm_opts, fpath, F_NORMAL | F_CHKRTN);
} }
} }
@ -1854,9 +1855,8 @@ static bool cpmv_rename(int choice, const char *path)
} }
snprintf(buf, sizeof(buf), patterns[P_CPMVRNM], path, g_tmpfpath, cmd); snprintf(buf, sizeof(buf), patterns[P_CPMVRNM], path, g_tmpfpath, cmd);
spawn(utils[UTIL_SH_EXEC], buf, NULL, F_CLI); if (!spawn(utils[UTIL_SH_EXEC], buf, NULL, F_CLI | F_CHKRTN))
ret = TRUE; ret = TRUE;
finish: finish:
if (fd >= 0) if (fd >= 0)
close(fd); close(fd);
@ -1895,8 +1895,10 @@ static bool cpmvrm_selection(enum action sel, char *path)
break; break;
} }
if (sel != SEL_CPMVAS) if (sel != SEL_CPMVAS && spawn(utils[UTIL_SH_EXEC], g_buf, NULL, F_CLI | F_CHKRTN)) {
spawn(utils[UTIL_SH_EXEC], g_buf, NULL, F_CLI); printmsg(messages[MSG_FAILED]);
return FALSE;
}
/* Clear selection on move or delete */ /* Clear selection on move or delete */
if (sel != SEL_CP) if (sel != SEL_CP)