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

rename the “tilde” function; apparently, some system headers define it

Browse Source
This commit is contained in:
tg
2014-11-19 21:49:12 +00:00
parent 9b31399aec
commit 517bd63fe5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.158 2014/10/19 21:53:07 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.159 2014/11/19 21:49:12 tg Exp $");
/*
* string expansion
@ -1681,7 +1681,7 @@ maybe_expand_tilde(const char *p, XString *dsp, char **dpp, int isassign)
}
*tp = '\0';
r = (p[0] == EOS || p[0] == CHAR || p[0] == CSUBST) ?
tilde(Xstring(ts, tp)) : NULL;
do_tilde(Xstring(ts, tp)) : NULL;
Xfree(ts, tp);
if (r) {
while (*r) {
@ -1703,7 +1703,7 @@ maybe_expand_tilde(const char *p, XString *dsp, char **dpp, int isassign)
*/
char *
tilde(char *cp)
do_tilde(char *cp)
{
char *dp = null;