mirror of
https://github.com/apache/nuttx-apps.git
synced 2025-10-20 21:41:18 +08:00
@@ -114,14 +114,16 @@ static int ftpc_gets(struct ftpc_session_s *session)
|
||||
case TELNET_WILL:
|
||||
case TELNET_WONT:
|
||||
ch = ftpc_sockgetc(&session->cmd);
|
||||
ftpc_sockprintf(&session->cmd, "%c%c%c", TELNET_IAC, TELNET_DONT, ch);
|
||||
ftpc_sockprintf(&session->cmd, "%c%c%c",
|
||||
TELNET_IAC, TELNET_DONT, ch);
|
||||
ftpc_sockflush(&session->cmd);
|
||||
break;
|
||||
|
||||
case TELNET_DO:
|
||||
case TELNET_DONT:
|
||||
ch = ftpc_sockgetc(&session->cmd);
|
||||
ftpc_sockprintf(&session->cmd, "%c%c%c", TELNET_IAC, TELNET_WONT, ch);
|
||||
ftpc_sockprintf(&session->cmd, "%c%c%c",
|
||||
TELNET_IAC, TELNET_WONT, ch);
|
||||
ftpc_sockflush(&session->cmd);
|
||||
break;
|
||||
|
||||
@@ -134,7 +136,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
|
||||
|
||||
/* Deal with carriage returns */
|
||||
|
||||
else if (ch == ISO_cr)
|
||||
else if (ch == ISO_CR)
|
||||
{
|
||||
/* What follows the carriage return? */
|
||||
|
||||
@@ -143,12 +145,12 @@ static int ftpc_gets(struct ftpc_session_s *session)
|
||||
{
|
||||
/* If it is followed by a NUL then keep it */
|
||||
|
||||
ch = ISO_cr;
|
||||
ch = ISO_CR;
|
||||
}
|
||||
|
||||
/* If it is followed by a newline then break out of the loop. */
|
||||
|
||||
else if (ch == ISO_nl)
|
||||
else if (ch == ISO_NL)
|
||||
{
|
||||
/* Newline terminates the reply */
|
||||
|
||||
@@ -168,7 +170,7 @@ static int ftpc_gets(struct ftpc_session_s *session)
|
||||
}
|
||||
}
|
||||
|
||||
else if (ch == ISO_nl)
|
||||
else if (ch == ISO_NL)
|
||||
{
|
||||
/* The ISO newline character terminates the string. Just break
|
||||
* out of the loop.
|
||||
|
@@ -59,10 +59,11 @@
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* MISC definitions *********************************************************/
|
||||
|
||||
#define ISO_nl 0x0a
|
||||
#define ISO_cr 0x0d
|
||||
#define ISO_NL 0x0a
|
||||
#define ISO_CR 0x0d
|
||||
|
||||
/* Telnet-related definitions */
|
||||
|
||||
@@ -223,8 +224,9 @@ extern "C"
|
||||
vfprintf((s)->outstream,f,ap)
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
/* Low-level string management */
|
||||
|
||||
EXTERN void ftpc_stripcrlf(FAR char *str);
|
||||
@@ -264,7 +266,8 @@ EXTERN void ftpc_sockcopy(FAR struct ftpc_socket_s *dest,
|
||||
|
||||
/* Socket I/O helpers */
|
||||
|
||||
EXTERN int ftpc_sockprintf(FAR struct ftpc_socket_s *sock, const char *fmt, ...);
|
||||
EXTERN int ftpc_sockprintf(FAR struct ftpc_socket_s *sock,
|
||||
const char *fmt, ...);
|
||||
EXTERN void ftpc_timeout(int argc, wdparm_t arg1, ...);
|
||||
|
||||
/* Transfer helpers */
|
||||
|
Reference in New Issue
Block a user