in safe_tempfile(), don't ignore $TMPDIR if it's set but blank, for
consistency git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3356 35c25a1d-7b9e-4130-9fde-d3aeb78583b8master
parent
e5af25baef
commit
ac8dfca510
|
@ -11,6 +11,9 @@ CVS code -
|
||||||
- Open all files in binary mode for consistency and robustness.
|
- Open all files in binary mode for consistency and robustness.
|
||||||
Changes to load_history() and do_rcfile(). (DLR)
|
Changes to load_history() and do_rcfile(). (DLR)
|
||||||
- files.c:
|
- files.c:
|
||||||
|
safe_tempfile()
|
||||||
|
- Don't ignore $TMPDIR if it's set but blank, for consistency.
|
||||||
|
(DLR)
|
||||||
write_file()
|
write_file()
|
||||||
- Don't free backupname before displaying it in a statusbar error
|
- Don't free backupname before displaying it in a statusbar error
|
||||||
message. (DLR, found by Bill Marcum)
|
message. (DLR, found by Bill Marcum)
|
||||||
|
|
|
@ -1061,11 +1061,11 @@ char *safe_tempfile(FILE **f)
|
||||||
|
|
||||||
assert(f != NULL);
|
assert(f != NULL);
|
||||||
|
|
||||||
/* If $TMPDIR is set and non-empty, set tempdir to it, run it
|
/* If $TMPDIR is set, set tempdir to it, run it through
|
||||||
* through get_full_path(), and save the result in full_tempdir.
|
* get_full_path(), and save the result in full_tempdir. Otherwise,
|
||||||
* Otherwise, leave full_tempdir set to NULL. */
|
* leave full_tempdir set to NULL. */
|
||||||
tmpdir_env = getenv("TMPDIR");
|
tmpdir_env = getenv("TMPDIR");
|
||||||
if (tmpdir_env != NULL && tmpdir_env[0] != '\0')
|
if (tmpdir_env != NULL)
|
||||||
full_tempdir = check_writable_directory(tmpdir_env);
|
full_tempdir = check_writable_directory(tmpdir_env);
|
||||||
|
|
||||||
/* If $TMPDIR is unset, empty, or not a writable directory, and
|
/* If $TMPDIR is unset, empty, or not a writable directory, and
|
||||||
|
|
Loading…
Reference in New Issue