#define CMATRIX 6
#define NLAUNCH 7
#define SH_EXEC 8
+#define ARCHIVEMOUNT 9
+#define SSHFS 10
/* Utilities to open files, run actions */
static char * const utils[] = {
"cmatrix",
"nlaunch",
"sh -c",
+ "archivemount",
+ "sshfs",
};
-#ifdef __linux__
-static char cp[] = "cpg -giRp";
-static char mv[] = "mvg -gi";
-#else
-static char cp[] = "cp -iRp";
-static char mv[] = "mv -i";
-#endif
-
/* Common strings */
-#define STR_INPUT_ID 0
-#define STR_INVBM_KEY 1
+#define MSG_NO_TRAVERSAL 0
+#define MSG_INVBM_KEY 1
#define STR_DATE_ID 2
#define STR_TMPFILE 3
-#define NONE_SELECTED 4
-#define UTIL_MISSING 5
-#define OPERATION_FAILED 6
-#define SESSION_NAME 7
+#define MSG_0_SELECTED 4
+#define MSG_UTIL_MISSING 5
+#define MSG_FAILED 6
+#define MSG_SSN_NAME 7
+#define MSG_CP_MV_AS 8
+#define MSG_RENAME_SEL 9
+#define MSG_FORCE_RM 10
+#define MSG_CREATE_CTX 11
+#define MSG_ARCHIVE_SEL 12
+#define MSG_NEW_OPTS 13
+#define MSG_CLI_MODE 14
+#define MSG_OVERWRITE 15
+#define MSG_SSN_OPTS 16
+#define MSG_QUIT_ALL 17
+#define MSG_HOSTNAME 18
+#define MSG_ARCHIVE_NAME 19
+#define MSG_OPEN_WITH 20
+#define MSG_REL_PATH 21
+#define MSG_LINK_SUFFIX 22
+#define MSG_COPY_NAME 23
+#define MSG_CONTINUE 24
+#define MSG_SEL_MISSING 25
+#define MSG_SSN_MISSING 26
+#define MSG_DIR_ACCESS 27
+#define MSG_0_CREATED 28
+#define MSG_NOT_REG_FILE 29
+#define MSG_PERM_DENIED 30
+#define MSG_EMPTY_FILE 31
+#define MSG_UNSUPPORTED 32
+#define MSG_NOT_SET 33
+#define MSG_RANGE_SEL_ON 34
+#define MSG_DIR_CHANGED 35
+#define MSG_0_FILES 36
+#define MSG_EXISTS 37
+#define MSG_FEW_COLOUMNS 38
static const char * const messages[] = {
"no traversal",
"%F %T %z",
"/.nnnXXXXXX",
"0 selected",
- "missing dep",
+ "missing util",
"failed!",
"session name: ",
+ "'c'p / 'm'v as?",
+ "rename sel?",
+ "forcibly remove %s file%s (unrecoverable)?",
+ "Create context %d?",
+ "archive sel?",
+ "'f'(ile) / 'd'(ir) / 's'(ym) / 'h'(ard)?",
+ "cli mode?",
+ "overwrite?",
+ "'s'(ave) / 'l'(oad) / 'r'(estore)?",
+ "Quit all contexts?",
+ "host: ",
+ "archive name: ",
+ "open with: ",
+ "relative path: ",
+ "link suffix [@ for none]: ",
+ "copy name: ",
+ "\nPress Enter to continue",
+ "sel file missing",
+ "session file missing",
+ "dir inaccessible",
+ "0 created",
+ "not regular file",
+ "permission denied",
+ "empty: edit or open with",
+ "unsupported file",
+ "not set",
+ "range sel on",
+ "dir changed, range sel off",
+ "0 files",
+ "entry exists",
+ "too few columns!",
};
/* Supported configuration environment variables */
};
/* Required environment variables */
-#define SHELL 0
-#define VISUAL 1
-#define EDITOR 2
-#define PAGER 3
-#define NCUR 4
+#define ENV_SHELL 0
+#define ENV_VISUAL 1
+#define ENV_EDITOR 2
+#define ENV_PAGER 3
+#define ENV_NCUR 4
static const char * const envs[] = {
"SHELL",
"NNN",
};
+#ifdef __linux__
+static char cp[] = "cpg -giRp";
+static char mv[] = "mvg -gi";
+#else
+static char cp[] = "cp -iRp";
+static char mv[] = "mv -i";
+#endif
+
+static const char cpmvformatcmd[] = "sed -i 's|^\\(\\(.*/\\)\\(.*\\)$\\)|#\\1\\n\\3|' %s";
+static const char cpmvrenamecmd[] = "sed 's|^\\([^#][^/]\\?.*\\)$|%s/\\1|;s|^#\\(/.*\\)$|\\1|' %s | tr '\\n' '\\0' | xargs -0 -n2 sh -c '%s $0 $@ < /dev/tty'";
+static const char batchrenamecmd[] = "paste -d'\n' %s %s | sed 'N; /^\\(.*\\)\\n\\1$/!p;d' | tr '\n' '\\0' | xargs -0 -n2 mv 2>/dev/null";
+
/* Event handling */
#ifdef LINUX_INOTIFY
#define NUM_EVENT_SLOTS 8 /* Make room for 8 events */
char str[64];
int r;
- snprintf(str, 64, "forcibly remove %s file%s (unrecoverable)?",
+ snprintf(str, 64, messages[MSG_FORCE_RM],
(selection ? xitoa(nselected) : "current"), (selection ? "(s)" : ""));
r = get_input(str);
{
/* Fail if selection file path not generated */
if (!g_selpath) {
- printmsg("selection file not found");
+ printmsg(messages[MSG_SEL_MISSING]);
return FALSE;
}
/* Fail if selection file path isn't accessible */
if (access(g_selpath, R_OK | W_OK) == -1) {
- errno == ENOENT ? printmsg(messages[NONE_SELECTED]) : printwarn(NULL);
+ errno == ENOENT ? printmsg(messages[MSG_0_SELECTED]) : printwarn(NULL);
return FALSE;
}
DPRINTF_D(pid);
if (flag & F_NORMAL) {
if (flag & F_CONFIRM) {
- printf("\nPress Enter to continue");
+ printf("%s", messages[MSG_CONTINUE]);
getchar();
}
static void prompt_run(char *cmd, const char *cur, const char *path)
{
- setenv(envs[NCUR], cur, 1);
+ setenv(envs[ENV_NCUR], cur, 1);
spawn(shell, "-c", cmd, path, F_CLI | F_CONFIRM);
}
uint count = 0, lines = 0;
bool ret = FALSE;
char *cmd = (choice == 'c' ? cp : mv);
- static const char formatcmd[] = "sed -i 's|^\\(\\(.*/\\)\\(.*\\)$\\)|#\\1\\n\\3|' %s";
- static const char renamecmd[] = "sed 's|^\\([^#][^/]\\?.*\\)$|%s/\\1|;s|^#\\(/.*\\)$|\\1|' %s | tr '\\n' '\\0' | xargs -0 -n2 sh -c '%s $0 $@ < /dev/tty'";
- char buf[sizeof(renamecmd) + sizeof(cmd) + (PATH_MAX << 1)];
+ char buf[sizeof(cpmvrenamecmd) + sizeof(cmd) + (PATH_MAX << 1)];
fd = create_tmp_file();
if (fd == -1)
close(fd);
- snprintf(buf, sizeof(buf), formatcmd, g_tmpfpath);
+ snprintf(buf, sizeof(buf), cpmvformatcmd, g_tmpfpath);
spawn(utils[SH_EXEC], buf, NULL, path, F_CLI);
spawn(editor, g_tmpfpath, NULL, path, F_CLI);
goto finish;
}
- snprintf(buf, sizeof(buf), renamecmd, path, g_tmpfpath, cmd);
+ snprintf(buf, sizeof(buf), cpmvrenamecmd, path, g_tmpfpath, cmd);
spawn(utils[SH_EXEC], buf, NULL, path, F_CLI);
ret = TRUE;
opstr(g_buf, mv);
break;
case SEL_CPMVAS:
- r = get_input("'c'p / 'm'v as?");
+ r = get_input(messages[MSG_CP_MV_AS]);
if (r != 'c' && r != 'm') {
if (cfg.filtermode)
*presel = FILTER;
}
if (!cpmv_rename(r, path)) {
- printwait(messages[OPERATION_FAILED], presel);
+ printwait(messages[MSG_FAILED], presel);
return FALSE;
}
break;
int fd1, fd2, i;
uint count = 0, lines = 0;
bool dir = FALSE, ret = FALSE;
- static const char renamecmd[] = "paste -d'\n' %s %s | sed 'N; /^\\(.*\\)\\n\\1$/!p;d' | tr '\n' '\\0' | xargs -0 -n2 mv 2>/dev/null";
char foriginal[TMP_LEN_MAX] = {0};
- char buf[sizeof(renamecmd) + (PATH_MAX << 1)];
+ char buf[sizeof(batchrenamecmd) + (PATH_MAX << 1)];
fd1 = create_tmp_file();
if (fd1 == -1)
}
if (selbufpos) {
- i = get_input("rename selection?");
+ i = get_input(messages[MSG_RENAME_SEL]);
if (i != 'y' && i != 'Y') {
if (!ndents)
return TRUE;
goto finish;
}
- snprintf(buf, sizeof(buf), renamecmd, foriginal, g_tmpfpath);
+ snprintf(buf, sizeof(buf), batchrenamecmd, foriginal, g_tmpfpath);
spawn(utils[SH_EXEC], buf, NULL, path, F_CLI);
ret = TRUE;
xstrlcpy(cmd, "tar -acvf", ARCHIVE_CMD_LEN);
}
-static void archive_selection(const char *cmd, const char *archive, const char *curpath)
+static void MSG_ARCHIVE_SELection(const char *cmd, const char *archive, const char *curpath)
{
char *buf = (char *)malloc(CMD_LEN_MAX * sizeof(char));
/*
* Caller should check the value of presel to confirm if it needs to wait to show warning
*/
-static char *getreadline(char *prompt, char *path, char *curpath, int *presel)
+static char *getreadline(const char *prompt, char *path, char *curpath, int *presel)
{
/* Switch to current path for readline(3) */
if (chdir(path) == -1) {
/* Check if selection is empty */
if (!selbufpos) {
- printwait(messages[NONE_SELECTED], presel);
+ printwait(messages[MSG_0_SELECTED], presel);
return -1;
}
}
if (!count)
- printwait("none created", presel);
+ printwait(messages[MSG_0_CREATED], presel);
return count;
}
}
}
- sname = !last_session ? xreadline(NULL, messages[SESSION_NAME]) : "@";
+ sname = !last_session ? xreadline(NULL, messages[MSG_SSN_NAME]) : "@";
if (!sname[0])
return;
mkpath(sessiondir, sname, spath);
fsession = fopen(spath, "wb");
if (!fsession) {
- printwait("failed to open session file", presel);
+ printwait(messages[MSG_SSN_MISSING], presel);
return;
}
fclose(fsession);
if (!status)
- printwait("failed to write session data", presel);
+ printwait(messages[MSG_FAILED], presel);
}
static bool load_session(const char *sname, char **path, char **lastdir, char **lastname, bool restore)
bool status = FALSE;
if (!restore) {
- sname = sname ? sname : xreadline(NULL, messages[SESSION_NAME]);
+ sname = sname ? sname : xreadline(NULL, messages[MSG_SSN_NAME]);
if (!sname[0])
return FALSE;
fsession = fopen(spath, "rb");
if (!fsession) {
- printmsg("failed to open session file");
+ printmsg(messages[MSG_SSN_MISSING]);
xdelay();
return FALSE;
}
fclose(fsession);
if (!status) {
- printmsg("failed to read session data");
+ printmsg(messages[MSG_FAILED]);
xdelay();
}
xstrlcpy(path, dir, PATH_MAX);
- printmsg("cannot access dir");
+ printmsg(messages[MSG_DIR_ACCESS]);
xdelay();
}
/* Check if this is a directory */
if (!S_ISREG(dents[cur].mode)) {
- printwait("not regular file", presel);
+ printwait(messages[MSG_NOT_REG_FILE], presel);
return FALSE;
}
/* Check if file is executable */
if (!(dents[cur].mode & 0100)) {
- printwait("permission denied", presel);
+ printwait(messages[MSG_PERM_DENIED], presel);
return FALSE;
}
static bool archive_mount(char *name, char *path, char *newpath, int *presel)
{
- char *dir, *cmd = "archivemount";
+ char *dir, *cmd = utils[ARCHIVEMOUNT];
size_t len;
if (!getutil(cmd)) {
- printwait(messages[UTIL_MISSING], presel);
+ printwait(messages[MSG_UTIL_MISSING], presel);
return FALSE;
}
DPRINTF_S(name);
DPRINTF_S(newpath);
if (spawn(cmd, name, newpath, path, F_NORMAL)) {
- printwait(messages[OPERATION_FAILED], presel);
+ printwait(messages[MSG_FAILED], presel);
return FALSE;
}
{
uchar flag = F_NORMAL;
int r;
- char *tmp, *env, *cmd = "sshfs";
+ char *tmp, *env, *cmd = utils[SSHFS];
if (!getutil(cmd)) {
- printwait(messages[UTIL_MISSING], presel);
+ printwait(messages[MSG_UTIL_MISSING], presel);
return FALSE;
}
- tmp = xreadline(NULL, "host: ");
+ tmp = xreadline(NULL, messages[MSG_HOSTNAME]);
if (!tmp[0])
return FALSE;
/* Connect to remote */
if (spawn(env, tmp, newpath, NULL, flag)) {
- printwait(messages[OPERATION_FAILED], presel);
+ printwait(messages[MSG_FAILED], presel);
return FALSE;
}
}
if (!tmp || !child || !S_ISDIR(sb.st_mode) || (child && parent && sb.st_dev == psb.st_dev)) {
- tmp = xreadline(NULL, "host: ");
+ tmp = xreadline(NULL, messages[MSG_HOSTNAME]);
if (!tmp[0])
return FALSE;
}
}
if (spawn(cmd, "-u", newpath, NULL, F_NORMAL)) {
- printwait(messages[OPERATION_FAILED], presel);
+ printwait(messages[MSG_FAILED], presel);
return FALSE;
}
/* Fail redraw if < than 10 columns, context info prints 10 chars */
if (ncols < MIN_DISPLAY_COLS) {
- printmsg("too few columns!");
+ printmsg(messages[MSG_FEW_COLOUMNS]);
return;
}
}
if (!sb.st_size) {
- printwait("empty: use edit or open with", &presel);
+ printwait(messages[MSG_EMPTY_FILE], &presel);
goto nochange;
}
continue;
}
default:
- printwait("unsupported file", &presel);
+ printwait(messages[MSG_UNSUPPORTED], &presel);
goto nochange;
}
case SEL_NEXT: // fallthrough
}
if (dir[0] == '\0') {
- printwait("not set", &presel);
+ printwait(messages[MSG_NOT_SET], &presel);
goto nochange;
}
continue;
(r == CTX_MAX - 1) ? (r = 0) : ++r;
- snprintf(newpath, PATH_MAX,
- "Create context %d?", r + 1);
+ snprintf(newpath, PATH_MAX, messages[MSG_CREATE_CTX], r + 1);
fd = get_input(newpath);
if (fd != 'y' && fd != 'Y')
continue;
}
if (!get_kv_val(bookmark, newpath, fd, BM_MAX, TRUE)) {
- printwait(messages[STR_INVBM_KEY], &presel);
+ printwait(messages[MSG_INVBM_KEY], &presel);
goto nochange;
}
endselection();
if (!batch_rename(path)) {
- printwait(messages[OPERATION_FAILED], &presel);
+ printwait(messages[MSG_FAILED], &presel);
goto nochange;
}
refresh = TRUE;
if (rangesel) { /* Range selection started */
inode = sb.st_ino;
selstartid = cur;
- printmsg("range selection on");
+ printmsg(messages[MSG_RANGE_SEL_ON]);
xdelay();
continue;
}
#ifndef DIR_LIMITED_SELECTION
if (inode != sb.st_ino) {
- printwait("dir changed, range selection off", &presel);
+ printwait(messages[MSG_DIR_CHANGED], &presel);
goto nochange;
}
#endif
break;
}
- printwait(messages[NONE_SELECTED], &presel);
+ printwait(messages[MSG_0_SELECTED], &presel);
goto nochange;
case SEL_SELEDIT:
if (!editselection()) {
- printwait(messages[OPERATION_FAILED], &presel);
+ printwait(messages[MSG_FAILED], &presel);
goto nochange;
}
break;
switch (sel) {
case SEL_ARCHIVE:
- r = get_input("archive selection (else current)?");
+ r = get_input(messages[MSG_ARCHIVE_SEL]);
if (r == 'y' || r == 'Y') {
endselection();
tmp = NULL;
} else if (!ndents) {
- printwait("no files", &presel);
+ printwait(messages[MSG_0_FILES], &presel);
goto nochange;
} else
tmp = dents[cur].name;
- tmp = xreadline(tmp, "archive name: ");
+ tmp = xreadline(tmp, messages[MSG_ARCHIVE_NAME]);
break;
case SEL_OPENWITH:
#ifdef NORL
- tmp = xreadline(NULL, "open with: ");
+ tmp = xreadline(NULL, messages[MSG_OPEN_WITH]);
#else
presel = 0;
- tmp = getreadline("open with: ", path, ipath, &presel);
+ tmp = getreadline(messages[MSG_OPEN_WITH], path, ipath, &presel);
if (presel == MSGWAIT)
goto nochange;
#endif
break;
case SEL_NEW:
- r = get_input("create 'f'(ile) / 'd'(ir) / 's'(ym) / 'h'(ard)?");
+ r = get_input(messages[MSG_NEW_OPTS]);
if (r == 'f' || r == 'd')
- tmp = xreadline(NULL, "relative path: ");
+ tmp = xreadline(NULL, messages[MSG_REL_PATH]);
else if (r == 's' || r == 'h')
- tmp = xreadline(NULL, "link suffix [@ for none]: ");
+ tmp = xreadline(NULL, messages[MSG_LINK_SUFFIX]);
else
tmp = NULL;
break;
/* Allow only relative, same dir paths */
if (tmp[0] == '/'
|| ((r != 'f' && r != 'd') && (xstrcmp(xbasename(tmp), tmp) != 0))) {
- printwait(messages[STR_INPUT_ID], &presel);
+ printwait(messages[MSG_NO_TRAVERSAL], &presel);
goto nochange;
}
/* Confirm if app is CLI or GUI */
if (sel == SEL_OPENWITH) {
- r = get_input("cli mode?");
+ r = get_input(messages[MSG_CLI_MODE]);
(r == 'y' || r == 'Y') ? (r = F_CLI)
: (r = F_NOWAIT | F_NOTRACE | F_MULTI);
}
get_archive_cmd(cmd, tmp);
- (r == 'y' || r == 'Y') ? archive_selection(cmd, tmp, path)
+ (r == 'y' || r == 'Y') ? MSG_ARCHIVE_SELection(cmd, tmp, path)
: spawn(cmd, tmp, dents[cur].name,
path, F_NORMAL | F_MULTI);
break;
case SEL_RENAME:
/* Skip renaming to same name */
if (strcmp(tmp, dents[cur].name) == 0) {
- tmp = xreadline(dents[cur].name, "copy name: ");
+ tmp = xreadline(dents[cur].name, messages[MSG_COPY_NAME]);
if (strcmp(tmp, dents[cur].name) == 0)
goto nochange;
if (faccessat(fd, tmp, F_OK, AT_SYMLINK_NOFOLLOW) != -1) {
if (sel == SEL_RENAME) {
/* Overwrite file with same name? */
- r = get_input("overwrite?");
+ r = get_input(messages[MSG_OVERWRITE]);
if (r != 'y' && r != 'Y') {
close(fd);
break;
} else {
/* Do nothing in case of NEW */
close(fd);
- printwait("entry exists", &presel);
+ printwait(messages[MSG_EXISTS], &presel);
goto nochange;
}
}
goto nochange;
break;
case SEL_SHELL:
- setenv(envs[NCUR], (ndents ? dents[cur].name : ""), 1);
+ setenv(envs[ENV_NCUR], (ndents ? dents[cur].name : ""), 1);
spawn(shell, NULL, NULL, path, F_CLI);
break;
case SEL_PLUGKEY: // fallthrough
}
if (sel == SEL_PLUGKEY) {
- r = get_input("");
+ r = get_input(NULL);
tmp = get_kv_val(plug, NULL, r, PLUGIN_MAX, FALSE);
if (!tmp)
goto nochange;
if (!run_selected_plugin(&path, tmp, newpath,
(ndents ? dents[cur].name : NULL),
&lastname, &lastdir)) {
- printwait(messages[OPERATION_FAILED],
+ printwait(messages[MSG_FAILED],
&presel);
goto nochange;
}
unmount(tmp, newpath, &presel, path);
goto nochange;
case SEL_SESSIONS:
- r = get_input("'s'(ave) / 'l'(oad) / 'r'(estore) session?");
+ r = get_input(messages[MSG_SSN_OPTS]);
if (r == 's') {
save_session(FALSE, &presel);
} else {
for (r = 0; r < CTX_MAX; ++r)
if (r != cfg.curctx && g_ctx[r].c_cfg.ctxactive) {
- r = get_input("Quit all contexts?");
+ r = get_input(messages[MSG_QUIT_ALL]);
break;
}
key = bindings[i].sym;
if (bitmap[key])
- fprintf(stdout, "collision detected: key [%s]\n", keyname(key));
+ fprintf(stdout, "key collision! [%s]\n", keyname(key));
else
bitmap[key] = TRUE;
}
initpath = get_kv_val(bookmark, NULL, *arg, BM_MAX, TRUE);
if (!initpath) {
- fprintf(stderr, "%s\n", messages[STR_INVBM_KEY]);
+ fprintf(stderr, "%s\n", messages[MSG_INVBM_KEY]);
return _FAILURE;
}
} else if (argc == optind) {
cfg.useeditor = 1;
/* Get VISUAL/EDITOR */
- editor = xgetenv(envs[VISUAL], xgetenv(envs[EDITOR], "vi"));
- DPRINTF_S(getenv(envs[VISUAL]));
- DPRINTF_S(getenv(envs[EDITOR]));
+ editor = xgetenv(envs[ENV_VISUAL], xgetenv(envs[ENV_EDITOR], "vi"));
+ DPRINTF_S(getenv(envs[ENV_VISUAL]));
+ DPRINTF_S(getenv(envs[ENV_EDITOR]));
DPRINTF_S(editor);
/* Get PAGER */
- pager = xgetenv(envs[PAGER], "less");
+ pager = xgetenv(envs[ENV_PAGER], "less");
DPRINTF_S(pager);
/* Get SHELL */
- shell = xgetenv(envs[SHELL], "sh");
+ shell = xgetenv(envs[ENV_SHELL], "sh");
DPRINTF_S(shell);
DPRINTF_S(getenv("PWD"));