mirror of
https://github.com/jarun/nnn.git
synced 2024-11-28 05:41:31 +00:00
Create copy file in home dir, remove copy file on exit
This commit is contained in:
parent
dbd1db72fe
commit
028e04abd3
10
README.md
10
README.md
|
@ -391,7 +391,7 @@ Note that the filename is not escaped. So copying may still fail for filenames h
|
|||
|
||||
#### copy file paths when X is missing
|
||||
|
||||
A very common scenario on headless remote servers connected via SSH. As the clipboard is missing, `nnn` copies the path names to the tmp file `/tmp/nnncp$USER`.
|
||||
A very common scenario on headless remote servers connected via SSH. As the clipboard is missing, `nnn` copies the path names to the tmp file `$HOME/.nnncp`.
|
||||
|
||||
`nnn` needs to know X is unavailable:
|
||||
|
||||
|
@ -400,15 +400,15 @@ A very common scenario on headless remote servers connected via SSH. As the clip
|
|||
Use <kbd>^Y</kbd> and/or <kbd>^K</kbd> to copy file paths as usual. To use the copied paths from the cmdline, use command substitution:
|
||||
|
||||
# bash/zsh
|
||||
ls -ltr `cat /tmp/nnncpuser`
|
||||
ls -ltr $(cat /tmp/nnncpuser)
|
||||
ls -ltr `cat /home/user/.nnncp`
|
||||
ls -ltr $(cat /home/user/.nnncp)
|
||||
|
||||
# fish
|
||||
ls -ltr (cat /tmp/nnncpuser)
|
||||
ls -ltr (cat /home/user/.nnncp)
|
||||
|
||||
An alias may be handy:
|
||||
|
||||
alias ncp='cat /tmp/nnncpuser'
|
||||
alias ncp='cat /home/user/.nnncp'
|
||||
|
||||
so you can -
|
||||
|
||||
|
|
2
nnn.1
2
nnn.1
|
@ -257,7 +257,7 @@ screensaver.
|
|||
-------------------------------------
|
||||
.Ed
|
||||
.Pp
|
||||
\fBNNN_NO_X:\fR X display is unavailable. Copy file path(s) to \fI/tmp/nnncp$USER\fR.
|
||||
\fBNNN_NO_X:\fR X display is unavailable. Copy file path(s) to \fI$HOME/.nnncp\fR.
|
||||
.Bd -literal
|
||||
export NNN_NO_X=1
|
||||
.Ed
|
||||
|
|
26
nnn.c
26
nnn.c
|
@ -391,6 +391,8 @@ printerr(int linenum)
|
|||
{
|
||||
exitcurses();
|
||||
fprintf(stderr, "line %d: (%d) %s\n", linenum, errno, strerror(errno));
|
||||
if (cfg.noxdisplay)
|
||||
unlink(g_cppath);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -608,21 +610,11 @@ writecp(const char *buf, const size_t buflen)
|
|||
{
|
||||
FILE *fp = fopen(g_cppath, "w");
|
||||
|
||||
if (!fp) {
|
||||
struct passwd *pass = getpwuid(getuid());
|
||||
|
||||
xstrlcpy(g_cppath, "./nnncp", 11);
|
||||
xstrlcpy(g_cppath + 10, pass->pw_name, 33);
|
||||
|
||||
fp = fopen(g_cppath, "w");
|
||||
if (!fp)
|
||||
printwarn();
|
||||
}
|
||||
|
||||
if (fp) {
|
||||
fwrite(buf, 1, buflen, fp);
|
||||
fclose(fp);
|
||||
}
|
||||
} else
|
||||
printwarn();
|
||||
}
|
||||
|
||||
static bool
|
||||
|
@ -3431,11 +3423,8 @@ main(int argc, char *argv[])
|
|||
/* Check if X11 is available */
|
||||
if (getenv("NNN_NO_X")) {
|
||||
cfg.noxdisplay = 1;
|
||||
|
||||
struct passwd *pass = getpwuid(getuid());
|
||||
|
||||
xstrlcpy(g_cppath, "/tmp/nnncp", 11);
|
||||
xstrlcpy(g_cppath + 10, pass->pw_name, 33);
|
||||
size_t len = xstrlcpy(g_cppath, getenv("HOME"), 48);
|
||||
xstrlcpy(g_cppath + len - 1, "/.nnncp", 48 - len);
|
||||
}
|
||||
|
||||
signal(SIGINT, SIG_IGN);
|
||||
|
@ -3457,6 +3446,9 @@ main(int argc, char *argv[])
|
|||
browse(ipath, ifilter);
|
||||
exitcurses();
|
||||
|
||||
if (cfg.noxdisplay)
|
||||
unlink(g_cppath);
|
||||
|
||||
#ifdef LINUX_INOTIFY
|
||||
/* Shutdown inotify */
|
||||
if (inotify_wd >= 0)
|
||||
|
|
Loading…
Reference in a new issue