* Merge in cygwin-64bit-branch.
This commit is contained in:
@@ -94,7 +94,7 @@ static int fts_ufslinks(FTS *, const FTSENT *);
|
||||
struct _fts_private {
|
||||
FTS ftsp_fts;
|
||||
struct statfs ftsp_statfs;
|
||||
__dev32_t ftsp_dev;
|
||||
dev_t ftsp_dev;
|
||||
int ftsp_linksreliable;
|
||||
};
|
||||
|
||||
@@ -507,7 +507,7 @@ name: t = sp->fts_path + NAPPEND(p->fts_parent);
|
||||
/* ARGSUSED */
|
||||
int
|
||||
fts_set(sp, p, instr)
|
||||
FTS *sp;
|
||||
FTS *sp __attribute__ ((unused));
|
||||
FTSENT *p;
|
||||
int instr;
|
||||
{
|
||||
@@ -758,7 +758,7 @@ fts_build(sp, type)
|
||||
|
||||
if ((p = fts_alloc(sp, dp->d_name, (int)dnamlen)) == NULL)
|
||||
goto mem1;
|
||||
if (dnamlen >= maxlen) { /* include space for NUL */
|
||||
if ((int) dnamlen >= maxlen) { /* include space for NUL */
|
||||
oldaddr = sp->fts_path;
|
||||
if (fts_palloc(sp, dnamlen + len + 1)) {
|
||||
/*
|
||||
@@ -907,9 +907,9 @@ fts_stat(sp, p, follow)
|
||||
int follow;
|
||||
{
|
||||
FTSENT *t;
|
||||
__dev32_t dev;
|
||||
__ino64_t ino;
|
||||
struct __stat64 *sbp, sb;
|
||||
dev_t dev;
|
||||
ino_t ino;
|
||||
struct stat *sbp, sb;
|
||||
int saved_errno;
|
||||
|
||||
/* If user needs stat info, stat buffer already allocated. */
|
||||
@@ -943,7 +943,7 @@ fts_stat(sp, p, follow)
|
||||
}
|
||||
} else if (lstat64(p->fts_accpath, sbp)) {
|
||||
p->fts_errno = errno;
|
||||
err: memset(sbp, 0, sizeof(struct __stat64));
|
||||
err: memset(sbp, 0, sizeof(struct stat));
|
||||
return (FTS_NS);
|
||||
}
|
||||
|
||||
@@ -1041,7 +1041,7 @@ fts_alloc(sp, name, namelen)
|
||||
|
||||
struct ftsent_withstat {
|
||||
FTSENT ent;
|
||||
struct __stat64 statbuf;
|
||||
struct stat statbuf;
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -1177,7 +1177,7 @@ fts_safe_changedir(sp, p, fd, path)
|
||||
const char *path;
|
||||
{
|
||||
int ret, oerrno, newfd;
|
||||
struct __stat64 sb;
|
||||
struct stat sb;
|
||||
|
||||
newfd = fd;
|
||||
if (ISSET(FTS_NOCHDIR))
|
||||
|
Reference in New Issue
Block a user