mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-15 13:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve archive creation handling

Browse source
This commit is contained in:
Arun Prakash Jana 2022-12-12 02:20:28 +05:30
parent cf46da60d9
commit 32a6a63f44
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/.clang-tidy
View file

@ -11,5 +11,5 @@ CheckOptions:
- key: fuchsia-restrict-system-includes.Includes - key: fuchsia-restrict-system-includes.Includes
value: '*,-stdint.h,-stdbool.h' value: '*,-stdint.h,-stdbool.h'
- key: readability-function-size.StatementThreshold - key: readability-function-size.StatementThreshold
value: '920' value: '950'
... ...

46
src/nnn.c
View file

@ -735,7 +735,7 @@ static char mv[] = "mv -i";
#endif #endif
/* Archive commands */ /* Archive commands */
static const char * const archive_cmd[] = {"atool -a", "bsdtar -acvf", "zip -r", "tar -acvf"}; static char * const archive_cmd[] = {"atool -a", "bsdtar -acvf", "zip -r", "tar -acvf"};
/* Tokens used for path creation */ /* Tokens used for path creation */
#define TOK_BM 0 #define TOK_BM 0
@ -1165,18 +1165,22 @@ static char *common_prefix(const char *path, char *prefix)
/* /*
* The library function realpath() resolves symlinks. * The library function realpath() resolves symlinks.
* If there's a symlink in file list we want to show the symlink not what it's points to. * If there's a symlink in file list we want to show the symlink not what it's points to.
* Resolves ./../~ in path * Resolves ./../~ in filepath
*/ */
static char *abspath(const char *path, char *cwd, char *buf) static char *abspath(const char *filepath, char *cwd, char *buf)
{ {
const char *path = filepath;
bool allocated = FALSE; bool allocated = FALSE;
if (!path) if (!path)
return NULL; return NULL;
if (path[0] == '~') if (path[0] == '~') {
cwd = home; cwd = home;
else if ((path[0] != '/') && !cwd) { ++path;
if (*path == '/')
++path;
} else if ((path[0] != '/') && !cwd) {
cwd = getcwd(NULL, 0); cwd = getcwd(NULL, 0);
if (!cwd) if (!cwd)
return NULL; return NULL;
@ -2681,7 +2685,7 @@ finish:
} }
#endif #endif
static void get_archive_cmd(char *cmd, const char *archive) static char *get_archive_cmd(const char *archive)
{ {
uchar_t i = 3; uchar_t i = 3;
@ -2693,7 +2697,7 @@ static void get_archive_cmd(char *cmd, const char *archive)
i = 2; i = 2;
// else tar // else tar
xstrsncpy(cmd, archive_cmd[i], ARCHIVE_CMD_LEN); return archive_cmd[i];
} }
static void archive_selection(const char *cmd, const char *archive, const char *curpath) static void archive_selection(const char *cmd, const char *archive, const char *curpath)
@ -7573,25 +7577,29 @@ nochange:
switch (sel) { switch (sel) {
case SEL_ARCHIVE: case SEL_ARCHIVE:
if (r == 'c' && strcmp(tmp, pdents[cur].name) == 0) tmp = abspath(tmp, NULL, newpath);
goto nochange; if (!tmp)
continue;
mkpath(path, tmp, newpath); if (access(tmp, F_OK) == 0) {
if (access(newpath, F_OK) == 0) {
if (!xconfirm(get_input(messages[MSG_OVERWRITE]))) { if (!xconfirm(get_input(messages[MSG_OVERWRITE]))) {
statusbar(path); statusbar(path);
goto nochange; goto nochange;
} }
} }
get_archive_cmd(newpath, tmp);
(r == 's') ? archive_selection(newpath, tmp, path) (r == 's') ? archive_selection(get_archive_cmd(tmp), tmp, "/")
: spawn(newpath, tmp, pdents[cur].name, : spawn(get_archive_cmd(tmp), tmp, pdents[cur].name,
NULL, F_CLI | F_CONFIRM); NULL, F_CLI | F_CONFIRM);
mkpath(path, tmp, newpath); if (tmp && (access(tmp, F_OK) == 0)) { /* File created */
if (access(newpath, F_OK) == 0) { /* File created */ char *base = xbasename(tmp);
xstrsncpy(lastname, tmp, NAME_MAX + 1); char *parent = xdirname(tmp);
clearfilter(); /* Archive name may not match */
/* Check if file is created in the current directory */
if (strcmp(path, parent) == 0) {
xstrsncpy(lastname, base, NAME_MAX + 1);
clearfilter(); /* Archive name may not match */
}
clearselection(); /* Archive operation complete */ clearselection(); /* Archive operation complete */
cd = FALSE; cd = FALSE;
goto begin; goto begin;