* ftpd had a function getline() with non standards compatible parameters.
* This fixes the build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38881 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -46,7 +46,7 @@ void fatalerror(char *);
|
|||||||
void ftpd_logwtmp(char *, char *, struct sockaddr *addr);
|
void ftpd_logwtmp(char *, char *, struct sockaddr *addr);
|
||||||
int ftpd_pclose(FILE *);
|
int ftpd_pclose(FILE *);
|
||||||
FILE *ftpd_popen(char *, char *);
|
FILE *ftpd_popen(char *, char *);
|
||||||
char *getline(char *, int, FILE *);
|
char *ftpd_getline(char *, int, FILE *);
|
||||||
void lreply(int, const char *, ...) __printflike(2, 3);
|
void lreply(int, const char *, ...) __printflike(2, 3);
|
||||||
void makedir(char *);
|
void makedir(char *);
|
||||||
void nack(char *);
|
void nack(char *);
|
||||||
|
|||||||
@@ -1194,10 +1194,10 @@ lookup(struct tab *p, char *cmd)
|
|||||||
#include <arpa/telnet.h>
|
#include <arpa/telnet.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* getline - a hacked up version of fgets to ignore TELNET escape codes.
|
* ftpd_getline - a hacked up version of fgets to ignore TELNET escape codes.
|
||||||
*/
|
*/
|
||||||
char *
|
char *
|
||||||
getline(char *s, int n, FILE *iop)
|
ftpd_getline(char *s, int n, FILE *iop)
|
||||||
{
|
{
|
||||||
int c;
|
int c;
|
||||||
register char *cs;
|
register char *cs;
|
||||||
@@ -1305,7 +1305,7 @@ yylex(void)
|
|||||||
case CMD:
|
case CMD:
|
||||||
(void) signal(SIGALRM, toolong);
|
(void) signal(SIGALRM, toolong);
|
||||||
(void) alarm(timeout);
|
(void) alarm(timeout);
|
||||||
if (getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
|
if (ftpd_getline(cbuf, sizeof(cbuf)-1, stdin) == NULL) {
|
||||||
reply(221, "You could at least say goodbye.");
|
reply(221, "You could at least say goodbye.");
|
||||||
dologout(0);
|
dologout(0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2838,7 +2838,7 @@ myoob(void)
|
|||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
cp = tmpline;
|
cp = tmpline;
|
||||||
if (getline(cp, 7, stdin) == NULL) {
|
if (ftpd_getline(cp, 7, stdin) == NULL) {
|
||||||
reply(221, "You could at least say goodbye.");
|
reply(221, "You could at least say goodbye.");
|
||||||
dologout(0);
|
dologout(0);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user