The death of lib/ftp.c, merged into lib/rpmio.c.

Start composting the rpmio API.
Preliminary (not working) support for HTTP PUT.
build.c: Check fd for NULL and use Ferror() for Fopen return.
build/parseSpec.c: ditto
build/pack.c: Use fdGetFP() rather than fpio->ffileno().
build/parseSpec.c: ditto
build/pack.c: Use Stat/Mkdir wrappers.
build/pack.c: Do Fflush before fdDup so that writes can remain buffered.
lib/install.c: ditto
build/parsePrep.c: Skip over URL leadin when writing %prep scriptlet.
lib/misc.c: Rewrite to use simpler urlPath(). Restore checks on local fs.
lib/rpmchecksig.c: Open with "r+" rather than "w" to avoid truncation.
lib/url.c: Do lazy malloc of u->buf in rpmio.c checkResponse().
lib/rpmio.c: Make persist/contentLength per-fd rather than per-url.
lib/rpmio.c: Add wr_chunked method for HTTP PUT (still broken).
lib/rpmio.c: ftpAbort() should use timedRead.
lib/rpmio.c: Add Fflush().
lib/url.c: urlPath() should return something ("/") on url = NULL (paranoia).
lib/url.c: urlSplit() should return something ("/") on url w/o path.

CVS patchset: 3429
CVS date: 1999/11/18 18:07:46

1 files changed, 8 insertions, 3 deletions

diff --git a/build/parsePrep.c b/build/parsePrep.c
index 5e12a72c4..9830f6bce 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -276,9 +276,14 @@ static int doSetupMacro(Spec spec, char *line)
     poptFreeContext(optCon);
 
     /* cd to the build dir */
-    strcpy(buf, "cd %{_builddir}");
-    expandMacros(spec, spec->macros, buf, sizeof(buf));
-    appendLineStringBuf(spec->prep, buf);
+    {	const char * buildURL = rpmGenPath(spec->rootdir, "%{_builddir}", "");
+	const char *buildDir;
+
+	(void) urlPath(buildURL, &buildDir);
+	sprintf(buf, "cd %s", buildDir);
+	appendLineStringBuf(spec->prep, buf);
+	xfree(buildURL);
+    }
     
     /* delete any old sources */
     if (!leaveDirs) {