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.

diff --git a/src/nnn.c b/src/nnn.c
index 46e95c5f7964051495089b34eeaa63c7acf7b909..71ae7a010202afd262ebc644ce1d3efb3e8b5759 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -728,13 +728,10 @@ static const char * const envs[] = {
 #define T_CHANGE 1
 #define T_MOD    2
 
-#ifdef __linux__
-static char cp[] = "cp   -iRp";
-static char mv[] = "mv   -i";
-#else
-static char cp[] = "cp -iRp";
-static char mv[] = "mv -i";
-#endif
+#define PROGRESS_CP   "cpg -giRp"
+#define PROGRESS_MV   "mvg -gi"
+static char cp[sizeof PROGRESS_CP] = "cp -iRp";
+static char mv[sizeof PROGRESS_MV] = "mv -i";
 
 /* Archive commands */
 static char * const archive_cmd[] = {"atool -a", "bsdtar -acvf", "zip -r", "tar -acvf"};
@@ -8588,8 +8585,8 @@ int main(int argc, char *argv[])
                        break;
                case 'r':
 #ifdef __linux__
-                       cp[2] = cp[5] = mv[2] = mv[5] = 'g'; /* cp -iRp -> cpg -giRp */
-                       cp[4] = mv[4] = '-';
+                       memcpy(cp, PROGRESS_CP, sizeof PROGRESS_CP);
+                       memcpy(mv, PROGRESS_MV, sizeof PROGRESS_MV);
 #endif
                        break;
                case 'R':