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

various umask-related cleanups 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2595 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-06-05 19:33:27 +00:00
parent 81dabf2be7
commit 6fdc81ae04
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/files.c
View File

@ -1139,17 +1139,18 @@ char *check_writable_directory(const char *path)
char *safe_tempfile(FILE **f) char *safe_tempfile(FILE **f)
{ {
char *full_tempdir = NULL; char *full_tempdir = NULL;
const char *TMPDIR_env; const char *tmpdir_env;
int filedesc; int fd;
mode_t original_umask = 0;
assert(f != NULL); assert(f != NULL);
/* If $TMPDIR is set and non-empty, set tempdir to it, run it /* If $TMPDIR is set and non-empty, set tempdir to it, run it
* through get_full_path(), and save the result in full_tempdir. * through get_full_path(), and save the result in full_tempdir.
* Otherwise, leave full_tempdir set to NULL. */ * Otherwise, 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 && tmpdir_env[0] != '\0')
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
* full_tempdir is NULL, try P_tmpdir instead. */ * full_tempdir is NULL, try P_tmpdir instead. */
@ -1162,15 +1163,21 @@ char *safe_tempfile(FILE **f)
full_tempdir = charealloc(full_tempdir, strlen(full_tempdir) + 12); full_tempdir = charealloc(full_tempdir, strlen(full_tempdir) + 12);
strcat(full_tempdir, "nano.XXXXXX"); strcat(full_tempdir, "nano.XXXXXX");
filedesc = mkstemp(full_tempdir);
if (filedesc != -1) original_umask = umask(0);
*f = fdopen(filedesc, "r+b"); umask(S_IRWXG | S_IRWXO);
fd = mkstemp(full_tempdir);
if (fd != -1)
*f = fdopen(fd, "r+b");
else { else {
free(full_tempdir); free(full_tempdir);
full_tempdir = NULL; full_tempdir = NULL;
} }
umask(original_umask);
return full_tempdir; return full_tempdir;
} }
@ -1516,13 +1523,13 @@ int write_file(const char *name, FILE *f_open, bool tmp, int append,
if (f_open == NULL) { if (f_open == NULL) {
original_umask = umask(0); original_umask = umask(0);
umask(original_umask);
/* If we create a temp file, we don't let anyone else access it. /* If we create a temp file, we don't let anyone else access it.
* We create a temp file if tmp is TRUE or if we're * We create a temp file if tmp is TRUE. */
* prepending. */ if (tmp)
if (tmp || append == 2)
umask(S_IRWXG | S_IRWXO); umask(S_IRWXG | S_IRWXO);
else
umask(original_umask);
} }
/* If we're prepending, copy the file to a temp file. */ /* If we're prepending, copy the file to a temp file. */