From 0bc998d8ab014112cc6a2de7c05399c9f45e7b8f Mon Sep 17 00:00:00 2001 From: Jacques Vidrine Date: Mon, 27 Jul 1998 21:15:52 +0000 Subject: [PATCH] csh built-in printf now expands arguments. e.g. printf '%d\n' `echo 23` now works as expected. PR: bin/2969 Submitted by: Gareth McCaughan --- bin/csh/func.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/csh/func.c b/bin/csh/func.c index 42dad633adb3..1b8da96bf671 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: func.c,v 1.9 1997/08/08 00:54:03 steve Exp $"; + "$Id: func.c,v 1.10 1998/02/28 10:49:56 jraynard Exp $"; #endif #endif /* not lint */ @@ -1491,10 +1491,23 @@ doprintf(v, t) Char **v; struct command *t; { + Char **newv; char **c; extern int progprintf __P((int, char **)); int ret; + gflag = 0; + tglob(v); + if (gflag) { + newv = globall(v); + if (newv == 0) { + stderror(ERR_NAME | ERR_NOMATCH); + return; + } + v = newv; + gargv=0; + } + ret = progprintf(blklen(v), c = short2blk(v)); (void) fflush(cshout); (void) fflush(csherr);