mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the cp/mv modification more robust 

this makes it so that if the cp/mv commands are changed the in the
future, it will continue to work reliably instead of having hardcoded
indexes to modify the array.

the `#ifdef __linux__` is also removed, compilers should be smart enough
to see that PROGRESS_{CP,MV} are unused (on non-linux systems) and
optimize it out.
This commit is contained in:
NRK 2023-05-14 22:13:15 +06:00
parent fe96bd6bc7
commit 16899bda53
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nnn.c
View File

@ -728,13 +728,10 @@ static const char * const envs[] = {
#define T_CHANGE 1 #define T_CHANGE 1
#define T_MOD 2 #define T_MOD 2
#ifdef __linux__ #define PROGRESS_CP "cpg -giRp"
static char cp[] = "cp -iRp"; #define PROGRESS_MV "mvg -gi"
static char mv[] = "mv -i"; static char cp[sizeof PROGRESS_CP] = "cp -iRp";
#else static char mv[sizeof PROGRESS_MV] = "mv -i";
static char cp[] = "cp -iRp";
static char mv[] = "mv -i";
#endif
/* Archive commands */ /* Archive commands */
static 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"};
@ -8588,8 +8585,8 @@ int main(int argc, char *argv[])
break; break;
case 'r': case 'r':
#ifdef __linux__ #ifdef __linux__
cp[2] = cp[5] = mv[2] = mv[5] = 'g'; /* cp -iRp -> cpg -giRp */ memcpy(cp, PROGRESS_CP, sizeof PROGRESS_CP);
cp[4] = mv[4] = '-'; memcpy(mv, PROGRESS_MV, sizeof PROGRESS_MV);
#endif #endif
break; break;
case 'R': case 'R':