*/
#include "system.h"
+
+#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
+#include <pthread.h>
+#endif
+
#include <rpmio_internal.h>
-#include <popt.h>
#include "ugid.h"
#include "debug.h"
+/*@access DIR@*/
/*@access FD_t@*/
/*@access urlinfo@*/
-/*@-redecl@*/
-extern int _rpmio_debug;
-/*@=redecl@*/
-
/* =============================================================== */
-static int ftpMkdir(const char * path, /*@unused@*/ mode_t mode) {
+static int ftpMkdir(const char * path, /*@unused@*/ mode_t mode)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
+{
int rc;
if ((rc = ftpCmd("MKD", path, NULL)) != 0)
return rc;
return rc;
}
-static int ftpChdir(const char * path) {
+static int ftpChdir(const char * path)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
+{
return ftpCmd("CWD", path, NULL);
}
-static int ftpRmdir(const char * path) {
+static int ftpRmdir(const char * path)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
+{
return ftpCmd("RMD", path, NULL);
}
-static int ftpRename(const char * oldpath, const char * newpath) {
+static int ftpRename(const char * oldpath, const char * newpath)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
+{
int rc;
if ((rc = ftpCmd("RNFR", oldpath, NULL)) != 0)
return rc;
return ftpCmd("RNTO", newpath, NULL);
}
-static int ftpUnlink(const char * path) {
+static int ftpUnlink(const char * path)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
+{
return ftpCmd("DELE", path, NULL);
}
/* =============================================================== */
/* XXX rebuilddb.c: analogues to mkdir(2)/rmdir(2). */
-int Mkdir (const char *path, mode_t mode) {
+int Mkdir (const char * path, mode_t mode)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return mkdir(path, mode);
}
-int Chdir (const char *path) {
+int Chdir (const char * path)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return chdir(path);
}
-int Rmdir (const char *path) {
+int Rmdir (const char * path)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
/* XXX rpmdb.c: analogue to rename(2). */
-int Rename (const char *oldpath, const char * newpath) {
+int Rename (const char * oldpath, const char * newpath)
+{
const char *oe = NULL;
const char *ne = NULL;
int oldut, newut;
return rename(oldpath, newpath);
}
-int Link (const char *oldpath, const char * newpath) {
+int Link (const char * oldpath, const char * newpath)
+{
const char *oe = NULL;
const char *ne = NULL;
int oldut, newut;
/*
* FIXME: this is broken. It depends on mc not crossing border on month!
*/
+/*@unchecked@*/
static int current_mday;
+/*@unchecked@*/
static int current_mon;
+/*@unchecked@*/
static int current_year;
/* Following stuff (parse_ls_lga) is used by ftpfs and extfs */
#define MAXCOLS 30
+/*@unchecked@*/
static char *columns [MAXCOLS]; /* Points to the string in column n */
+/*@unchecked@*/
static int column_ptr [MAXCOLS]; /* Index from 0 to the starting positions of the columns */
+/*@-boundswrite@*/
static int
vfs_split_text (char *p)
+ /*@globals columns, column_ptr @*/
+ /*@modifies *p, columns, column_ptr @*/
{
char *original = p;
int numcols;
}
return numcols;
}
+/*@=boundswrite@*/
+/*@-boundsread@*/
static int
is_num (int idx)
+ /*@*/
{
if (!columns [idx] || columns [idx][0] < '0' || columns [idx][0] > '9')
return 0;
return 1;
}
+/*@=boundsread@*/
+/*@-boundsread@*/
static int
is_dos_date(/*@null@*/ const char *str)
+ /*@*/
{
if (str != NULL && strlen(str) == 8 &&
str[2] == str[5] && strchr("\\-/", (int)str[2]) != NULL)
return 1;
return 0;
}
+/*@=boundsread@*/
static int
is_week (/*@null@*/ const char * str, /*@out@*/ struct tm * tim)
+ /*@modifies *tim @*/
{
/*@observer@*/ static const char * week = "SunMonTueWedThuFriSat";
const char * pos;
static int
is_month (/*@null@*/ const char * str, /*@out@*/ struct tm * tim)
+ /*@modifies *tim @*/
{
/*@observer@*/ static const char * month = "JanFebMarAprMayJunJulAugSepOctNovDec";
const char * pos;
static int
is_time (/*@null@*/ const char * str, /*@out@*/ struct tm * tim)
+ /*@modifies *tim @*/
{
const char * p, * p2;
}
static int is_year(/*@null@*/ const char * str, /*@out@*/ struct tm * tim)
+ /*@modifies *tim @*/
{
long year;
static int
vfs_parse_filetype (char c)
+ /*@*/
{
switch (c) {
case 'd': return S_IFDIR;
}
static int vfs_parse_filemode (const char *p)
+ /*@*/
{ /* converts rw-rw-rw- into 0666 */
int res = 0;
switch (*(p++)) {
return res;
}
-static int vfs_parse_filedate(int idx, time_t *t)
+/*@-boundswrite@*/
+static int vfs_parse_filedate(int idx, /*@out@*/ time_t *t)
+ /*@modifies *t @*/
{ /* This thing parses from idx in columns[] array */
char *p;
/* Here just this special case with MM-DD-YY */
if (is_dos_date(p)){
+ /*@-mods@*/
p[2] = p[5] = '-';
+ /*@=mods@*/
memset(d, 0, sizeof(d));
if (sscanf(p, "%2d-%2d-%2d", &d[0], &d[1], &d[2]) == 3){
*t = 0;
return idx;
}
+/*@=boundswrite@*/
+/*@-boundswrite@*/
static int
vfs_parse_ls_lga (char * p, /*@out@*/ struct stat * st,
/*@out@*/ const char ** filename,
/*@out@*/ const char ** linkname)
+ /*@modifies *p, *st, *filename, *linkname @*/
{
int idx, idx2, num_cols;
int i;
int tlen;
char *t;
- t = g_strdup (p_copy + column_ptr [idx++]);
+ t = g_strdup (p_copy + column_ptr [idx]); idx++;
tlen = strlen (t);
/* g_strchomp(); */
if (t [tlen-1] == '\r' || t [tlen-1] == '\n')
g_free (p_copy);
return 0;
}
+/*@=boundswrite@*/
typedef enum {
DO_FTP_STAT = 1,
DO_FTP_ACCESS = 4,
DO_FTP_GLOB = 5
} ftpSysCall_t;
+
+/**
+ */
+/*@unchecked@*/
static size_t ftpBufAlloced = 0;
+
+/**
+ */
+/*@unchecked@*/
static /*@only@*/ char * ftpBuf = NULL;
#define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s))
+/*@-boundswrite@*/
+/*@-mods@*/
static int ftpNLST(const char * url, ftpSysCall_t ftpSysCall,
- /*@out@*/ struct stat * st, char * rlbuf, size_t rlbufsiz)
+ /*@out@*/ /*@null@*/ struct stat * st,
+ /*@out@*/ /*@null@*/ char * rlbuf, size_t rlbufsiz)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies *st, *rlbuf, fileSystem, internalState @*/
{
FD_t fd;
const char * path;
if (fd == NULL || u == NULL)
return -1;
- u->openError = ftpReq(fd, "NLST", path);
+ u->openError = ftpReq(fd, "LIST", path);
break;
default:
urldn = alloca_strdup(url);
+ /*@-branchstate@*/
if ((bn = strrchr(urldn, '/')) == NULL)
return -2;
else if (bn == path)
bn = ".";
else
*bn++ = '\0';
+ /*@=branchstate@*/
nbn = strlen(bn);
rc = ftpChdir(urldn); /* XXX don't care about CWD */
/* XXX possibly should do "NLST -lais" to get st_ino/st_blocks also */
u->openError = ftpReq(fd, "NLST", "-la");
+
+ if (bn == NULL || nbn <= 0) {
+ rc = -2;
+ goto exit;
+ }
break;
}
goto exit;
}
- if (bn == NULL || nbn <= 0) {
- rc = -2;
- goto exit;
- }
-
if (ftpBufAlloced == 0 || ftpBuf == NULL) {
- ftpBufAlloced = url_iobuf_size;
+ ftpBufAlloced = _url_iobuf_size;
ftpBuf = xcalloc(ftpBufAlloced, sizeof(ftpBuf[0]));
}
*ftpBuf = '\0';
do {
- /* XXX FIXME: realloc ftpBuf is < ~128 chars remain */
+ /* XXX FIXME: realloc ftpBuf if < ~128 chars remain */
if ((ftpBufAlloced - bufLength) < (1024+80)) {
ftpBufAlloced <<= 2;
+ assert(ftpBufAlloced < (8*1024*1024));
ftpBuf = xrealloc(ftpBuf, ftpBufAlloced);
}
s = se = ftpBuf + bufLength;
while (*se && *se != '\n') se++;
if (se > s && se[-1] == '\r') se[-1] = '\0';
- if (*se == '\0') break;
+ if (*se == '\0')
+ /*@innerbreak@*/ break;
*se++ = '\0';
- if (!strncmp(s, "total ", sizeof("total ")-1)) continue;
+ if (!strncmp(s, "total ", sizeof("total ")-1))
+ /*@innercontinue@*/ continue;
o = NULL;
for (bingo = 0, n = se; n >= s; n--) {
switch (*n) {
case '\0':
oe = ne = n;
- break;
+ /*@switchbreak@*/ break;
case ' ':
if (o || !(n[-3] == ' ' && n[-2] == '-' && n[-1] == '>')) {
- while (*(++n) == ' ');
+ while (*(++n) == ' ')
+ {};
bingo++;
- break;
+ /*@switchbreak@*/ break;
}
- for (o = n + 1; *o == ' '; o++);
+ for (o = n + 1; *o == ' '; o++)
+ {};
n -= 3;
ne = n;
- break;
+ /*@switchbreak@*/ break;
default:
- break;
+ /*@switchbreak@*/ break;
}
- if (bingo) break;
+ if (bingo)
+ /*@innerbreak@*/ break;
}
- if (nbn != (ne - n)) continue; /* Same name length? */
- if (strncmp(n, bn, nbn)) continue; /* Same name? */
+ if (nbn != (ne - n)) /* Same name length? */
+ /*@innercontinue@*/ continue;
+ if (strncmp(n, bn, nbn)) /* Same name? */
+ /*@innercontinue@*/ continue;
moretodo = 0;
- break;
+ /*@innerbreak@*/ break;
}
if (moretodo && se > s) {
(void) ufdClose(fd);
return rc;
}
+/*@=mods@*/
+/*@=boundswrite@*/
+
+static const char * statstr(const struct stat * st,
+ /*@returned@*/ /*@out@*/ char * buf)
+ /*@modifies *buf @*/
+{
+ sprintf(buf,
+ "*** dev %x ino %x mode %0o nlink %d uid %d gid %d rdev %x size %x\n",
+ (unsigned)st->st_dev,
+ (unsigned)st->st_ino,
+ st->st_mode,
+ (unsigned)st->st_nlink,
+ st->st_uid,
+ st->st_gid,
+ (unsigned)st->st_rdev,
+ (unsigned)st->st_size);
+ return buf;
+}
+
+/*@unchecked@*/
+static int ftp_st_ino = 0xdead0000;
static int ftpStat(const char * path, /*@out@*/ struct stat *st)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies *st, fileSystem, internalState @*/
{
- return ftpNLST(path, DO_FTP_STAT, st, NULL, 0);
+ char buf[1024];
+ int rc;
+ rc = ftpNLST(path, DO_FTP_STAT, st, NULL, 0);
+ /* XXX fts(3) needs/uses st_ino, make something up for now. */
+ /*@-mods@*/
+ if (st->st_ino == 0)
+ st->st_ino = ftp_st_ino++;
+ /*@=mods@*/
+if (_ftp_debug)
+fprintf(stderr, "*** ftpStat(%s) rc %d\n%s", path, rc, statstr(st, buf));
+ return rc;
}
-static int ftpLstat(const char * path, /*@out@*/ struct stat *st) {
+static int ftpLstat(const char * path, /*@out@*/ struct stat *st)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies *st, fileSystem, internalState @*/
+{
+ char buf[1024];
int rc;
rc = ftpNLST(path, DO_FTP_LSTAT, st, NULL, 0);
-if (_rpmio_debug)
-fprintf(stderr, "*** ftpLstat(%s) rc %d\n", path, rc);
+ /* XXX fts(3) needs/uses st_ino, make something up for now. */
+ /*@-mods@*/
+ if (st->st_ino == 0)
+ st->st_ino = ftp_st_ino++;
+ /*@=mods@*/
+if (_ftp_debug)
+fprintf(stderr, "*** ftpLstat(%s) rc %d\n%s\n", path, rc, statstr(st, buf));
return rc;
}
-static int ftpReadlink(const char * path, char * buf, size_t bufsiz) {
- return ftpNLST(path, DO_FTP_READLINK, NULL, buf, bufsiz);
+static int ftpReadlink(const char * path, /*@out@*/ char * buf, size_t bufsiz)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies *buf, fileSystem, internalState @*/
+{
+ int rc;
+ rc = ftpNLST(path, DO_FTP_READLINK, NULL, buf, bufsiz);
+if (_ftp_debug)
+fprintf(stderr, "*** ftpReadlink(%s) rc %d\n", path, rc);
+ return rc;
}
-static int ftpGlob(const char * path, int flags,
- int errfunc(const char * epath, int eerno),
- /*@out@*/ glob_t * pglob)
+struct __dirstream {
+ int fd; /* File descriptor. */
+ char * data; /* Directory block. */
+ size_t allocation; /* Space allocated for the block. */
+ size_t size; /* Total valid data in the block. */
+ size_t offset; /* Current offset into the block. */
+ off_t filepos; /* Position of next entry to read. */
+#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
+ pthread_mutex_t lock; /* Mutex lock for this structure. */
+#endif
+};
+
+#if !defined(DT_DIR)
+# define DT_UNKNOWN 0
+# define DT_FIFO 1
+# define DT_CHR 2
+# define DT_DIR 4
+# define DT_BLK 6
+# define DT_REG 8
+# define DT_LNK 10
+# define DT_SOCK 12
+# define DT_WHT 14
+typedef struct __dirstream * FTPDIR;
+#else
+typedef DIR * FTPDIR;
+#endif
+
+/*@unchecked@*/
+static int ftpmagicdir = 0x8440291;
+#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
+
+/*@-boundswrite@*/
+/*@-type@*/ /* FIX: abstract DIR */
+/*@null@*/
+static DIR * ftpOpendir(const char * path)
+ /*@globals fileSystem, internalState @*/
+ /*@modifies fileSystem, internalState @*/
{
+ FTPDIR mydir;
+ struct dirent * dp;
+ size_t nb;
+ const char * s, * sb, * se;
+ const char ** av;
+ unsigned char * dt;
+ char * t;
+ int ac;
+ int c;
int rc;
- if (pglob == NULL)
- return -2;
+if (_ftp_debug)
+fprintf(stderr, "*** ftpOpendir(%s)\n", path);
rc = ftpNLST(path, DO_FTP_GLOB, NULL, NULL, 0);
-/*@-castfcnptr@*/
-if (_rpmio_debug)
-fprintf(stderr, "*** ftpGlob(%s,0x%x,%p,%p) ftpNLST rc %d\n", path, (unsigned)flags, (void *)errfunc, pglob, rc);
-/*@=castfcnptr@*/
if (rc)
- return rc;
- rc = poptParseArgvString(ftpBuf, &pglob->gl_pathc, (const char ***)&pglob->gl_pathv);
- pglob->gl_offs = -1; /* XXX HACK HACK HACK */
- return rc;
+ return NULL;
+
+ /*
+ * ftpBuf now contains absolute paths, newline terminated.
+ * Calculate the number of bytes to hold the directory info.
+ */
+ nb = sizeof(".") + sizeof("..");
+ ac = 2;
+ sb = NULL;
+ s = se = ftpBuf;
+ while ((c = *se) != '\0') {
+ se++;
+ switch (c) {
+ case '/':
+ sb = se;
+ /*@switchbreak@*/ break;
+ case '\r':
+ if (sb == NULL) {
+ for (sb = se; sb > s && sb[-1] != ' '; sb--)
+ {};
+ }
+ ac++;
+ nb += (se - sb);
+
+ if (*se == '\n') se++;
+ sb = NULL;
+ s = se;
+ /*@switchbreak@*/ break;
+ default:
+ /*@switchbreak@*/ break;
+ }
+ }
+
+ nb += sizeof(*mydir) + sizeof(*dp) + ((ac + 1) * sizeof(*av)) + (ac + 1);
+ mydir = xcalloc(1, nb);
+ /*@-abstract@*/
+ dp = (struct dirent *) (mydir + 1);
+ av = (const char **) (dp + 1);
+ dt = (char *) (av + (ac + 1));
+ t = (char *) (dt + ac + 1);
+ /*@=abstract@*/
+
+ mydir->fd = ftpmagicdir;
+/*@-usereleased@*/
+ mydir->data = (char *) dp;
+/*@=usereleased@*/
+ mydir->allocation = nb;
+ mydir->size = ac;
+ mydir->offset = -1;
+ mydir->filepos = 0;
+
+ ac = 0;
+ /*@-dependenttrans -unrecog@*/
+ dt[ac] = DT_DIR; av[ac++] = t; t = stpcpy(t, "."); t++;
+ dt[ac] = DT_DIR; av[ac++] = t; t = stpcpy(t, ".."); t++;
+ /*@=dependenttrans =unrecog@*/
+ sb = NULL;
+ s = se = ftpBuf;
+ while ((c = *se) != '\0') {
+ se++;
+ switch (c) {
+ case '/':
+ sb = se;
+ /*@switchbreak@*/ break;
+ case '\r':
+ /*@-dependenttrans@*/
+ av[ac] = t;
+ /*@=dependenttrans@*/
+ if (sb == NULL) {
+ /*@-unrecog@*/
+ switch(*s) {
+ case 'p':
+ dt[ac] = DT_FIFO;
+ /*@innerbreak@*/ break;
+ case 'c':
+ dt[ac] = DT_CHR;
+ /*@innerbreak@*/ break;
+ case 'd':
+ dt[ac] = DT_DIR;
+ /*@innerbreak@*/ break;
+ case 'b':
+ dt[ac] = DT_BLK;
+ /*@innerbreak@*/ break;
+ case '-':
+ dt[ac] = DT_REG;
+ /*@innerbreak@*/ break;
+ case 'l':
+ dt[ac] = DT_LNK;
+ /*@innerbreak@*/ break;
+ case 's':
+ dt[ac] = DT_SOCK;
+ /*@innerbreak@*/ break;
+ default:
+ dt[ac] = DT_UNKNOWN;
+ /*@innerbreak@*/ break;
+ }
+ /*@=unrecog@*/
+ for (sb = se; sb > s && sb[-1] != ' '; sb--)
+ {};
+ }
+ ac++;
+ t = stpncpy(t, sb, (se - sb));
+ t[-1] = '\0';
+ if (*se == '\n') se++;
+ sb = NULL;
+ s = se;
+ /*@switchbreak@*/ break;
+ default:
+ /*@switchbreak@*/ break;
+ }
+ }
+ av[ac] = NULL;
+
+/*@-kepttrans@*/
+ return (DIR *) mydir;
+/*@=kepttrans@*/
}
+/*@=boundswrite@*/
-static void ftpGlobfree(glob_t * pglob) {
-if (_rpmio_debug)
-fprintf(stderr, "*** ftpGlobfree(%p)\n", pglob);
- if (pglob->gl_offs == -1) { /* XXX HACK HACK HACK */
- free((void *)pglob->gl_pathv);
- pglob->gl_pathv = NULL;
+/*@dependent@*/ /*@null@*/
+static struct dirent * ftpReaddir(DIR * dir)
+ /*@globals fileSystem @*/
+ /*@modifies fileSystem @*/
+{
+ FTPDIR mydir = (FTPDIR)dir;
+ struct dirent * dp;
+ const char ** av;
+ unsigned char * dt;
+ int ac;
+ int i;
+
+ /*@+voidabstract@*/
+ if (mydir == NULL || !ISFTPMAGIC(mydir) || mydir->data == NULL) {
+ /* XXX TODO: EBADF errno. */
+ return NULL;
+ }
+ /*@=voidabstract@*/
+
+ dp = (struct dirent *) mydir->data;
+ av = (const char **) (dp + 1);
+ ac = mydir->size;
+ dt = (char *) (av + (ac + 1));
+ i = mydir->offset + 1;
+
+/*@-boundsread@*/
+ if (i < 0 || i >= ac || av[i] == NULL)
+ return NULL;
+/*@=boundsread@*/
+
+ mydir->offset = i;
+
+ /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
+ dp->d_ino = i + 1; /* W2DO? */
+ dp->d_reclen = 0; /* W2DO? */
+
+#if !defined(hpux) && !defined(sun)
+ dp->d_off = 0; /* W2DO? */
+/*@-boundsread@*/
+ dp->d_type = dt[i];
+/*@=boundsread@*/
+#endif
+
+ strncpy(dp->d_name, av[i], sizeof(dp->d_name));
+/*@+voidabstract@*/
+if (_ftp_debug)
+fprintf(stderr, "*** ftpReaddir(%p) %p \"%s\"\n", (void *)mydir, dp, dp->d_name);
+/*@=voidabstract@*/
+
+ return dp;
+}
+/*@=type@*/
+
+static int ftpClosedir(/*@only@*/ DIR * dir)
+ /*@globals fileSystem @*/
+ /*@modifies dir, fileSystem @*/
+{
+ FTPDIR mydir = (FTPDIR)dir;
+
+ /*@+voidabstract@*/
+if (_ftp_debug)
+fprintf(stderr, "*** ftpClosedir(%p)\n", (void *)mydir);
+ if (mydir == NULL || !ISFTPMAGIC(mydir)) {
+ /* XXX TODO: EBADF errno. */
+ return -1;
}
+ free((void *)mydir);
+ /*@=voidabstract@*/
+ mydir = NULL;
+ return 0;
}
-int Stat(const char * path, struct stat * st) {
+int Stat(const char * path, struct stat * st)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return stat(path, st);
}
-int Lstat(const char * path, struct stat * st) {
+int Lstat(const char * path, struct stat * st)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return lstat(path, st);
}
-int Readlink(const char * path, char * buf, size_t bufsiz) {
+int Readlink(const char * path, char * buf, size_t bufsiz)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return -2;
/*@notreached@*/ break;
}
+/*@-compdef@*/
return readlink(path, buf, bufsiz);
+/*@=compdef@*/
}
-int Access(const char * path, int amode) {
+int Access(const char * path, int amode)
+{
const char * lpath;
int ut = urlPath(path, &lpath);
return access(path, amode);
}
-int Glob(const char *path, int flags,
+int Glob(const char *pattern, int flags,
int errfunc(const char * epath, int eerrno), glob_t *pglob)
{
const char * lpath;
- int ut = urlPath(path, &lpath);
+ int ut = urlPath(pattern, &lpath);
/*@-castfcnptr@*/
if (_rpmio_debug)
-fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", path, (unsigned)flags, (void *)errfunc, pglob);
+fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)errfunc, pglob);
/*@=castfcnptr@*/
switch (ut) {
- case URL_IS_FTP: /* XXX WRONG WRONG WRONG */
- return ftpGlob(path, flags, errfunc, pglob);
- /*@notreached@*/ break;
+ case URL_IS_FTP:
+/*@-type@*/
+ pglob->gl_closedir = Closedir;
+ pglob->gl_readdir = Readdir;
+ pglob->gl_opendir = Opendir;
+ pglob->gl_lstat = Lstat;
+ pglob->gl_stat = Stat;
+/*@=type@*/
+ flags |= GLOB_ALTDIRFUNC;
+ break;
case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */
case URL_IS_PATH:
- path = lpath;
+ pattern = lpath;
/*@fallthrough@*/
case URL_IS_UNKNOWN:
break;
return -2;
/*@notreached@*/ break;
}
- return glob(path, flags, errfunc, pglob);
+ return glob(pattern, flags, errfunc, pglob);
}
void Globfree(glob_t *pglob)
{
if (_rpmio_debug)
fprintf(stderr, "*** Globfree(%p)\n", pglob);
- if (pglob->gl_offs == -1) /* XXX HACK HACK HACK */
- ftpGlobfree(pglob);
- else
- globfree(pglob);
+ globfree(pglob);
}
DIR * Opendir(const char * path)
if (_rpmio_debug)
fprintf(stderr, "*** Opendir(%s)\n", path);
switch (ut) {
- case URL_IS_FTP: /* XXX WRONG WRONG WRONG */
+ case URL_IS_FTP:
+ return ftpOpendir(path);
+ /*@notreached@*/ break;
case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */
case URL_IS_PATH:
path = lpath;
return NULL;
/*@notreached@*/ break;
}
+ /*@-dependenttrans@*/
return opendir(path);
+ /*@=dependenttrans@*/
}
/*@+voidabstract@*/
{
if (_rpmio_debug)
fprintf(stderr, "*** Readdir(%p)\n", (void *)dir);
+ if (dir == NULL || ISFTPMAGIC(dir))
+ return ftpReaddir(dir);
return readdir(dir);
}
{
if (_rpmio_debug)
fprintf(stderr, "*** Closedir(%p)\n", (void *)dir);
+ if (dir == NULL || ISFTPMAGIC(dir))
+ return ftpClosedir(dir);
return closedir(dir);
}
/*@=voidabstract@*/