From 48c840fb76609046f1ecc1f3a2c83d288563e541 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 8 May 2007 08:11:59 +0000 Subject: minor: Remove trailing slashes from Server urls to prevent double slashes in paths --- lib/libalpm/server.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c index 519c5084..b8635629 100644 --- a/lib/libalpm/server.c +++ b/lib/libalpm/server.c @@ -72,6 +72,10 @@ pmserver_t *_alpm_server_new(const char *url) strcpy(u->pwd, "libalpm@guest"); } + /* remove trailing slashes, just to clean up the rest of the code */ + for(int i = strlen(u->doc) - 1; u->doc[i] == '/'; --i) + u->doc[i] = '\0'; + server->s_url = u; return server; @@ -126,6 +130,7 @@ static struct url *url_for_file(pmserver_t *server, const char *filename) } snprintf(doc, doclen, "%s/%s", server->s_url->doc, filename); + _alpm_log(PM_LOG_DEBUG, "file path: '%s'", doc); ret = downloadMakeURL(server->s_url->scheme, server->s_url->host, server->s_url->port, -- cgit v1.2.3-24-g4f1b