Move most of the ftp and http interface to rpmio.c.

CVS patchset: 3415
CVS date: 1999/11/02 17:56:30

diff --git a/lib/ftp.c b/lib/ftp.c
index 8f4ae5b..d1ec483 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -21,9 +21,6 @@ extern int h_errno;
 typedef        unsigned int            uint32_t;
 #define        INADDR_ANY              ((uint32_t) 0x00000000)
 #define        IPPROTO_IP              0
-#define        IAC     255             /* interpret as command: */
-#define        IP      244             /* interrupt process--permanently */
-#define        DM      242             /* data mark--for connect. cleaning */
 extern int h_errno;
 
 #else  /* __LCLINT__ */
@@ -44,14 +41,12 @@ extern int h_errno;
 #endif /* __LCLINT__ */
 
 #include <rpmlib.h>
-#include <rpmio.h>
 
 #if !defined(HAVE_INET_ATON)
 int inet_aton(const char *cp, struct in_addr *inp);
 #endif
 
 #define TIMEOUT_SECS 60
-#define BUFFER_SIZE 4096
 
 #if defined(USE_ALT_DNS) && USE_ALT_DNS 
 #include "dns.h"
@@ -72,21 +67,11 @@ int inet_aton(const char *cp, struct in_addr *inp);
 static int ftp_debug = 0;
 #define DBG(_f, _x)     if ((ftp_debug | (_f))) fprintf _x
 
-static int ftpTimeoutSecs = TIMEOUT_SECS;
+int ftpTimeoutSecs = TIMEOUT_SECS;
 static int httpTimeoutSecs = TIMEOUT_SECS;
 
