Commit 37ae32f6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Only output valid filetime. 

Return file-error if 550 is returned when trying MDTM
parent d0cffdec

lib/ftp.c

+24 −16
Original line number Diff line number Diff line
@@ -756,7 +756,9 @@ CURLcode ftp_getfiletime(struct connectdata *conn, char *file) 
  if(result)

    return result;



  if(ftpcode == 213) {

  switch(ftpcode) {

  case 213:

    {

      /* we got a time. Format should be: "YYYYMMDDHHMMSS[.sss]" where the

         last .sss part is optional and means fractions of a second */

      int year, month, day, hour, minute, second;
@@ -769,9 +771,15 @@ CURLcode ftp_getfiletime(struct connectdata *conn, char *file) 
        /* now, convert this into a time() value: */

        conn->data->info.filetime = curl_getdate(buf, &secs);

      }

    else {

      infof(conn->data, "unsupported MDTM reply format\n");

    }

    break;

  default:

    infof(conn->data, "unsupported MDTM reply format\n");

    break;

  case 550: /* "No such file or directory" */

    failf(conn->data, "Given file does not exist");

    result = CURLE_FTP_COULDNT_RETR_FILE;

    break;

  }

  return  result;

}
@@ -1989,7 +1997,7 @@ CURLcode ftp_perform(struct connectdata *conn, 
       well, we "emulate" a HTTP-style header in our output. */



#ifdef HAVE_STRFTIME

    if(data->set.get_filetime && data->info.filetime) {

    if(data->set.get_filetime && (data->info.filetime>=0) ) {

      struct tm *tm;

#ifdef HAVE_LOCALTIME_R

      struct tm buffer;