Use Fstrerror on ufdio throughut.

rpm.c: add --rmspec to usage output.
build/files.c: use ufdio to permit '%files -f <url>' (untested).
build/pack.c: use ufdio in readRPM(), writeRPM(), and addFileToTag().
build/parsePreamble.c: use ufdio in readIcon().
lib/ftp.c: httpOpen() now takes FD_t ctrl arg to uncouple from u->ctrl.
lib/install.c: usr rpmGenPath() to identify first found url in file path concat.
lib/install.c: permit url's in files[i].relativePath.
lib/macro.c: use ufdio, diddle macros for tmacro standalone build.
lib/macro.c: Create rpmGenPath().
lib/macro.c: diddle macro files path to permit url's.
lib/rpmchecksig.c: use Fopen on fdio.
lib/rpmio.c: replace copyData() with ufdCopy().
lib/rpmio.c: replace httpGetFile() with ufdGetFile().
lib/rpmio.c: add ufdWrite().
lib/rpmio.c: permit 2 simultaneous persistent malloc/open HTTP/1.1 connections.
lib/rpmio.c: Add Lstat(), Stat(), and Access().
lib/rpmio.c: assume paths in syscall stubs are loopback (WRONG).
lib/url.c: add urlPath().

CVS patchset: 3422
CVS date: 1999/11/12 17:20:49

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/rpmurl.h b/lib/rpmurl.h
index c021205c7..d75c6346d 100644
--- a/lib/rpmurl.h
+++ b/lib/rpmurl.h
@@ -66,10 +66,10 @@ extern "C" {
 int	ftpCheckResponse(urlinfo u, /*@out@*/ char ** str);
 int	ftpCommand(urlinfo u, ...);
 
-int	httpOpen(urlinfo u, const char * httpcmd);
+int	httpOpen(urlinfo u, FD_t ctrl, const char * httpcmd);
 int	ftpOpen(urlinfo u);
-int	ftpFileDone(urlinfo u, FD_t fd);
-int	ftpFileDesc(urlinfo u, const char * cmd, FD_t fd);
+int	ftpFileDone(urlinfo u, FD_t data);
+int	ftpFileDesc(urlinfo u, const char * cmd, FD_t data);
 
 urlinfo	urlLink(urlinfo u, const char * msg);
 urlinfo	XurlLink(urlinfo u, const char * msg, const char * file, unsigned line);
@@ -86,6 +86,7 @@ urlinfo	XurlFree( /*@killref@*/ urlinfo u, const char * msg, const char * file,
 void	urlFreeCache(void);
 
 urltype	urlIsURL(const char * url);
+int	urlPath(const char * url, /*@out@*/ const char ** pathp);
 int 	urlSplit(const char * url, /*@out@*/ urlinfo * u);
 
 int	urlGetFile(const char * url, const char * dest);