commit 8ad3b7862654538aa31996b4467b2683db2631a1
parent 6ad82142c0f1d1a1590ac110f107d24b1359ac60
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 27 Nov 2006 05:40:09 +0000
cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3979 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/files.c b/src/files.c
@@ -802,8 +802,8 @@ void do_insertfile(
answer_len = strlen(answer);
- /* Convert newlines to nulls, just before we execute a
- * command. */
+ /* Convert newlines to nulls, just before we insert a file
+ * or execute a command. */
sunder(answer);
#ifndef NANO_TINY
@@ -1310,16 +1310,7 @@ int write_file(const char *name, FILE *f_open, bool tmp, append_type
if (!tmp)
titlebar(NULL);
- realname = mallocstrcpy(NULL, name);
-
- /* Convert newlines to nulls, just before we get the tilde-expanded
- * filename. */
- sunder(realname);
-
- if (realname[0] == '\0')
- goto cleanup_and_exit;
-
- realname = mallocstrassn(realname, real_dir_from_tilde(realname));
+ realname = real_dir_from_tilde(name);
#ifndef DISABLE_OPERATINGDIR
/* If we're writing a temporary file, we're probably going outside