[src/trunk]: src/usr.bin/mail undo previous; mail never expanded $ variables ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f38dbccab15b
branches:  trunk
changeset: 785340:f38dbccab15b
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 09 19:43:07 2013 +0000

description:
undo previous; mail never expanded $ variables in folder.

diffstat:

 usr.bin/mail/fio.c |  21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diffs (47 lines):

diff -r a5d9c3a90808 -r f38dbccab15b usr.bin/mail/fio.c
--- a/usr.bin/mail/fio.c        Sat Mar 09 16:02:25 2013 +0000
+++ b/usr.bin/mail/fio.c        Sat Mar 09 19:43:07 2013 +0000
@@ -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 @@
 {
        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;
 }