ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

files: when opening a buffer, make sure to expand a tilde in its name 

When a tilde is used in the name given at the ^R or ^O prompts, nano
expands it, but /not/ when a tilde is given on the command line (in
such a way that the shell leaves it as is).  Correct that asymmetry.

This fixes https://savannah.gnu.org/bugs/?44929
and fixes https://savannah.gnu.org/bugs/?47702
and fixes https://savannah.gnu.org/bugs/?47771.
master
Benno Schulenberg 2016-04-23 18:13:43 +02:00
parent 41ed690791
commit bfe418febb
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/files.c
View File

@ -418,6 +418,8 @@ bool open_buffer(const char *filename, bool undoable)
#endif #endif
); );
/* Whether we load into this buffer or a new one. */ /* Whether we load into this buffer or a new one. */
char *realname;
/* The filename after tilde expansion. */
FILE *f; FILE *f;
int rc; int rc;
/* rc == -2 means that we have a new file. -1 means that the /* rc == -2 means that we have a new file. -1 means that the
@ -433,17 +435,20 @@ bool open_buffer(const char *filename, bool undoable)
} }
#endif #endif
realname = real_dir_from_tilde(filename);
/* When the specified filename is not empty, and the thing exists, /* When the specified filename is not empty, and the thing exists,
* verify that it is a normal file. */ * verify that it is a normal file. */
if (strcmp(filename, "") != 0) { if (strcmp(filename, "") != 0) {
struct stat fileinfo; struct stat fileinfo;
if (stat(filename, &fileinfo) == 0 && !S_ISREG(fileinfo.st_mode)) { if (stat(realname, &fileinfo) == 0 && !S_ISREG(fileinfo.st_mode)) {
if (S_ISDIR(fileinfo.st_mode)) if (S_ISDIR(fileinfo.st_mode))
statusbar(_("\"%s\" is a directory"), filename); statusbar(_("\"%s\" is a directory"), realname);
else else
statusbar(_("\"%s\" is not a normal file"), filename); statusbar(_("\"%s\" is not a normal file"), realname);
beep(); beep();
free(realname);
return FALSE; return FALSE;
} }
} }
@ -453,16 +458,17 @@ bool open_buffer(const char *filename, bool undoable)
if (new_buffer) { if (new_buffer) {
make_new_buffer(); make_new_buffer();
if (!has_valid_path(filename)) if (!has_valid_path(realname))
quiet = TRUE; quiet = TRUE;
#ifndef NANO_TINY #ifndef NANO_TINY
else { else {
if (ISSET(LOCKING) && filename[0] != '\0') { if (ISSET(LOCKING) && filename[0] != '\0') {
int lockstatus = do_lockfile(filename); int lockstatus = do_lockfile(realname);
if (lockstatus < 0) { if (lockstatus < 0) {
#ifndef DISABLE_MULTIBUFFER #ifndef DISABLE_MULTIBUFFER
if (openfile->next) { if (openfile->next) {
close_buffer(TRUE); close_buffer(TRUE);
free(realname);
return FALSE; return FALSE;
} }
#endif #endif
@ -476,20 +482,20 @@ bool open_buffer(const char *filename, bool undoable)
/* If the filename isn't blank, and we are not in NOREAD_MODE, /* If the filename isn't blank, and we are not in NOREAD_MODE,
* open the file. Otherwise, treat it as a new file. */ * open the file. Otherwise, treat it as a new file. */
rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ? rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ?
open_file(filename, new_buffer, quiet, &f) : -2; open_file(realname, new_buffer, quiet, &f) : -2;
/* If we have a file, and we're loading into a new buffer, update /* If we have a file, and we're loading into a new buffer, update
* the filename. */ * the filename. */
if (rc != -1 && new_buffer) if (rc != -1 && new_buffer)
openfile->filename = mallocstrcpy(openfile->filename, filename); openfile->filename = mallocstrcpy(openfile->filename, realname);
/* If we have a non-new file, read it in. Then, if the buffer has /* If we have a non-new file, read it in. Then, if the buffer has
* no stat, update the stat, if applicable. */ * no stat, update the stat, if applicable. */
if (rc > 0) { if (rc > 0) {
read_file(f, rc, filename, undoable, new_buffer); read_file(f, rc, realname, undoable, new_buffer);
#ifndef NANO_TINY #ifndef NANO_TINY
if (openfile->current_stat == NULL) if (openfile->current_stat == NULL)
stat_with_alloc(filename, &openfile->current_stat); stat_with_alloc(realname, &openfile->current_stat);
#endif #endif
} }
@ -507,6 +513,7 @@ bool open_buffer(const char *filename, bool undoable)
if (new_buffer) if (new_buffer)
color_update(); color_update();
#endif #endif
free(realname);
return TRUE; return TRUE;
} }