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

Default to CWD for atool

Browse source
This commit is contained in:
Arun Prakash Jana 2021-06-19 13:49:48 +05:30
parent e8f0c53287
commit 17bb0cfb52
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nnn.c
View file

@ -4282,11 +4282,12 @@ next:
static bool handle_archive(char *fpath /* in-out param */, char op) static bool handle_archive(char *fpath /* in-out param */, char op)
{ {
char arg[] = "-tvf"; /* options for tar/bsdtar to list files */ char arg[] = "-tvf"; /* options for tar/bsdtar to list files */
char *util, *outdir; char *util, *outdir = NULL;
bool x_to = FALSE; bool x_to = FALSE;
bool is_atool = getutil(utils[UTIL_ATOOL]);
if (op == 'x') { if (op == 'x') {
outdir = xreadline(xbasename(fpath), messages[MSG_NEW_PATH]); outdir = xreadline(is_atool ? "." : xbasename(fpath), messages[MSG_NEW_PATH]);
if (!outdir || !*outdir) { /* Cancelled */ if (!outdir || !*outdir) { /* Cancelled */
printwait(messages[MSG_CANCEL], NULL); printwait(messages[MSG_CANCEL], NULL);
return FALSE; return FALSE;
@ -4303,7 +4304,7 @@ static bool handle_archive(char *fpath /* in-out param */, char op)
} }
} }
if (getutil(utils[UTIL_ATOOL])) { if (is_atool) {
util = utils[UTIL_ATOOL]; util = utils[UTIL_ATOOL];
arg[1] = op; arg[1] = op;
arg[2] = '\0'; arg[2] = '\0';
@ -4332,8 +4333,8 @@ static bool handle_archive(char *fpath /* in-out param */, char op)
return FALSE; return FALSE;
} }
xstrsncpy(fpath, outdir, PATH_MAX); xstrsncpy(fpath, outdir, PATH_MAX);
free(outdir); } else if (op == 'x')
} fpath[0] = '\0';
return TRUE; return TRUE;
} }
@ -6540,7 +6541,10 @@ nochange:
} }
if (r == 'x' || r == 'm') { if (r == 'x' || r == 'm') {
set_smart_ctx('+', newpath, &path, &lastname, &lastdir); if (newpath[0])
set_smart_ctx('+', newpath, &path, &lastname, &lastdir);
else
copycurname();
clearfilter(); clearfilter();
goto begin; goto begin;
} }