Commit 459e1bff authored by Steve Holme's avatar Steve Holme
Browse files

imap: Moved imap_append() to be with the other perform functions

parent 7b471fb3
Loading
Loading
Loading
Loading
+27 −27
Original line number Diff line number Diff line
@@ -710,6 +710,33 @@ static CURLcode imap_fetch(struct connectdata *conn)
  return result;
}

static CURLcode imap_append(struct connectdata *conn)
{
  CURLcode result;
  struct IMAP *imap = conn->data->state.proto.imap;
  char *mailbox;

  if(conn->data->set.infilesize < 0) {
    failf(conn->data, "Cannot APPEND with unknown input file size\n");
    return CURLE_UPLOAD_FAILED;
  }

  mailbox = imap_atom(imap->mailbox);

  if(!mailbox)
    return CURLE_OUT_OF_MEMORY;

  result = imap_sendf(conn, "APPEND %s (\\Seen) {%" FORMAT_OFF_T "}",
                      mailbox, conn->data->set.infilesize);

  Curl_safefree(mailbox);

  if(!result)
    state(conn, IMAP_APPEND);

  return result;
}

/* For the initial server greeting */
static CURLcode imap_state_servergreet_resp(struct connectdata *conn,
                                            int imapcode,
@@ -1359,33 +1386,6 @@ static CURLcode imap_state_fetch_final_resp(struct connectdata *conn,
  return result;
}

static CURLcode imap_append(struct connectdata *conn)
{
  CURLcode result;
  struct IMAP *imap = conn->data->state.proto.imap;
  char *mailbox;

  if(conn->data->set.infilesize < 0) {
    failf(conn->data, "Cannot APPEND with unknown input file size\n");
    return CURLE_UPLOAD_FAILED;
  }

  mailbox = imap_atom(imap->mailbox);

  if(!mailbox)
    return CURLE_OUT_OF_MEMORY;

  result = imap_sendf(conn, "APPEND %s (\\Seen) {%" FORMAT_OFF_T "}",
                      mailbox, conn->data->set.infilesize);

  Curl_safefree(mailbox);

  if(!result)
    state(conn, IMAP_APPEND);

  return result;
}

/* For APPEND responses */
static CURLcode imap_state_append_resp(struct connectdata *conn,
                                       int imapcode,