--- src/usr.bin/make/main.c 2005/03/03 23:39:06 1.58 +++ src/usr.bin/make/main.c 2005/03/12 10:17:00 1.59 @@ -896,19 +896,18 @@ main(int argc, char **argv) LST_FOREACH(n, &variables) { const char *name = Lst_Datum(n); if (expandVars) { - Buffer *buf; char *v; char *value; v = emalloc(strlen(name) + 1 + 3); sprintf(v, "${%s}", name); - buf = Var_Subst(NULL, v, VAR_GLOBAL, FALSE); - value = Buf_GetAll(buf, NULL); + value = Buf_Peel(Var_Subst(NULL, v, + VAR_GLOBAL, FALSE)); printf("%s\n", value); - Buf_Destroy(buf, TRUE); free(v); + free(value); } else { char *value; char *v;