diff options
author | Chris Lumens <clumens@redhat.com> | 2006-03-24 19:17:29 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2006-03-24 19:17:29 +0000 |
commit | a08b8d82c731893a3c0010fec81324526cfaf8ad (patch) | |
tree | 7248ad35fcac5ddde8f71ece78132d5748a3a6a5 /loader2 | |
parent | 4b7e668b070162e2e6c6cf3f4c50a222b900ae5f (diff) | |
download | anaconda-a08b8d82c731893a3c0010fec81324526cfaf8ad.tar.gz anaconda-a08b8d82c731893a3c0010fec81324526cfaf8ad.tar.xz anaconda-a08b8d82c731893a3c0010fec81324526cfaf8ad.zip |
Don't pack the URL full of slashes if we can help it. Maybe this will
help people who are running a really broken web server.
Diffstat (limited to 'loader2')
-rw-r--r-- | loader2/urls.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/loader2/urls.c b/loader2/urls.c index d34fbefcb..43f514afc 100644 --- a/loader2/urls.c +++ b/loader2/urls.c @@ -157,16 +157,19 @@ int urlinstStartTransfer(struct iurlinfo * ui, char * filename, char * finalPrefix; if (!strcmp(ui->prefix, "/")) - finalPrefix = "/."; + finalPrefix = ""; else finalPrefix = ui->prefix; - - logMessage(INFO, "transferring %s://%s/%s/%s to a fd", - ui->protocol == URL_METHOD_FTP ? "ftp" : "http", - ui->address, finalPrefix, filename); buf = alloca(strlen(finalPrefix) + strlen(filename) + 20); - sprintf(buf, "%s/%s", finalPrefix, filename); + if (*filename == '/') + sprintf(buf, "%s%s", finalPrefix, filename); + else + sprintf(buf, "%s/%s", finalPrefix, filename); + + logMessage(INFO, "transferring %s://%s/%s to a fd", + ui->protocol == URL_METHOD_FTP ? "ftp" : "http", + ui->address, buf); if (ui->protocol == URL_METHOD_FTP) { ui->ftpPort = ftpOpen(ui->address, |