Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo previous; mail never expanded $ variables in folder.

Browse Source
This commit is contained in:
christos 2013-03-09 19:43:07 +00:00
parent 87304c8cb4
commit 4b1752e245
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/mail/fio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fio.c,v 1.39 2013/03/06 20:49:20 christos Exp $ */
/* $NetBSD: fio.c,v 1.40 2013/03/09 19:43:07 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else
__RCSID("$NetBSD: fio.c,v 1.39 2013/03/06 20:49:20 christos Exp $");
__RCSID("$NetBSD: fio.c,v 1.40 2013/03/09 19:43:07 christos Exp $");
#endif
#endif /* not lint */
@ -394,21 +394,18 @@ getfold(char *name, size_t namesize)
{
char unres[PATHSIZE], res[PATHSIZE];
char *folder;
const char *f;
if ((folder = value(ENAME_FOLDER)) == NULL)
return -1;
if ((f = expand(folder)) == NULL)
return -1;
if (*f != '/') {
(void)snprintf(unres, sizeof(unres), "%s/%s", homedir, f);
f = unres;
if (*folder != '/') {
(void)snprintf(unres, sizeof(unres), "%s/%s", homedir, folder);
folder = unres;
}
if (realpath(f, res) == NULL)
warn("Can't canonicalize folder `%s'", f);
if (realpath(folder, res) == NULL)
warn("Can't canonicalize folder `%s'", folder);
else
f = res;
(void)strlcpy(name, f, namesize);
folder = res;
(void)strlcpy(name, folder, namesize);
return 0;
}