-/*@null@*/ static rpmCallbackFunction  urlNotify = NULL;
-/*@null@*/ static void *       urlNotifyData = NULL;
-static int                     urlNotifyCount = -1;
-
-void urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount) {
-    urlNotify = notify;
-    urlNotifyData = notifyData;
-    urlNotifyCount = (notifyCount >= 0) ? notifyCount : 4096;
-}
-
 static int checkResponse(int fd, int secs, int *ecp, /*@out@*/ char ** str) {
-    static char buf[BUFFER_SIZE + 1];
+    static char buf[BUFSIZ + 1];       /* XXX yuk */
     int bufLength = 0; 
     fd_set emptySet, readSet;
     char *se, *s;
@@ -191,7 +176,7 @@ static int checkResponse(int fd, int secs, int *ecp, /*@out@*/ char ** str) {
     return rc;
 }
 
-static int ftpCheckResponse(urlinfo u, /*@out@*/ char ** str) {
+int ftpCheckResponse(urlinfo u, /*@out@*/ char ** str) {
     int ec = 0;
     int rc =  checkResponse(u->ftpControl, ftpTimeoutSecs, &ec, str);
 
@@ -423,155 +408,44 @@ errxit:
     return rc;
 }
 
-static int copyData( /*@killref@*/ FD_t sfd, FD_t tfd) {
-    char buf[BUFFER_SIZE];
-    fd_set emptySet, readSet;
-    struct timeval timeout;
-    int bytesRead;
-    int bytesCopied = 0;
-    int rc = 0;
-    int notifier = -1;
-
-    if (urlNotify) {
-       (void)(*urlNotify) (NULL, RPMCALLBACK_INST_OPEN_FILE,
-               0, 0, NULL, urlNotifyData);
-    }
-    
-    while (1) {
-       FD_ZERO(&emptySet);
-       FD_ZERO(&readSet);
-       FD_SET(Fileno(sfd), &readSet);
-
-       timeout.tv_sec = ftpTimeoutSecs;
-       timeout.tv_usec = 0;
-    
-       rc = select(Fileno(sfd) + 1, &readSet, &emptySet, &emptySet, &timeout);
-       if (rc == 0) {
-           rc = FTPERR_SERVER_TIMEOUT;
-           break;
-       } else if (rc < 0) {
-           rc = FTPERR_UNKNOWN;
-           break;
-       }
-
-       bytesRead = Fread(buf, sizeof(buf), 1, sfd);
-       if (bytesRead == 0) {
-           rc = 0;
-           break;
-       }
-
-       if (Fwrite(buf, bytesRead, 1, tfd) != bytesRead) {
-           rc = FTPERR_FILE_IO_ERROR;
-           break;
-       }
-       bytesCopied += bytesRead;
-       if (urlNotify && urlNotifyCount > 0) {
-           int n = bytesCopied/urlNotifyCount;
-           if (n != notifier) {
-               (void)(*urlNotify) (NULL, RPMCALLBACK_INST_PROGRESS,
-                       bytesCopied, 0, NULL, urlNotifyData);
-               notifier = n;
-           }
-       }
-    }
-
-    DBG(fdDebug(sfd), (stderr, "++ copied %d bytes: %s\n", bytesCopied,
-       ftpStrerror(rc)));
-
-    if (urlNotify) {
-       (void)(*urlNotify) (NULL, RPMCALLBACK_INST_OPEN_FILE,
-               bytesCopied, bytesCopied, NULL, urlNotifyData);
-    }
-    
-    Fclose(sfd);
-    return rc;
-}
-
-int ftpAbort(FD_t fd) {
-    urlinfo u = ufdGetUrlinfo(fd);
-    char buf[BUFFER_SIZE];
-    int rc;
-    int tosecs = ftpTimeoutSecs;
-
+int ftpFileDone(urlinfo u) {
     if (u == NULL)
        return FTPERR_UNKNOWN;  /* XXX W2DO? */
 
-    DBG(fdDebug(fd), (stderr, "-> ABOR\n"));
-
-    sprintf(buf, "%c%c%c", (char)IAC, (char)IP, (char)IAC);
-    (void)send(u->ftpControl, buf, 3, MSG_OOB);
-    sprintf(buf, "%cABOR\r\n",(char) DM);
-    if (write(u->ftpControl, buf, 7) != 7) {
-       close(u->ftpControl);
-       u->ftpControl = -1;
-       urlFree(u, "ufdGetUrlinfo (from ftpAbort #1)");
-       return FTPERR_SERVER_IO_ERROR;
-    }
-    if (Fileno(fd) >= 0) {
-       while(read(Fileno(fd), buf, sizeof(buf)) > 0)
-           ;
-    }
-
-    ftpTimeoutSecs = 10;
-    if ((rc = ftpCheckResponse(u, NULL)) == FTPERR_NIC_ABORT_IN_PROGRESS) {
-       rc = ftpCheckResponse(u, NULL);
-    }
-    rc = ftpCheckResponse(u, NULL);
-    ftpTimeoutSecs = tosecs;
-
-    if (Fileno(fd) >= 0)
-       fdio->close(fd);
-    urlFree(u, "ufdGetUrlinfo (from ftpAbort)");
-    return 0;
-}
-
-static int ftpGetFileDone(urlinfo u) {
-    if (u == NULL)
-       return FTPERR_UNKNOWN;  /* XXX W2DO? */
-
-    if (u->ftpGetFileDoneNeeded) {
-       u->ftpGetFileDoneNeeded = 0;
+    if (u->ftpFileDoneNeeded) {
+       u->ftpFileDoneNeeded = 0;
        if (ftpCheckResponse(u, NULL))
            return FTPERR_BAD_SERVER_RESPONSE;
     }
     return 0;
 }
 
-int ftpGetFileDesc(FD_t fd)
+int ftpFileDesc(urlinfo u, const char *cmd, FD_t fd)
 {
-    urlinfo u = ufdGetUrlinfo(fd);
-    const char *remotename;
     struct sockaddr_in dataAddress;
     int i, j;
     char * passReply;
     char * chptr;
-    char * retrCommand;
     int rc;
 
     if (u == NULL)
        return FTPERR_UNKNOWN;  /* XXX W2DO? */
 
-    remotename = u->path;
-
 /*
- * XXX When ftpGetFileDesc() is called, there may be a lurking
- * XXX transfer complete message (if ftpGetFileDone() was not
+ * XXX When ftpFileDesc() is called, there may be a lurking
+ * XXX transfer complete message (if ftpFileDone() was not
  * XXX called to clear that message). Clear that message now.
  */
 
-    if (u->ftpGetFileDoneNeeded)
-       rc = ftpGetFileDone(u);
+    if (u->ftpFileDoneNeeded)
+       rc = ftpFileDone(u);
 
     DBG(fdDebug(fd), (stderr, "-> PASV\n"));
-    if (write(u->ftpControl, "PASV\r\n", 6) != 6) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #1)");
+    if (write(u->ftpControl, "PASV\r\n", 6) != 6)
        return FTPERR_SERVER_IO_ERROR;
-    }
 
-    if ((rc = ftpCheckResponse(u, &passReply))) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #2)");
+    if ((rc = ftpCheckResponse(u, &passReply)))
        return FTPERR_PASSIVE_ERROR;
-    }
 
     chptr = passReply;
     while (*chptr && *chptr != '(') chptr++;
@@ -593,10 +467,8 @@ int ftpGetFileDesc(FD_t fd)
        port number portion */
 
     dataAddress.sin_family = AF_INET;
-    if (sscanf(chptr, "%d,%d", &i, &j) != 2) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #3)");
+    if (sscanf(chptr, "%d,%d", &i, &j) != 2)
        return FTPERR_PASSIVE_ERROR;
-    }
     dataAddress.sin_port = htons((((unsigned)i) << 8) + j);
 
     chptr = passReply;
@@ -604,128 +476,31 @@ int ftpGetFileDesc(FD_t fd)
        if (*chptr == ',') *chptr = '.';
     }
 
-    if (!inet_aton(passReply, &dataAddress.sin_addr)) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #4)");
+    if (!inet_aton(passReply, &dataAddress.sin_addr))
        return FTPERR_PASSIVE_ERROR;
-    }
 
     ufdSetFd(fd, socket(AF_INET, SOCK_STREAM, IPPROTO_IP));
