apply some fixes from OpenBSD and don't apply some others
but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
This commit is contained in:
6
eval.c
6
eval.c
@ -1,8 +1,8 @@
|
||||
/* $OpenBSD: eval.c,v 1.28 2005/12/11 20:31:21 otto Exp $ */
|
||||
/* $OpenBSD: eval.c,v 1.30 2006/04/10 14:38:59 jaredy Exp $ */
|
||||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.11 2006/05/08 11:07:38 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.12 2006/05/10 18:54:09 tg Exp $");
|
||||
|
||||
/*
|
||||
* string expansion
|
||||
@ -852,7 +852,7 @@ comsub(Expand *xp, char *cp)
|
||||
int ofd1, pv[2];
|
||||
openpipe(pv);
|
||||
shf = shf_fdopen(pv[0], SHF_RD, NULL);
|
||||
ofd1 = savefd(1, 0); /* fd 1 may be closed... */
|
||||
ofd1 = savefd(1);
|
||||
if (pv[1] != 1) {
|
||||
ksh_dup2(pv[1], 1, false);
|
||||
close(pv[1]);
|
||||
|
Reference in New Issue
Block a user