From 9040bf693db42def1be9cad897a9dea8a1a0729e Mon Sep 17 00:00:00 2001 From: Nathan Jones Date: Fri, 14 Dec 2007 18:35:19 -0500 Subject: [PATCH] Display username, password, and port with -Sup. Signed-off-by: Nathan Jones --- lib/libalpm/db.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index b772add..fd82bd8 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -323,6 +323,7 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) { char path[PATH_MAX]; pmserver_t *s; + char port[10]; ALPM_LOG_FUNC; @@ -332,7 +333,21 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) s = (pmserver_t*)db->servers->data; - snprintf(path, PATH_MAX, "%s://%s%s", s->s_url->scheme, s->s_url->host, s->s_url->doc); + /* port is 0 if it wasn't specified */ + if (s->s_url->port != 0) { + snprintf(port, 10, ":%d", s->s_url->port); + } else { + strcpy(port, ""); + } + + if (strlen(s->s_url->user) > 0) { + snprintf(path, PATH_MAX, "%s://%s:%s@%s%s%s", s->s_url->scheme, + s->s_url->user, s->s_url->pwd, s->s_url->host, + port, s->s_url->doc); + } else { + snprintf(path, PATH_MAX, "%s://%s%s%s", s->s_url->scheme, + s->s_url->host, port, s->s_url->doc); + } return strdup(path); } -- 1.5.3.7