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

Use upstream style macro/function names

Browse Source 
modified:   edit.c
    modified:   eval.c
    modified:   exec.c
    modified:   main.c
    modified:   misc.c
    modified:   sh.h
This commit is contained in:
KO Myung-Hun
2015-07-21 15:39:28 +09:00
parent 2c5474b326
commit 4c61aeebe5
6 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eval.c
View File

@ -1535,7 +1535,7 @@ globit(XString *xs, /* dest string */
* SunOS 4.1.3 does this...
*/
if ((check & GF_EXCHECK) && xp > Xstring(*xs, xp) &&
IS_DIR_SEP(xp[-1]) && !S_ISDIR(lstatb.st_mode) &&
mksh_dirsep(xp[-1]) && !S_ISDIR(lstatb.st_mode) &&
(!S_ISLNK(lstatb.st_mode) ||
stat_check() < 0 || !S_ISDIR(statb.st_mode)))
return;
@ -1545,7 +1545,7 @@ globit(XString *xs, /* dest string */
* directory
*/
if (((check & GF_MARKDIR) && (check & GF_GLOBBED)) &&
xp > Xstring(*xs, xp) && !IS_DIR_SEP(xp[-1]) &&
xp > Xstring(*xs, xp) && !mksh_dirsep(xp[-1]) &&
(S_ISDIR(lstatb.st_mode) ||
(S_ISLNK(lstatb.st_mode) && stat_check() > 0 &&
S_ISDIR(statb.st_mode)))) {
@ -1560,11 +1560,11 @@ globit(XString *xs, /* dest string */
if (xp > Xstring(*xs, xp))
*xp++ = '/';
while (IS_DIR_SEP(*sp)) {
while (mksh_dirsep(*sp)) {
Xcheck(*xs, xp);
*xp++ = *sp++;
}
np = ksh_strchr_dirsep(sp);
np = mksh_strchr_dirsep(sp);
if (np != NULL) {
se = np;
/* don't assume '/', can be multiple kinds */
@ -1672,7 +1672,7 @@ maybe_expand_tilde(const char *p, XString *dsp, char **dpp, bool isassign)
Xinit(ts, tp, 16, ATEMP);
/* : only for DOASNTILDE form */
while (p[0] == CHAR && !IS_DIR_SEP(p[1]) && (!isassign || p[1] != ':'))
while (p[0] == CHAR && !mksh_dirsep(p[1]) && (!isassign || p[1] != ':'))
{
Xcheck(ts, tp);
*tp++ = p[1];