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

oops unbreak -DMKSH_NOPWNAM

Browse Source
This commit is contained in:
tg 2007-01-17 18:01:51 +00:00
parent 42783fdfd9
commit 6646fff759
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eval.c
View File

@ -2,7 +2,11 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.21 2007/01/17 17:42:22 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.22 2007/01/17 18:01:51 tg Exp $");
#ifdef MKSH_SMALL
#define MKSH_NOPWNAM
#endif
/* /*
* string expansion * string expansion
@ -43,10 +47,8 @@ static void glob(char *, XPtrV *, int);
static void globit(XString *, char **, char *, XPtrV *, int); static void globit(XString *, char **, char *, XPtrV *, int);
static char *maybe_expand_tilde(char *, XString *, char **, int); static char *maybe_expand_tilde(char *, XString *, char **, int);
static char *tilde(char *); static char *tilde(char *);
#ifndef MKSH_SMALL #ifndef MKSH_NOPWNAM
static char *homedir(char *); static char *homedir(char *);
#else
#define homedir(x) null
#endif #endif
static void alt_expand(XPtrV *, char *, char *, char *, int); static void alt_expand(XPtrV *, char *, char *, char *, int);
@ -1159,7 +1161,7 @@ maybe_expand_tilde(char *p, XString *dsp, char **dpp, int isassign)
static char * static char *
tilde(char *cp) tilde(char *cp)
{ {
char *dp; char *dp = null;
if (cp[0] == '\0') if (cp[0] == '\0')
dp = str_val(global("HOME")); dp = str_val(global("HOME"));
@ -1167,15 +1169,17 @@ tilde(char *cp)
dp = str_val(global("PWD")); dp = str_val(global("PWD"));
else if (cp[0] == '-' && cp[1] == '\0') else if (cp[0] == '-' && cp[1] == '\0')
dp = str_val(global("OLDPWD")); dp = str_val(global("OLDPWD"));
#ifndef MKSH_NOPWNAM
else else
dp = homedir(cp); dp = homedir(cp);
#endif
/* If HOME, PWD or OLDPWD are not set, don't expand ~ */ /* If HOME, PWD or OLDPWD are not set, don't expand ~ */
if (dp == null) if (dp == null)
dp = NULL; dp = NULL;
return dp; return dp;
} }
#if !defined(MKSH_SMALL) && !defined(MKSH_NOPWNAM) #ifndef MKSH_NOPWNAM
/* /*
* map userid to user's home directory. * map userid to user's home directory.
* note that 4.3's getpw adds more than 6K to the shell, * note that 4.3's getpw adds more than 6K to the shell,