Commit e621a5f6 authored by Steve Holme's avatar Steve Holme
Browse files

smtp: Moved smtp_rcpt_to() to be with the other perform functions

parent 8093f954

lib/smtp.c

+21 −21
Original line number Diff line number Diff line
@@ -569,6 +569,27 @@ static CURLcode smtp_mail(struct connectdata *conn) 
  return result;

}



static CURLcode smtp_rcpt_to(struct connectdata *conn)

{

  CURLcode result = CURLE_OK;

  struct SessionHandle *data = conn->data;

  struct SMTP *smtp = data->state.proto.smtp;



  /* Send the RCPT TO command */

  if(smtp->rcpt) {

    if(smtp->rcpt->data[0] == '<')

      result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",

                             smtp->rcpt->data);

    else

      result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",

                             smtp->rcpt->data);

    if(!result)

      state(conn, SMTP_RCPT);

  }



  return result;

}



/* For the initial server greeting */

static CURLcode smtp_state_servergreet_resp(struct connectdata *conn,

                                            int smtpcode,
@@ -1006,27 +1027,6 @@ static CURLcode smtp_state_auth_final_resp(struct connectdata *conn, 
  return result;

}



static CURLcode smtp_rcpt_to(struct connectdata *conn)

{

  CURLcode result = CURLE_OK;

  struct SessionHandle *data = conn->data;

  struct SMTP *smtp = data->state.proto.smtp;



  /* Send the RCPT TO command */

  if(smtp->rcpt) {

    if(smtp->rcpt->data[0] == '<')

      result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",

                             smtp->rcpt->data);

    else

      result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",

                             smtp->rcpt->data);

    if(!result)

      state(conn, SMTP_RCPT);

  }



  return result;

}



/* For MAIL responses */

static CURLcode smtp_state_mail_resp(struct connectdata *conn, int smtpcode,

                                     smtpstate instate)