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

pop3: Small code tidy up following authentication work so far 

Changed the order of the state machine to match the order of actual
events.

Reworked some comments and function parameter positioning that I missed
the other day.
parent 72f4b534

lib/pop3.c

+10 −17
Original line number Diff line number Diff line
@@ -276,10 +276,10 @@ static void state(struct connectdata *conn, pop3state newstate) 
  static const char * const names[]={

    "STOP",

    "SERVERGREET",

    "STARTTLS",

    "AUTH",

    "USER",

    "PASS",

    "STARTTLS",

    "COMMAND",

    "QUIT",

    /* LAST */
@@ -581,6 +581,10 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) 
      result = pop3_state_servergreet_resp(conn, pop3code, pop3c->state);

      break;



    case POP3_STARTTLS:

      result = pop3_state_starttls_resp(conn, pop3code, pop3c->state);

      break;



    case POP3_AUTH:

      result = pop3_state_auth_resp(conn);

      break;
@@ -593,10 +597,6 @@ static CURLcode pop3_statemach_act(struct connectdata *conn) 
      result = pop3_state_pass_resp(conn, pop3code, pop3c->state);

      break;



    case POP3_STARTTLS:

      result = pop3_state_starttls_resp(conn, pop3code, pop3c->state);

      break;



    case POP3_COMMAND:

      result = pop3_state_command_resp(conn, pop3code, pop3c->state);

      break;
@@ -905,7 +905,6 @@ static CURLcode pop3_disconnect(struct connectdata *conn, bool dead_connection) 
 * pop3_parse_url_path()

 *

 * Parse the URL path into separate path components.

 *

 */

static CURLcode pop3_parse_url_path(struct connectdata *conn)

{
@@ -983,9 +982,7 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn, 
  Curl_pgrsSetUploadSize(data, 0);

  Curl_pgrsSetDownloadSize(data, 0);



  result = pop3_perform(conn,

                        &connected,    /* have we connected after PASV/PORT */

                        dophase_done); /* all commands in the DO-phase done? */

  result = pop3_perform(conn, &connected, dophase_done);



  if(CURLE_OK == result) {
@@ -1035,13 +1032,9 @@ static CURLcode pop3_setup_connection(struct connectdata * conn) 
  return CURLE_OK;

}



/*

 * This function scans the body after the end-of-body and writes everything

 * until the end is found.

 */

CURLcode Curl_pop3_write(struct connectdata *conn,

                         char *str,

                         size_t nread)

/* This function scans the body after the end-of-body and writes everything

   until the end is found */

CURLcode Curl_pop3_write(struct connectdata *conn, char *str, size_t nread)

{

  /* This code could be made into a special function in the handler struct */

  CURLcode result = CURLE_OK;

lib/pop3.h

+1 −1
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ typedef enum { 
  POP3_STOP,         /* do nothing state, stops the state machine */

  POP3_SERVERGREET,  /* waiting for the initial greeting immediately after

                        a connect */

  POP3_STARTTLS,

  POP3_AUTH,

  POP3_USER,

  POP3_PASS,

  POP3_STARTTLS,

  POP3_COMMAND,

  POP3_QUIT,

  POP3_LAST          /* never used */