From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 27 Nov 2015 06:59:02 +0000 (+0000)
Subject: tool_paramhlp: Fixed display of URL index in password prompt for --next
X-Git-Tag: curl-7_46_0~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db05d7a731109a2a5234168973783499d300fdb8;p=curl

tool_paramhlp: Fixed display of URL index in password prompt for --next

Commit f3bae6ed73 added the URL index to the password prompt when using
--next. Unfortunately, because the size_t specifier (%zu) is not
supported by all sprintf() implementations we use the curl_off_t format
specifier instead. The display of an incorrect value arises on platforms
where size_t and curl_off_t are of a different size.
---

diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index c26754aeb..c1baed5f0 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -426,7 +426,7 @@ static CURLcode checkpasswd(const char *kind, /* for what purpose */
       curlx_msnprintf(prompt, sizeof(prompt),
                       "Enter %s password for user '%s' on URL #%"
                       CURL_FORMAT_CURL_OFF_TU ":",
-                      kind, *userpwd, i + 1);
+                      kind, *userpwd, (curl_off_t) (i + 1));
 
     /* get password */
     getpass_r(prompt, passwd, sizeof(passwd));