From 5c213e9e7752f276037d5514d5f05a789c93e8cc Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Fri, 28 Jun 2019 16:11:22 +0100
Subject: [PATCH] wmbiff: use `size_t` for password-lengths.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 wmbiff/wmbiff/Client.h      |  2 +-
 wmbiff/wmbiff/Imap4Client.c |  4 ++--
 wmbiff/wmbiff/passwordMgr.c | 15 +++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/wmbiff/wmbiff/Client.h b/wmbiff/wmbiff/Client.h
index cd89496..55bc0de 100644
--- a/wmbiff/wmbiff/Client.h
+++ b/wmbiff/wmbiff/Client.h
@@ -88,7 +88,7 @@ typedef struct _mbox_t {
 			/* using the msglst feature, fetch the headers
 			   to have them on hand */
 			unsigned int wantCacheHeaders:1;
-			unsigned char password_len;	/* memfrob may shorten passwords */
+			size_t password_len;	/* memfrob may shorten passwords */
 		} pop_imap;
 	} u;
 
diff --git a/wmbiff/wmbiff/Imap4Client.c b/wmbiff/wmbiff/Imap4Client.c
index 395db2b..cdf5a30 100644
--- a/wmbiff/wmbiff/Imap4Client.c
+++ b/wmbiff/wmbiff/Imap4Client.c
@@ -579,8 +579,8 @@ int imap4Create( /*@notnull@ */ Pop3 pc, const char *const str)
 	free(unaliased_str);
 
 	IMAP_DM(pc, DEBUG_INFO, "userName= '%s'\n", PCU.userName);
-	IMAP_DM(pc, DEBUG_INFO, "password is %d characters long\n",
-			(int) PCU.password_len);
+	IMAP_DM(pc, DEBUG_INFO, "password is %zu characters long\n",
+			PCU.password_len);
 	IMAP_DM(pc, DEBUG_INFO, "serverName= '%s'\n", PCU.serverName);
 	IMAP_DM(pc, DEBUG_INFO, "serverPath= '%s'\n", pc->path);
 	IMAP_DM(pc, DEBUG_INFO, "serverPort= '%d'\n", PCU.serverPort);
diff --git a/wmbiff/wmbiff/passwordMgr.c b/wmbiff/wmbiff/passwordMgr.c
index 28b6e30..b0ae280 100644
--- a/wmbiff/wmbiff/passwordMgr.c
+++ b/wmbiff/wmbiff/passwordMgr.c
@@ -51,7 +51,7 @@ typedef struct password_binding_struct {
 	char user[BUF_SMALL];
 	char server[BUF_BIG];
 	char password[BUF_SMALL];	/* may be frobnicated */
-	unsigned char password_len;	/* frobnicated *'s are nulls */
+	size_t password_len;	/* frobnicated *'s are nulls */
 } *password_binding;
 
 static password_binding pass_list = NULL;
@@ -113,8 +113,7 @@ static void
 get_password_from_keychain(Pop3 pc, const char *username,
 						   const char *servername,
 						   /*@out@ */ char *password,
-						   /*@out@ */
-						   unsigned char *password_len)
+						   /*@out@ */ size_t *password_len)
 {
 	SecKeychainRef kc;
 	OSStatus rc;
@@ -145,7 +144,7 @@ get_password_from_keychain(Pop3 pc, const char *username,
 		*password_len = pwdlen;
 	} else {
 		DM(pc, DEBUG_ERROR,
-		   "passmgr: warning: your password appears longer (%lu) than expected (%d)\n",
+		   "passmgr: warning: your password appears longer (%zu) than expected (%zu)\n",
 		   strlen(secpwd), *password_len - 1);
 	}
 	rc = SecKeychainItemFreeContent(NULL, secpwd);
@@ -159,7 +158,7 @@ get_password_from_command(Pop3 pc, const char *username,
 						  const char *servername,
 						  /*@out@ */ char *password,
 						  /*@out@ */
-						  unsigned char *password_len)
+						  size_t *password_len)
 {
 	password[*password_len - 1] = '\0';
 	password[0] = '\0';
@@ -195,8 +194,8 @@ get_password_from_command(Pop3 pc, const char *username,
 		strncpy(password, password_ptr, *password_len);
 		if (password[*password_len - 1] != '\0') {
 			DM(pc, DEBUG_ERROR,
-			   "passmgr: warning: your password appears longer (%lu) than expected (%d)\n",
-			   (unsigned long) strlen(password_ptr), *password_len - 1);
+			   "passmgr: warning: your password appears longer (%zu) than expected (%zu)\n",
+			   strlen(password_ptr), *password_len - 1);
 		}
 		free(password_ptr);
 		password[*password_len - 1] = '\0';
@@ -230,7 +229,7 @@ char *passwordFor(const char *username,
 			if (bFlushCache == 0) {
 				char *ret = strdup(p->password);
 #ifdef HAVE_MEMFROB
-				unsigned short ret_len = p->password_len;
+				size_t ret_len = p->password_len;
 				DEFROB(ret);
 #endif
 				return (ret);