diff options
| author |   lum <lum@openbsd.org> | 2019-06-27 16:08:12 +0000 |
|---|---|---|
| committer | lum <lum@openbsd.org> | 2019-06-27 16:08:12 +0000 |
| commit | 87a172f96ce1fece4db11eadf861597fe4b8f5cb (patch) | |
| tree | a5d590ef8a844ee049446d467233b882921b8047 | |
| parent | Allow logging to both stderr and syslog; don't reset the log level if (diff) | |
| download | wireguard-openbsd-87a172f96ce1fece4db11eadf861597fe4b8f5cb.tar.xz wireguard-openbsd-87a172f96ce1fece4db11eadf861597fe4b8f5cb.zip | |
This diff uses the existing filename as the new filename if none is
specified while renaming in dired mode, and new file location is in a
different directory.
| -rw-r--r-- | usr.bin/mg/dired.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/usr.bin/mg/dired.c b/usr.bin/mg/dired.c index 92d37c52e95..6017b5684ee 100644 --- a/usr.bin/mg/dired.c +++ b/usr.bin/mg/dired.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dired.c,v 1.86 2019/06/26 16:48:00 lum Exp $ */ +/* $OpenBSD: dired.c,v 1.87 2019/06/27 16:08:12 lum Exp $ */ /* This file is in the public domain. */ @@ -496,6 +496,7 @@ d_copy(int f, int n) int d_rename(int f, int n) { + struct stat statbuf; char frname[NFILEN], toname[NFILEN]; char *topath, *bufp; int ret; @@ -523,11 +524,25 @@ d_rename(int f, int n) return (FALSE); topath = adjustname(toname, TRUE); + if (stat(topath, &statbuf) == 0) { + if (S_ISDIR(statbuf.st_mode)) { + off = snprintf(toname, sizeof(toname), "%s/%s", + topath, sname); + if (off < 0 || off >= sizeof(toname) - 1) { + dobeep(); + ewprintf("Directory name too long"); + return (FALSE); + } + topath = adjustname(toname, TRUE); + } + } ret = (rename(frname, topath) >= 0) ? TRUE : FALSE; if (ret != TRUE) return (ret); if ((bp = refreshbuffer(curbp)) == NULL) return (FALSE); + + ewprintf("Move: 1 file"); return (showbuffer(bp, curwp, WFFULL | WFMODE)); } |