Module Name: src Committed By: christos Date: Sat Mar 9 19:43:07 UTC 2013
Modified Files: src/usr.bin/mail: fio.c Log Message: undo previous; mail never expanded $ variables in folder. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/usr.bin/mail/fio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/mail/fio.c diff -u src/usr.bin/mail/fio.c:1.39 src/usr.bin/mail/fio.c:1.40 --- src/usr.bin/mail/fio.c:1.39 Wed Mar 6 15:49:20 2013 +++ src/usr.bin/mail/fio.c Sat Mar 9 14:43:07 2013 @@ -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; }