Commit 6a2e21ec authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

FTP code turned into state machine. Not completely yet, but a good start. 

The tag 'before_ftp_statemachine' was set just before this commit in case
of future need.
parent 120f17ce

include/curl/curl.h

+5 −1
Original line number Diff line number Diff line
@@ -245,7 +245,9 @@ typedef enum { 
  CURLE_COULDNT_RESOLVE_HOST,    /* 6 */

  CURLE_COULDNT_CONNECT,         /* 7 */

  CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */

  CURLE_FTP_ACCESS_DENIED,       /* 9 */

  CURLE_FTP_ACCESS_DENIED,       /* 9 a service was denied by the FTP server

                                    due to lack of access - when login fails

                                    this is not returned. */

  CURLE_FTP_USER_PASSWORD_INCORRECT, /* 10 */

  CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */

  CURLE_FTP_WEIRD_USER_REPLY,    /* 12 */
@@ -305,6 +307,8 @@ typedef enum { 
  CURLE_SEND_FAIL_REWIND,        /* 65 - Sending the data requires a rewind

                                    that failed */

  CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */

  CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not

                                    accepted and we failed to login */

  CURL_LAST /* never use! */

} CURLcode;

lib/dict.c

+4 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -85,7 +85,7 @@ 
#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>



CURLcode Curl_dict(struct connectdata *conn)

CURLcode Curl_dict(struct connectdata *conn, bool *done)

{

  char *word;

  char *ppath;
@@ -100,6 +100,8 @@ CURLcode Curl_dict(struct connectdata *conn) 
  char *path = conn->path;

  curl_off_t *bytecount = &conn->bytecount;



  *done = TRUE; /* unconditionally */



  if(conn->bits.user_passwd) {

    /* AUTH is missing */

  }

lib/dict.h

+7 −7
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -24,7 +24,7 @@ 
 * $Id$

 ***************************************************************************/

#ifndef CURL_DISABLE_DICT

CURLcode Curl_dict(struct connectdata *conn);

CURLcode Curl_dict(struct connectdata *conn, bool *done);

CURLcode Curl_dict_done(struct connectdata *conn);

#endif

#endif

lib/file.c

+4 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -266,7 +266,7 @@ static CURLcode file_upload(struct connectdata *conn) 
 * opposed to sockets) we instead perform the whole do-operation in this

 * function.

 */

CURLcode Curl_file(struct connectdata *conn)

CURLcode Curl_file(struct connectdata *conn, bool *done)

{

  /* This implementation ignores the host name in conformance with

     RFC 1738. Only local files (reachable via the standard file system)
@@ -286,6 +286,8 @@ CURLcode Curl_file(struct connectdata *conn) 
  int fd;

  struct timeval now = Curl_tvnow();



  *done = TRUE; /* unconditionally */



  Curl_readwrite_init(conn);

  Curl_initinfo(data);

  Curl_pgrsStartNow(data);

lib/file.h

+7 −7
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -24,7 +24,7 @@ 
 * $Id$

 ***************************************************************************/

#ifndef CURL_DISABLE_FILE

CURLcode Curl_file(struct connectdata *);

CURLcode Curl_file(struct connectdata *, bool *done);

CURLcode Curl_file_done(struct connectdata *, CURLcode);

CURLcode Curl_file_connect(struct connectdata *);

#endif