Roxen.git/ server/ plugins/ protocols/ ftp.pike

2004-05-17

2004-05-17 16:38:23 by Martin Nilsson <mani@lysator.liu.se>

• 125942d25a6e5538a502af37f6d38e05f2511f35 (36 lines) (+13/-23) ^{[ Show | Annotate ]}
  Branch: Aphoto_2.0_beta3

WebServer sync [2.96]

Rev: server/plugins/protocols/ftp.pike:2.96

4:   /*    * FTP protocol mk 2    * -  * $Id: ftp.pike,v 2.95 2004/05/17 16:35:34 mani Exp $ +  * $Id: ftp.pike,v 2.96 2004/05/17 16:38:23 mani Exp $    *    * Henrik Grubbström <grubba@roxen.com>    */
1891:       file = stat_file(fname, session);    +  // The caller is assumed to have made a new session object for us +  // but not to set not_query in it.. +  session->not_query = fname; +     if (objectp(file) || arrayp(file)) {    array|object st = file;    file = 0;
3249:    }    args = fix_path(args);    -  RequestID session = RequestID2(master_session); -  -  session->method = "STAT"; -  -  if (stat_file(args, session)) { +  if (stat_file(args)) {    send(350, ({ sprintf("%s ok, waiting for destination name.", args) }) );    rename_from = args;    } else {    send(550, ({ sprintf("%s: no such file or permission denied.",args) }) );    } -  destruct(session); +     }       void ftp_RNTO(string args)
3481:    return;    }    args = fix_path(args); -  RequestID session = RequestID2(master_session); -  session->method = "STAT"; -  mapping|array|object st = stat_file(args, session); +  mapping|array|object st = stat_file(args);       if (!arrayp(st) && !objectp(st)) { -  send_error("MDTM", args, st, session); +  send_error("MDTM", args, st, master_session);    } else {    send(213, ({ make_MDTM(st[3]) }));    } -  destruct(session); +     }       void ftp_SIZE(string args)
3500:    }    args = fix_path(args);    -  RequestID session = RequestID2(master_session); -  session->method = "STAT"; -  mapping|array|object st = stat_file(args, session); +  mapping|array|object st = stat_file(args);       if (!arrayp(st) && !objectp(st)) { -  send_error("SIZE", args, st, session); -  destruct(session); +  send_error("SIZE", args, st, master_session);    return;    }    int size = st[1];    if (size < 0) { -  send_error("SIZE", args, ([ "error":405, ]), session); +  send_error("SIZE", args, ([ "error":405, ]), master_session);    // size = 512;    } else {    send(213, ({ (string)size }));    } -  destruct(session); +     }       void ftp_STAT(string args)
3559:    return;    }    string long = fix_path(args); -  RequestID session = RequestID2(master_session); -  session->method = "STAT"; +     mapping|array|object st = stat_file(long);       if (!arrayp(st) && !objectp(st)) { -  send_error("STAT", long, st, session); +  send_error("STAT", long, st, master_session);    } else {    string s = LS_L(master_session)->ls_l(args, st);   
3572:    "%s"    "End of Status", args, s)/"\n");    } -  destruct(session); +     }       void ftp_NOOP(string args)