summaryrefslogtreecommitdiff
path: root/imap-send.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2013-01-15 09:06:24 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-15 14:50:19 -0800
commit1efee7ffce56da48ac0cecfe2e66f0f6f2b15dd6 (patch)
treeca44bd543688e8f88defa840fbb1e335aaf1cf1d /imap-send.c
parente6de37513969a42160647056db8580902d9614d8 (diff)
downloadgit-1efee7ffce56da48ac0cecfe2e66f0f6f2b15dd6.tar.gz
imap-send.c: remove some unused fields from struct store
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'imap-send.c')
-rw-r--r--imap-send.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/imap-send.c b/imap-send.c
index 9e181e098c..131325a319 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -36,12 +36,7 @@ typedef void *SSL;
struct store {
/* currently open mailbox */
const char *name; /* foreign! maybe preset? */
- char *path; /* own */
int uidvalidity;
- unsigned char opts; /* maybe preset? */
- /* note that the following do _not_ reflect stats from msgs, but mailbox totals */
- int count; /* # of messages */
- int recent; /* # of recent messages - don't trust this beyond the initial read */
};
static const char imap_send_usage[] = "git imap-send < <mbox>";
@@ -772,13 +767,20 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd)
!strcmp("NO", arg) || !strcmp("BYE", arg)) {
if ((resp = parse_response_code(ctx, NULL, cmd)) != RESP_OK)
return resp;
- } else if (!strcmp("CAPABILITY", arg))
+ } else if (!strcmp("CAPABILITY", arg)) {
parse_capability(imap, cmd);
- else if ((arg1 = next_arg(&cmd))) {
- if (!strcmp("EXISTS", arg1))
- ctx->gen.count = atoi(arg);
- else if (!strcmp("RECENT", arg1))
- ctx->gen.recent = atoi(arg);
+ } else if ((arg1 = next_arg(&cmd))) {
+ ; /*
+ * Unhandled response-data with at least two words.
+ * Ignore it.
+ *
+ * NEEDSWORK: Previously this case handled '<num> EXISTS'
+ * and '<num> RECENT' but as a probably-unintended side
+ * effect it ignores other unrecognized two-word
+ * responses. imap-send doesn't ever try to read
+ * messages or mailboxes these days, so consider
+ * eliminating this case.
+ */
} else {
fprintf(stderr, "IMAP error: unable to parse untagged response\n");
return RESP_BAD;
@@ -1254,7 +1256,6 @@ static int imap_store_msg(struct store *gctx, struct strbuf *msg)
imap->caps = imap->rcaps;
if (ret != DRV_OK)
return ret;
- gctx->count++;
return DRV_OK;
}