-    if (Fileno(fd) < 0) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #5)");
+    if (Fileno(fd) < 0)
        return FTPERR_FAILED_CONNECT;
-    }
 
-    retrCommand = alloca(strlen(remotename) + 20);
-    sprintf(retrCommand, "RETR %s\r\n", remotename);
-    i = strlen(retrCommand);
-   
     while (connect(Fileno(fd), (struct sockaddr *) &dataAddress, 
                sizeof(dataAddress)) < 0) {
        if (errno == EINTR)
            continue;
        Fclose(fd);
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #6)");
        return FTPERR_FAILED_DATA_CONNECT;
     }
 
-    DBG(fdDebug(fd), (stderr, "-> %s", retrCommand));
-    if (write(u->ftpControl, retrCommand, i) != i) {
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #7)");
+    DBG(fdDebug(fd), (stderr, "-> %s", cmd));
+    i = strlen(cmd);
+    if (write(u->ftpControl, cmd, i) != i)
        return FTPERR_SERVER_IO_ERROR;
-    }
 
     if ((rc = ftpCheckResponse(u, NULL))) {
        Fclose(fd);
-       urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc #8)");
        return rc;
     }
 
-    u->ftpGetFileDoneNeeded = 1;
-    urlFree(u, "ufdGetUrlinfo (from ftpGetFileDesc)");
+    u->ftpFileDoneNeeded = 1;
     return 0;
 }
-
-int httpGetFile(FD_t sfd, FD_t tfd) {
-    return copyData(sfd, tfd);
-}
-
-int ftpGetFile(FD_t sfd, FD_t tfd)
-{
-    /* XXX sfd will be freed by copyData -- grab sfd->fd_url now */
-    urlinfo sfu = ufdGetUrlinfo(sfd);
-    int rc;
-
-    /* XXX normally sfd = ufdOpen(...) and this code does not execute */
-    if (Fileno(sfd) < 0 && (rc = ftpGetFileDesc(sfd)) < 0) {
-       Fclose(sfd);
-       urlFree(sfu, "ufdGetUrlinfo (from ftpGetFile #1)");
-       return rc;
-    }
-
-    rc = copyData(sfd, tfd);
-    if (rc < 0) {
-       urlFree(sfu, "ufdGetUrlinfo (from ftpGetFile #2)");
-       return rc;
-    }
-
-    rc = ftpGetFileDone(sfu);
-    urlFree(sfu, "ufdGetUrlinfo (from ftpGetFile)");
-    return rc;
-}
-
-int ftpClose(FD_t fd) {
-    urlinfo u = ufdGetUrlinfo(fd);
-    int fdno;
-
-    if (u == NULL)
-       return FTPERR_UNKNOWN;  /* XXX W2DO? */
-
-    if ((fdno = u->ftpControl) >= 0)
-       close(fdno);
-    urlFree(u, "ufdGetUrlinfo (from ftpClose)");
-    return 0;
-}
-
-const char *const ftpStrerror(int errorNumber) {
-  switch (errorNumber) {
-    case 0:
-       return _("Success");
-
-    case FTPERR_BAD_SERVER_RESPONSE:
-       return _("Bad server response");
-
-    case FTPERR_SERVER_IO_ERROR:
-       return _("Server IO error");
-
-    case FTPERR_SERVER_TIMEOUT:
-       return _("Server timeout");
-
-    case FTPERR_BAD_HOST_ADDR:
-       return _("Unable to lookup server host address");
-
-    case FTPERR_BAD_HOSTNAME:
-       return _("Unable to lookup server host name");
-
-    case FTPERR_FAILED_CONNECT:
-       return _("Failed to connect to server");
-
-    case FTPERR_FAILED_DATA_CONNECT:
-       return _("Failed to establish data connection to server");
-
-    case FTPERR_FILE_IO_ERROR:
-       return _("IO error to local file");
-
-    case FTPERR_PASSIVE_ERROR:
-       return _("Error setting remote server to passive mode");
-
-    case FTPERR_FILE_NOT_FOUND:
-       return _("File not found on server");
-
-    case FTPERR_NIC_ABORT_IN_PROGRESS:
-       return _("Abort in progress");
-
-    case FTPERR_UNKNOWN:
-    default:
-       return _("Unknown or unexpected error");
-  }
-}

diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index dc018ff..e9ad3b5 100644 (file)
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -159,7 +159,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags,
            }
 
            rpmMessage(RPMMESS_DEBUG, _(" ... as %s\n"), tfn);
-           myrc = urlGetFile(*filename, tfn);
+           myrc = urlFile(*filename, tfn, 0);
            if (myrc < 0) {
                rpmMessage(RPMMESS_ERROR, 
                        _("skipping %s - transfer failed - %s\n"), 

diff --git a/lib/rpmio.h b/lib/rpmio.h
index 3297cb1..50f5170 100644 (file)
--- a/lib/rpmio.h
+++ b/lib/rpmio.h
@@ -9,6 +9,10 @@
 typedef        /*@abstract@*/ /*@refcounted@*/ struct _FD_s * FD_t;
 typedef /*@observer@*/ struct FDIO_s * FDIO_t;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef /*@null@*/ FD_t fdio_ref_function_t ( /*@only@*/ void * cookie, const char *msg, const char *file, unsigned line);
 typedef /*@null@*/ FD_t fdio_deref_function_t ( /*@only@*/ FD_t fd, const char *msg, const char *file, unsigned line);
 
@@ -17,6 +21,9 @@ typedef /*@null@*/ FD_t fdio_new_function_t (FDIO_t iop, const char *msg, const
 typedef int fdio_fileno_function_t (void * cookie);
 
 typedef FD_t fdio_open_function_t (const char *path, int flags, mode_t mode);
+typedef FD_t fdio_fopen_function_t (const char *path, const char *fmode);
+typedef void * fdio_ffileno_function_t (FD_t fd);
+typedef int fdio_fflush_function_t (FD_t fd);
 
 typedef int fdio_mkdir_function_t (const char *path, mode_t mode);
 typedef int fdio_chdir_function_t (const char *path);
@@ -36,6 +43,10 @@ struct FDIO_s {
   fdio_fileno_function_t *fileno;
 
   fdio_open_function_t *open;
+  fdio_fopen_function_t *fopen;
+  fdio_ffileno_function_t *ffileno;
+  fdio_fflush_function_t *fflush;
+
 #ifdef NOTYET
   fdio_mkdir_function_t *mkdir;
   fdio_chdir_function_t *chdir;
@@ -66,15 +77,6 @@ int  Rename  (const char * oldpath, const char * newpath);
 int    Chroot  (const char * path);
 int    Unlink  (const char * path);
 
-#endif /* H_RPMIO */
-
-#ifndef H_RPMIO_F
-#define H_RPMIO_F
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 int timedRead(FD_t fd, /*@out@*/void * bufptr, int length);
 
 /*@null@*/ const FDIO_t fdGetIoCookie(FD_t fd);
@@ -95,12 +97,16 @@ void fdDebugOff(FD_t fd);
 /*@observer@*/ extern FDIO_t fdio;
 
 /*
- * Support for FTP/HTTP I/O.
+ * Support for FTP and HTTP I/O.
  */
 /*@dependent@*/ /*@null@*/ void * ufdGetUrlinfo(FD_t fd);
 void ufdSetFd(FD_t fd, int fdno);
 /*@observer@*/ const char * urlStrerror(const char * url);
 
+int httpFile( /*@killref@*/ FD_t sfd, FD_t tfd, int dir);
+int ftpFile( /*@killref@*/ FD_t sfd, FD_t tfd, int dir);
+const char *const ftpStrerror(int errorNumber);
+
 /*@observer@*/ extern FDIO_t ufdio;
 
 /*
@@ -121,14 +127,8 @@ void fadSetFirstFree(FD_t fd, unsigned int firstFree);
 
 #include <zlib.h>
 
-extern /*@dependent@*/ /*@null@*/ gzFile * gzdFileno(FD_t fd);
-
-extern /*@null@*/ FD_t gzdOpen(const char * pathname, const char * mode);
-
 extern /*@null@*/ FD_t gzdFdopen( /*@only@*/ void * cookie, const char * mode);
 
-extern int gzdFlush(FD_t fd);
-
 /*@observer@*/ extern FDIO_t gzdio;
 
 #endif /* HAVE_ZLIB_H */
@@ -140,14 +140,8 @@ extern int gzdFlush(FD_t fd);
 
 #include <bzlib.h>
 
-extern /*@dependent@*/ /*@null@*/ BZFILE * bzdFileno(FD_t fd);
-
-extern /*@null@*/ FD_t bzdOpen(const char * pathname, const char * mode);
-
 extern /*@null@*/ FD_t bzdFdopen( /*@only@*/ void * cookie, const char * mode);
 
-extern int bzdFlush(FD_t fd);
-
 /*@observer@*/ extern FDIO_t bzdio;
 
 #endif /* HAVE_BZLIB_H */
@@ -156,4 +150,4 @@ extern int bzdFlush(FD_t fd);
 }
 #endif
 
-#endif /* H_RPMIO_F */
+#endif /* H_RPMIO */

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index bf6ffb3..89ea954 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -305,6 +305,8 @@ typedef void * (*rpmCallbackFunction)(const Header h,
                                      const unsigned long total,
                                      const void * pkgKey, void * data);
 
+void   urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount);
+
 int rpmdbOpen (const char * root, /*@out@*/ rpmdb * dbp, int mode, int perms);
     /* 0 on error */
 int rpmdbInit(const char * root, int perms);

diff --git a/lib/rpmurl.h b/lib/rpmurl.h
index 27c8052..a9a4665 100644 (file)
--- a/lib/rpmurl.h
+++ b/lib/rpmurl.h
@@ -30,6 +30,7 @@ typedef enum {
 } urltype;
 
 typedef /*@abstract@*/ /*@refcounted@*/ struct urlinfo {
+/*@refs@*/ int nrefs;
     const char *url;           /* copy of original url */
     const char *service;
     const char *user;
@@ -42,26 +43,20 @@ typedef /*@abstract@*/ /*@refcounted@*/ struct urlinfo {
     int proxyp;                        /* FTP/HTTP: proxy port */
     int        port;
     int ftpControl;
-    int ftpGetFileDoneNeeded;
+    int ftpFileDoneNeeded;
     int openError;             /* Type of open failure */
-/*@refs@*/ int nrefs;
 } *urlinfo;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*@observer@*/ const char *const ftpStrerror(int ftpErrno);
-
-void   urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount);
+int    ftpTimeoutSecs;
+int    ftpCheckResponse(urlinfo u, /*@out@*/ char **str);
 int    httpOpen(urlinfo u);
 int    ftpOpen(urlinfo u);
-
-int    httpGetFile( /*@killref@*/ FD_t sfd, FD_t tfd);
-int    ftpGetFile( /*@killref@*/ FD_t sfd, FD_t tfd);
-int    ftpGetFileDesc(FD_t);
-int    ftpAbort( /*@killref@*/ FD_t fd);
-int    ftpClose( /*@killref@*/ FD_t fd);
+int    ftpFileDone(urlinfo u);
+int    ftpFileDesc(urlinfo u, const char * cmd, FD_t fd);
 
 urlinfo        urlLink(urlinfo u, const char *msg);
 urlinfo        XurlLink(urlinfo u, const char *msg, const char *file, unsigned line);
@@ -80,7 +75,7 @@ void  urlFreeCache(void);
 urltype        urlIsURL(const char * url);
 int    urlSplit(const char *url, /*@out@*/ urlinfo *u);
 
-int    urlGetFile(const char * url, const char * dest);
+int    urlFile(const char * url, const char * dest, int push);
 
 #ifdef __cplusplus
 }

diff --git a/lib/url.c b/lib/url.c
index 827fdce..840f387 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -43,7 +43,7 @@ urlinfo XurlNew(const char *msg, const char *file, unsigned line)
     u->proxyp = -1;
     u->port = -1;
     u->ftpControl = -1;
-    u->ftpGetFileDoneNeeded = 0;
+    u->ftpFileDoneNeeded = 0;
     u->nrefs = 0;
     return XurlLink(u, msg, file, line);
 }
