Commit 5ee64be9 authored by Steve Holme's avatar Steve Holme
Browse files

smtp: Post SMTP command expansion tidy up 

Removed unnecessary SMTP_STOP state changes on failure.

Removed hard return on failure in smtp_state_data_resp().
parent 9f18cf15

lib/smtp.c

+12 −12
Original line number Diff line number Diff line
@@ -1319,7 +1319,6 @@ static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode, 
  if(smtpcode/100 != 2) {

    failf(data, "MAIL failed: %d", smtpcode);

    result = CURLE_SEND_ERROR;

    state(conn, SMTP_STOP);

  }

  else

    /* Start the RCPT TO command */
@@ -1341,7 +1340,6 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode, 
  if(smtpcode/100 != 2) {

    failf(data, "RCPT failed: %d", smtpcode);

    result = CURLE_SEND_ERROR;

    state(conn, SMTP_STOP);

  }

  else {

    smtp->rcpt = smtp->rcpt->next;
@@ -1365,15 +1363,16 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn, int smtpcode, 
static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode,

                                     smtpstate instate)

{

  CURLcode result = CURLE_OK;

  struct SessionHandle *data = conn->data;



  (void)instate; /* no use for this yet */



  if(smtpcode != 354) {

    state(conn, SMTP_STOP);

    return CURLE_SEND_ERROR;

    failf(data, "DATA failed: %d", smtpcode);

    result = CURLE_SEND_ERROR;

  }



  else {

    /* Set the progress upload size */

    Curl_pgrsSetUploadSize(data, data->set.infilesize);
@@ -1382,8 +1381,9 @@ static CURLcode smtp_state_data_resp(struct connectdata *conn, int smtpcode, 


    /* End of DO phase */

    state(conn, SMTP_STOP);

  }



  return CURLE_OK;

  return result;

}



/* For POSTDATA responses, which are received after the entire DATA