/** \ingroup rpmio
*/
static inline
-int __fdFileno(void * cookie)
+int fdFileno(void * cookie)
{
FD_t fd;
if (cookie == NULL) return -2;
/**
*/
-static ssize_t __fdRead(void * cookie, char * buf, size_t count)
+static ssize_t fdRead(void * cookie, char * buf, size_t count)
{
FD_t fd = c2f(cookie);
ssize_t rc;
if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */
fdstat_enter(fd, FDSTAT_READ);
- rc = read(__fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count));
+ rc = read(fdFileno(fd), buf, (count > fd->bytesRemain ? fd->bytesRemain : count));
fdstat_exit(fd, FDSTAT_READ, rc);
if (fd->ndigests && rc > 0) fdUpdateDigests(fd, (void *)buf, rc);
-DBGIO(fd, (stderr, "==>\t__fdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd)));
+DBGIO(fd, (stderr, "==>\tfdRead(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd)));
return rc;
}
/**
*/
-static ssize_t __fdWrite(void * cookie, const char * buf, size_t count)
+static ssize_t fdWrite(void * cookie, const char * buf, size_t count)
{
FD_t fd = c2f(cookie);
- int fdno = __fdFileno(fd);
+ int fdno = fdFileno(fd);
ssize_t rc;
if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */
rc = write(fdno, buf, (count > fd->bytesRemain ? fd->bytesRemain : count));
fdstat_exit(fd, FDSTAT_WRITE, rc);
-DBGIO(fd, (stderr, "==>\t__fdWrite(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd)));
+DBGIO(fd, (stderr, "==>\tfdWrite(%p,%p,%ld) rc %ld %s\n", cookie, buf, (long)count, (long)rc, fdbg(fd)));
return rc;
}
assert(fd->bytesRemain == -1); /* XXX FIXME fadio only for now */
fdstat_enter(fd, FDSTAT_SEEK);
- rc = lseek(__fdFileno(fd), p, whence);
+ rc = lseek(fdFileno(fd), p, whence);
fdstat_exit(fd, FDSTAT_SEEK, rc);
DBGIO(fd, (stderr, "==>\tfdSeek(%p,%ld,%d) rc %lx %s\n", cookie, (long)p, whence, (unsigned long)rc, fdbg(fd)));
/**
*/
-static int __fdClose( void * cookie)
+static int fdClose( void * cookie)
{
FD_t fd;
int fdno;
if (cookie == NULL) return -2;
fd = c2f(cookie);
- fdno = __fdFileno(fd);
+ fdno = fdFileno(fd);
fdSetFdno(fd, -1);
rc = ((fdno >= 0) ? close(fdno) : -2);
fdstat_exit(fd, FDSTAT_CLOSE, rc);
-DBGIO(fd, (stderr, "==>\t__fdClose(%p) rc %lx %s\n", (fd ? fd : NULL), (unsigned long)rc, fdbg(fd)));
+DBGIO(fd, (stderr, "==>\tfdClose(%p) rc %lx %s\n", (fd ? fd : NULL), (unsigned long)rc, fdbg(fd)));
- fd = fdFree(fd, "open (__fdClose)");
+ fd = fdFree(fd, "open (fdClose)");
return rc;
}
/**
*/
-static FD_t __fdOpen(const char *path, int flags, mode_t mode)
+static FD_t fdOpen(const char *path, int flags, mode_t mode)
{
FD_t fd;
int fdno;
(void) close(fdno);
return NULL;
}
- fd = fdNew("open (__fdOpen)");
+ fd = fdNew("open (fdOpen)");
fdSetFdno(fd, fdno);
fd->flags = flags;
-DBGIO(fd, (stderr, "==>\t__fdOpen(\"%s\",%x,0%o) %s\n", path, (unsigned)flags, (unsigned)mode, fdbg(fd)));
+DBGIO(fd, (stderr, "==>\tfdOpen(\"%s\",%x,0%o) %s\n", path, (unsigned)flags, (unsigned)mode, fdbg(fd)));
return fd;
}
static struct FDIO_s fdio_s = {
- __fdRead, __fdWrite, fdSeek, __fdClose, XfdLink, XfdFree, XfdNew, __fdFileno,
- __fdOpen, NULL, fdGetFp, NULL, mkdir, chdir, rmdir, rename, unlink
+ fdRead, fdWrite, fdSeek, fdClose, XfdLink, XfdFree, XfdNew, fdFileno,
+ fdOpen, NULL, fdGetFp, NULL, mkdir, chdir, rmdir, rename, unlink
};
FDIO_t fdio = &fdio_s ;
FD_ZERO(&wrfds);
#endif
- if ((fdno = __fdFileno(fd)) < 0)
+ if ((fdno = fdFileno(fd)) < 0)
return -1; /* XXX W2DO? */
do {
FD_ZERO(&rdfds);
#endif
- if ((fdno = __fdFileno(fd)) < 0)
+ if ((fdno = fdFileno(fd)) < 0)
return -1; /* XXX W2DO? */
do {
/* XXX preserve timedRead() behavior */
if (fdGetIo(fd) == fdio) {
struct stat sb;
- int fdno = __fdFileno(fd);
+ int fdno = fdFileno(fd);
(void) fstat(fdno, &sb);
if (S_ISREG(sb.st_mode))
- return __fdRead(fd, buf, count);
+ return fdRead(fd, buf, count);
}
UFDONLY(fd);
break;
}
- rc = __fdRead(fd, buf + total, count - total);
+ rc = fdRead(fd, buf + total, count - total);
if (rc < 0) {
switch (errno) {
struct stat sb;
(void) fstat(fdGetFdno(fd), &sb);
if (S_ISREG(sb.st_mode))
- return __fdWrite(fd, buf, count);
+ return fdWrite(fd, buf, count);
}
#endif
break;
}
- rc = __fdWrite(fd, buf + total, count - total);
+ rc = fdWrite(fd, buf + total, count - total);
if (rc < 0) {
switch (errno) {
UFDONLY(fd);
- return __fdClose(fd);
+ return fdClose(fd);
}
/*
rpmError(RPMERR_EXEC, _("URL helper failed: %s (%d)\n"),
cmd, WEXITSTATUS(rc));
} else {
- fd = __fdOpen(dest, flags, mode);
+ fd = fdOpen(dest, flags, mode);
unlink(dest);
}
dest = _free(dest);
case URL_IS_PATH:
case URL_IS_UNKNOWN:
default:
- fd = __fdOpen(path, flags, mode);
+ fd = fdOpen(path, flags, mode);
break;
}
}
static struct FDIO_s ufdio_s = {
- ufdRead, ufdWrite, ufdSeek, ufdClose, XfdLink, XfdFree, XfdNew, __fdFileno,
+ ufdRead, ufdWrite, ufdSeek, ufdClose, XfdLink, XfdFree, XfdNew, fdFileno,
ufdOpen, NULL, fdGetFp, NULL, Mkdir, Chdir, Rmdir, Rename, Unlink
};
FDIO_t ufdio = &ufdio_s ;
gzFile gzfile;
if (fmode == NULL) return NULL;
- fdno = __fdFileno(fd);
+ fdno = fdFileno(fd);
fdSetFdno(fd, -1); /* XXX skip the fdio close */
if (fdno < 0) return NULL;
gzfile = gzdopen(fdno, fmode);
}
static struct FDIO_s gzdio_s = {
- gzdRead, gzdWrite, gzdSeek, gzdClose, XfdLink, XfdFree, XfdNew, __fdFileno,
+ gzdRead, gzdWrite, gzdSeek, gzdClose, XfdLink, XfdFree, XfdNew, fdFileno,
NULL, gzdOpen, gzdFileno, gzdFlush, NULL, NULL, NULL, NULL, NULL
};
FDIO_t gzdio = &gzdio_s ;
BZFILE *bzfile;
if (fmode == NULL) return NULL;
- fdno = __fdFileno(fd);
+ fdno = fdFileno(fd);
fdSetFdno(fd, -1); /* XXX skip the fdio close */
if (fdno < 0) return NULL;
bzfile = bzdopen(fdno, fmode);
}
static struct FDIO_s bzdio_s = {
- bzdRead, bzdWrite, bzdSeek, bzdClose, XfdLink, XfdFree, XfdNew, __fdFileno,
+ bzdRead, bzdWrite, bzdSeek, bzdClose, XfdLink, XfdFree, XfdNew, fdFileno,
NULL, bzdOpen, bzdFileno, bzdFlush, NULL, NULL, NULL, NULL, NULL
};
FDIO_t bzdio = &bzdio_s ;
if (end == NULL || !strcmp(end, "fdio")) {
if (_rpmio_debug)
fprintf(stderr, "*** Fopen fdio path %s fmode %s\n", path, fmode);
- fd = __fdOpen(path, flags, perms);
- if (__fdFileno(fd) < 0) {
- if (fd) (void) __fdClose(fd);
+ fd = fdOpen(path, flags, perms);
+ if (fdFileno(fd) < 0) {
+ if (fd) (void) fdClose(fd);
return NULL;
}
} else {
if (_rpmio_debug)
fprintf(stderr, "*** Fopen ufdio path %s fmode %s\n", path, fmode);
fd = ufdOpen(path, flags, perms);
- if (fd == NULL || !(__fdFileno(fd) >= 0))
+ if (fd == NULL || !(fdFileno(fd) >= 0))
return fd;
break;
default:
#endif
} else {
/* XXX need to check ufdio/gzdio/bzdio/fdio errors correctly. */
- ec = (__fdFileno(fd) < 0 ? -1 : 0);
+ ec = (fdFileno(fd) < 0 ? -1 : 0);
}
if (rc == 0 && ec)
}
static struct FDIO_s fpio_s = {
- ufdRead, ufdWrite, fdSeek, ufdClose, XfdLink, XfdFree, XfdNew, __fdFileno,
+ ufdRead, ufdWrite, fdSeek, ufdClose, XfdLink, XfdFree, XfdNew, fdFileno,
ufdOpen, NULL, fdGetFp, NULL, Mkdir, Chdir, Rmdir, Rename, Unlink
};
FDIO_t fpio = &fpio_s ;