oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Renamed delete' and store' to do_delete' and do_store' to avoid

Browse Source 
conflict with DBM-functions.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1061 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-11-21 20:02:54 +00:00
parent 11053c32d4
commit e5a0fdfb0e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/ftp/ftpd/extern.h
View File

@@ -53,7 +53,7 @@
void blkfree(char **); void blkfree(char **);
char **copyblk(char **); char **copyblk(char **);
void cwd(char *); void cwd(char *);
void delete(char *); void do_delete(char *);
void dologout(int); void dologout(int);
void fatal(char *); void fatal(char *);
int ftpd_pclose(FILE *); int ftpd_pclose(FILE *);
@@ -76,7 +76,7 @@ void send_file_list(char *);
void setproctitle(const char *, ...); void setproctitle(const char *, ...);
void statcmd(void); void statcmd(void);
void statfilecmd(char *); void statfilecmd(char *);
void store(char *, char *, int); void do_store(char *, char *, int);
void upper(char *); void upper(char *);
void user(char *); void user(char *);
void yyerror(char *); void yyerror(char *);

8
appl/ftp/ftpd/ftpcmd.y
View File

@@ -325,14 +325,14 @@ cmd
| STOR check_login SP pathname CRLF | STOR check_login SP pathname CRLF
{ {
if ($2 && $4 != NULL) if ($2 && $4 != NULL)
store($4, "w", 0); do_store($4, "w", 0);
if ($4 != NULL) if ($4 != NULL)
free($4); free($4);
} }
| APPE check_login SP pathname CRLF | APPE check_login SP pathname CRLF
{ {
if ($2 && $4 != NULL) if ($2 && $4 != NULL)
store($4, "a", 0); do_store($4, "a", 0);
if ($4 != NULL) if ($4 != NULL)
free($4); free($4);
} }
@@ -392,7 +392,7 @@ cmd
| DELE check_login_no_guest SP pathname CRLF | DELE check_login_no_guest SP pathname CRLF
{ {
if ($2 && $4 != NULL) if ($2 && $4 != NULL)
delete($4); do_delete($4);
if ($4 != NULL) if ($4 != NULL)
free($4); free($4);
} }
@@ -589,7 +589,7 @@ cmd
| STOU check_login SP pathname CRLF | STOU check_login SP pathname CRLF
{ {
if ($2 && $4 != NULL) if ($2 && $4 != NULL)
store($4, "w", 1); do_store($4, "w", 1);
if ($4 != NULL) if ($4 != NULL)
free($4); free($4);
} }

4
appl/ftp/ftpd/ftpd.c
View File

@@ -966,7 +966,7 @@ filename_check(char *filename)
} }
void void
store(char *name, char *mode, int unique) do_store(char *name, char *mode, int unique)
{ {
FILE *fout, *din; FILE *fout, *din;
struct stat st; struct stat st;
@@ -1515,7 +1515,7 @@ yyerror(char *s)
} }
void void
delete(char *name) do_delete(char *name)
{ {
struct stat st; struct stat st;