@@ -358,7 +358,7 @@ int urlSplit(const char * url, urlinfo *uret)
     return 0;
 }
 
-int urlGetFile(const char * url, const char * dest) {
+int urlFile(const char * url, const char * dest, int dir) {
     int rc;
     FD_t sfd = NULL;
     FD_t tfd = NULL;
@@ -393,7 +393,7 @@ int urlGetFile(const char * url, const char * dest) {
 
     switch (urlIsURL(url)) {
     case URL_IS_FTP:
-       if ((rc = ftpGetFile(sfd, tfd))) {
+       if ((rc = ftpFile(sfd, tfd, dir))) {
            unlink(dest);
            /*@-usereleased@*/ Fclose(sfd) /*@=usereleased@*/ ;
        }
@@ -402,7 +402,7 @@ int urlGetFile(const char * url, const char * dest) {
     case URL_IS_HTTP:
     case URL_IS_PATH:
     case URL_IS_DASH:
-       if ((rc = httpGetFile(sfd, tfd))) {
+       if ((rc = httpFile(sfd, tfd, dir))) {
            unlink(dest);
            /*@-usereleased@*/ Fclose(sfd) /*@=usereleased@*/ ;
        }

diff --git a/po/rpm.pot b/po/rpm.pot
index 848db20..77c35eb 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-02 09:31-0500\n"
+"POT-Creation-Date: 1999-11-02 12:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2106,58 +2106,6 @@ msgstr ""
 msgid "file %s is on an unknown device"
 msgstr ""
 
-#: lib/ftp.c:692
-msgid "Success"
-msgstr ""
-
-#: lib/ftp.c:695
-msgid "Bad server response"
-msgstr ""
-
-#: lib/ftp.c:698
-msgid "Server IO error"
-msgstr ""
-
-#: lib/ftp.c:701
-msgid "Server timeout"
-msgstr ""
-
-#: lib/ftp.c:704
-msgid "Unable to lookup server host address"
-msgstr ""
-
-#: lib/ftp.c:707
-msgid "Unable to lookup server host name"
-msgstr ""
-
-#: lib/ftp.c:710
-msgid "Failed to connect to server"
-msgstr ""
-
-#: lib/ftp.c:713
-msgid "Failed to establish data connection to server"
-msgstr ""
-
-#: lib/ftp.c:716
-msgid "IO error to local file"
-msgstr ""
-
-#: lib/ftp.c:719
-msgid "Error setting remote server to passive mode"
-msgstr ""
-
-#: lib/ftp.c:722
-msgid "File not found on server"
-msgstr ""
-
-#: lib/ftp.c:725
-msgid "Abort in progress"
-msgstr ""
-
-#: lib/ftp.c:729
-msgid "Unknown or unexpected error"
-msgstr ""
-
 #. This should not be allowed
 #: lib/header.c:170
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
@@ -3073,8 +3021,60 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
+#: lib/rpmio.c:200
+msgid "Success"
+msgstr ""
+
+#: lib/rpmio.c:203
+msgid "Bad server response"
+msgstr ""
+
+#: lib/rpmio.c:206
+msgid "Server IO error"
+msgstr ""
+
+#: lib/rpmio.c:209
+msgid "Server timeout"
+msgstr ""
+
+#: lib/rpmio.c:212
+msgid "Unable to lookup server host address"
+msgstr ""
+
+#: lib/rpmio.c:215
+msgid "Unable to lookup server host name"
+msgstr ""
+
+#: lib/rpmio.c:218
+msgid "Failed to connect to server"
+msgstr ""
+
+#: lib/rpmio.c:221
+msgid "Failed to establish data connection to server"
+msgstr ""
+
+#: lib/rpmio.c:224
+msgid "IO error to local file"
+msgstr ""
+
+#: lib/rpmio.c:227
+msgid "Error setting remote server to passive mode"
+msgstr ""
+
+#: lib/rpmio.c:230
+msgid "File not found on server"
+msgstr ""
+
+#: lib/rpmio.c:233
+msgid "Abort in progress"
+msgstr ""
+
+#: lib/rpmio.c:237
+msgid "Unknown or unexpected error"
+msgstr ""
+
 #. XXX PARANOIA
-#: lib/rpmio.c:228
+#: lib/rpmio.c:272
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""