OpenPAM/OpenPAM
OpenPAM/OpenPAM
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Partially revert r871 until a better solution can be found, as it only

Browse source 
works if the file already exists.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@880 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2016-01-09 17:52:39 +00:00
parent a38c5db91b
commit 310b5ee125
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
t/t_file.c
View file

@ -55,25 +55,21 @@ struct t_file *
t_fopen(const char *filename) t_fopen(const char *filename)
{ {
struct t_file *tf; struct t_file *tf;
int fd, dynfn; int fd;
if ((tf = calloc(sizeof *tf, 1)) == NULL) if ((tf = calloc(sizeof *tf, 1)) == NULL)
err(1, "%s(): calloc()", __func__); err(1, "%s(): calloc()", __func__);
if (filename) { if (filename) {
dynfn = 0; if ((tf->name = strdup(filename)) == NULL)
err(1, "%s(): strdup()", __func__);
} else { } else {
asprintf(&filename, "%s.%lu.%p.tmp", asprintf(&tf->name, "%s.%lu.%p.tmp",
t_progname, (unsigned long)getpid(), (void *)tf); t_progname, (unsigned long)getpid(), (void *)tf);
if (filename == NULL) if (tf->name == NULL)
err(1, "%s(): asprintf()", __func__); err(1, "%s(): asprintf()", __func__);
dynfn = 1;
} }
if ((fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, 0600)) < 0) if ((fd = open(tf->name, O_RDWR|O_CREAT|O_TRUNC, 0600)) < 0)
err(1, "%s(): %s", __func__, tf->name); err(1, "%s(): %s", __func__, tf->name);
if ((tf->name = realpath(filename, NULL)) == NULL)
err(1, "%s(): realpath()", __func__);
if (dynfn)
free(filename);
if ((tf->file = fdopen(fd, "r+")) == NULL) if ((tf->file = fdopen(fd, "r+")) == NULL)
err(1, "%s(): fdopen()", __func__); err(1, "%s(): fdopen()", __func__);
if ((tf->next = tflist) != NULL) if ((tf->next = tflist) != NULL)