diff --git a/appl/ftp/ftpd/extern.h b/appl/ftp/ftpd/extern.h index 150e32c90..fbd5afce3 100644 --- a/appl/ftp/ftpd/extern.h +++ b/appl/ftp/ftpd/extern.h @@ -53,7 +53,7 @@ void blkfree(char **); char **copyblk(char **); void cwd(char *); -void delete(char *); +void do_delete(char *); void dologout(int); void fatal(char *); int ftpd_pclose(FILE *); @@ -76,7 +76,7 @@ void send_file_list(char *); void setproctitle(const char *, ...); void statcmd(void); void statfilecmd(char *); -void store(char *, char *, int); +void do_store(char *, char *, int); void upper(char *); void user(char *); void yyerror(char *); diff --git a/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y index 4f8cd88f0..504fd4df7 100644 --- a/appl/ftp/ftpd/ftpcmd.y +++ b/appl/ftp/ftpd/ftpcmd.y @@ -325,14 +325,14 @@ cmd | STOR check_login SP pathname CRLF { if ($2 && $4 != NULL) - store($4, "w", 0); + do_store($4, "w", 0); if ($4 != NULL) free($4); } | APPE check_login SP pathname CRLF { if ($2 && $4 != NULL) - store($4, "a", 0); + do_store($4, "a", 0); if ($4 != NULL) free($4); } @@ -392,7 +392,7 @@ cmd | DELE check_login_no_guest SP pathname CRLF { if ($2 && $4 != NULL) - delete($4); + do_delete($4); if ($4 != NULL) free($4); } @@ -589,7 +589,7 @@ cmd | STOU check_login SP pathname CRLF { if ($2 && $4 != NULL) - store($4, "w", 1); + do_store($4, "w", 1); if ($4 != NULL) free($4); } diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c index d50b6ef88..8b877dea3 100644 --- a/appl/ftp/ftpd/ftpd.c +++ b/appl/ftp/ftpd/ftpd.c @@ -966,7 +966,7 @@ filename_check(char *filename) } void -store(char *name, char *mode, int unique) +do_store(char *name, char *mode, int unique) { FILE *fout, *din; struct stat st; @@ -1515,7 +1515,7 @@ yyerror(char *s) } void -delete(char *name) +do_delete(char *name) { struct stat st;