int → bool
This commit is contained in:
parent
41144d022b
commit
287d4bc216
8
eval.c
8
eval.c
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include "sh.h"
|
#include "sh.h"
|
||||||
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.160 2014/11/25 21:13:23 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.161 2014/12/05 15:14:23 tg Exp $");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* string expansion
|
* string expansion
|
||||||
@ -70,7 +70,7 @@ static char *valsub(struct op *, Area *);
|
|||||||
static char *trimsub(char *, char *, int);
|
static char *trimsub(char *, char *, int);
|
||||||
static void glob(char *, XPtrV *, bool);
|
static void glob(char *, XPtrV *, bool);
|
||||||
static void globit(XString *, char **, char *, XPtrV *, int);
|
static void globit(XString *, char **, char *, XPtrV *, int);
|
||||||
static const char *maybe_expand_tilde(const char *, XString *, char **, int);
|
static const char *maybe_expand_tilde(const char *, XString *, char **, bool);
|
||||||
#ifndef MKSH_NOPWNAM
|
#ifndef MKSH_NOPWNAM
|
||||||
static char *homedir(char *);
|
static char *homedir(char *);
|
||||||
#endif
|
#endif
|
||||||
@ -1027,7 +1027,7 @@ expand(
|
|||||||
|
|
||||||
tcp = maybe_expand_tilde(sp,
|
tcp = maybe_expand_tilde(sp,
|
||||||
&ds, &tdp,
|
&ds, &tdp,
|
||||||
f & DOASNTILDE);
|
tobool(f & DOASNTILDE));
|
||||||
if (tcp) {
|
if (tcp) {
|
||||||
if (dp != tdp)
|
if (dp != tdp)
|
||||||
word = IFS_WORD;
|
word = IFS_WORD;
|
||||||
@ -1663,7 +1663,7 @@ debunk(char *dp, const char *sp, size_t dlen)
|
|||||||
* past the name, otherwise returns 0.
|
* past the name, otherwise returns 0.
|
||||||
*/
|
*/
|
||||||
static const char *
|
static const char *
|
||||||
maybe_expand_tilde(const char *p, XString *dsp, char **dpp, int isassign)
|
maybe_expand_tilde(const char *p, XString *dsp, char **dpp, bool isassign)
|
||||||
{
|
{
|
||||||
XString ts;
|
XString ts;
|
||||||
char *dp = *dpp;
|
char *dp = *dpp;
|
||||||
|
Loading…
Reference in New Issue
Block a user