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

fix various file-saving bugs 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4081 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2007-04-18 19:09:44 +00:00
parent 7fc36c77d2
commit b8dfcb3896
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,11 @@
whenever possible, so that ~user/file.txt and "~user/file.txt" whenever possible, so that ~user/file.txt and "~user/file.txt"
are treated the same way if ~user is a user's home directory. are treated the same way if ~user is a user's home directory.
* files.c (real_dir_from_tilde): Simplify. * files.c (real_dir_from_tilde): Simplify.
* files.c (do_writeout): Properly display the warning in all
cases if we try to save (a) an existing file under a different
name, or (b) a file with no name under an existing file's name.
* files.c (do_writeout): Rename variable different_name to
do_warning, for clarity.
* rcfile.c (parse_include): Open files using their full paths * rcfile.c (parse_include): Open files using their full paths
whenever possible, so that ~user/file.txt and "~user/file.txt" whenever possible, so that ~user/file.txt and "~user/file.txt"
are treated the same way if ~user is a user's home directory. are treated the same way if ~user is a user's home directory.

12
src/files.c
View File

@ -1892,7 +1892,7 @@ bool do_writeout(bool exiting)
if (append == OVERWRITE) { if (append == OVERWRITE) {
size_t answer_len = strlen(answer); size_t answer_len = strlen(answer);
bool name_exists, different_name; bool name_exists, do_warning;
char *full_answer, *full_filename; char *full_answer, *full_filename;
struct stat st; struct stat st;
@ -1900,12 +1900,14 @@ bool do_writeout(bool exiting)
* full path. */ * full path. */
sunder(answer); sunder(answer);
name_exists = (stat(answer, &st) != -1);
full_answer = get_full_path(answer); full_answer = get_full_path(answer);
full_filename = get_full_path(openfile->filename); full_filename = get_full_path(openfile->filename);
different_name = (strcmp((full_answer == NULL) ? name_exists = (stat((full_answer == NULL) ? answer :
full_answer, &st) != -1);
do_warning = ((openfile->filename[0] == '\0' &&
name_exists) || (strcmp((full_answer == NULL) ?
answer : full_answer, (full_filename == NULL) ? answer : full_answer, (full_filename == NULL) ?
openfile->filename : full_filename) != 0); openfile->filename : full_filename) != 0));
/* Convert nulls to newlines. answer_len is the /* Convert nulls to newlines. answer_len is the
* string's real length. */ * string's real length. */
@ -1916,7 +1918,7 @@ bool do_writeout(bool exiting)
if (full_answer != NULL) if (full_answer != NULL)
free(full_answer); free(full_answer);
if (different_name) { if (do_warning) {
if (name_exists) { if (name_exists) {
/* If we're using restricted mode, we aren't /* If we're using restricted mode, we aren't
* allowed to save a new file under the name of * allowed to save a new file under the name of