imap-send: Fix sprintf usage
When composing a command for the imap server, imap-send uses a single nfsnprintf() invocation for brevity instead of dealing separately with the case when there is a message to be sent and the case when there isn’t. The unused argument in the second case, while valid, is confusing for static analyzers and human readers. v1.6.4-rc0~117 (imap-send: add support for IPv6, 2009-05-25) mistakenly used %hu as the format for an int “port”, by analogy with existing usage for the unsigned short “addr.sin_port”. Use %d instead. Noticed with clang. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Aug 7, 2010 at 18:09 UTC
1702b1381e2a7193d74f6dc649c86e15ec72b4dc
1 file changed
+8
-4
imap-send.c
+8
-4
@@ -543,9 +543,13 @@ static struct imap_cmd *v_issue_imap_cmd(struct imap_store *ctx,
543
while (imap->literal_pending)
544
get_cmd_result(ctx, NULL);
545
546
- bufl = nfsnprintf(buf, sizeof(buf), cmd->cb.data ? CAP(LITERALPLUS) ?
547
- "%d %s{%d+}\r\n" : "%d %s{%d}\r\n" : "%d %s\r\n",
548
- cmd->tag, cmd->cmd, cmd->cb.dlen);
546
+ if (!cmd->cb.data)
547
+ bufl = nfsnprintf(buf, sizeof(buf), "%d %s\r\n", cmd->tag, cmd->cmd);
548
+ else
549
+ bufl = nfsnprintf(buf, sizeof(buf), "%d %s{%d%s}\r\n",
550
+ cmd->tag, cmd->cmd, cmd->cb.dlen,
551
+ CAP(LITERALPLUS) ? "+" : "");
552
+
553
if (Verbose) {
554
if (imap->num_in_progress)
555
printf("(%d in progress) ", imap->num_in_progress);
@@ -1086,7 +1090,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
1090
int gai;
1091
char portstr[6];
1092
1089
- snprintf(portstr, sizeof(portstr), "%hu", srvc->port);
1093
+ snprintf(portstr, sizeof(portstr), "%d", srvc->port);
1094
1095
memset(&hints, 0, sizeof(hints));
1096
hints.ai_socktype = SOCK_STREAM;