JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove USE_PRINTF hooks, it never worked anyway, and probably nobody

Browse Source 
is going to fix it...
This commit is contained in:
tg
2005-10-21 11:44:25 +00:00
parent 30aed785bc
commit 0b85dc1e81
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,21 +1,10 @@
# $MirOS: src/bin/mksh/Makefile,v 1.7 2005/10/20 12:47:49 tg Exp $ # $MirOS: src/bin/mksh/Makefile,v 1.8 2005/10/21 11:44:25 tg Exp $
PROG= mksh PROG= mksh
SRCS= alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \ SRCS= alloc.c edit.c eval.c exec.c expr.c funcs.c histrap.c \
jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c jobs.c lex.c main.c misc.c shf.c syn.c tree.c var.c
CDIAGFLAGS+= -Wno-cast-qual CDIAGFLAGS+= -Wno-cast-qual
.include <bsd.own.mk>
NO_PRINTF_BUILTIN=broken for now
.ifndef NO_PRINTF_BUILTIN
.PATH: ${BSDSRCDIR}/usr.bin/printf
SRCS+= printf.c
CFLAGS_printf.o=-DBUILTIN
CPPFLAGS+= -DUSE_PRINTF
.endif
check: check:
@cd ${.CURDIR} && ${MAKE} regress V=-v @cd ${.CURDIR} && ${MAKE} regress V=-v

25
funcs.c
View File

@ -1,4 +1,4 @@
/** $MirOS: src/bin/mksh/funcs.c,v 1.19 2005/10/08 19:30:59 tg Exp $ */ /** $MirOS: src/bin/mksh/funcs.c,v 1.20 2005/10/21 11:44:25 tg Exp $ */
/* $OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $ */
/* $OpenBSD: c_sh.c,v 1.29 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: c_sh.c,v 1.29 2005/03/30 17:16:37 deraadt Exp $ */
/* $OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $ */
@ -13,11 +13,7 @@
#include <ulimit.h> #include <ulimit.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.19 2005/10/08 19:30:59 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.20 2005/10/21 11:44:25 tg Exp $");
#ifdef USE_PRINTF
int c_printf(char **);
#endif
int int
c_cd(char **wp) c_cd(char **wp)
@ -1083,20 +1079,6 @@ c_fgbg(char **wp)
return bg ? 0 : rv; return bg ? 0 : rv;
} }
#ifdef USE_PRINTF
int
c_printf(char **wp)
{
extern int progprintf(int, char *[]);
int argc;
for (argc = 0; wp[argc]; argc++)
;
return progprintf(argc, wp);
}
#endif
struct kill_info { struct kill_info {
int num_width; int num_width;
int name_width; int name_width;
@ -1391,9 +1373,6 @@ const struct builtin kshbuiltins [] = {
{"+bg", c_fgbg}, {"+bg", c_fgbg},
{"+fg", c_fgbg}, {"+fg", c_fgbg},
{"bind", c_bind}, {"bind", c_bind},
#ifdef USE_PRINTF
{"printf", c_printf},
#endif
{NULL, NULL} {NULL, NULL}
}; };