OSDN Git Service
(root)
/
ffftp
/
ffftp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Normalize half / full width characters
[ffftp/ffftp.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
0549f9c
..
db7b69f
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-772,7
+772,7
@@
int do_closesocket(SOCKET s)
UnRegistAsyncTable(s);
\r
// FTPS対応
\r
// Ret = closesocket(s);
\r
UnRegistAsyncTable(s);
\r
// FTPS対応
\r
// Ret = closesocket(s);
\r
- Ret =
closesocketS
(s);
\r
+ Ret =
FTPS_closesocket
(s);
\r
if(Ret == SOCKET_ERROR)
\r
{
\r
Error = 0;
\r
if(Ret == SOCKET_ERROR)
\r
{
\r
Error = 0;
\r
@@
-1029,7
+1029,7
@@
int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
\r
// FTPS対応
\r
// Ret = recv(s, buf, len, flags);
\r
\r
// FTPS対応
\r
// Ret = recv(s, buf, len, flags);
\r
- Ret =
recvS
(s, buf, len, flags);
\r
+ Ret =
FTPS_recv
(s, buf, len, flags);
\r
if(Ret != SOCKET_ERROR)
\r
break;
\r
Error = WSAGetLastError();
\r
if(Ret != SOCKET_ERROR)
\r
break;
\r
Error = WSAGetLastError();
\r
@@
-1139,7
+1139,7
@@
int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
\r
// FTPS対応
\r
// Ret = send(s, buf, len, flags);
\r
\r
// FTPS対応
\r
// Ret = send(s, buf, len, flags);
\r
- Ret =
sendS
(s, buf, len, flags);
\r
+ Ret =
FTPS_send
(s, buf, len, flags);
\r
if(Ret != SOCKET_ERROR)
\r
{
\r
#if DBG_MSG
\r
if(Ret != SOCKET_ERROR)
\r
{
\r
#if DBG_MSG
\r
@@
-1191,10
+1191,10
@@
void RemoveReceivedData(SOCKET s)
char buf[1024];
\r
int len;
\r
int Error;
\r
char buf[1024];
\r
int len;
\r
int Error;
\r
- while((len =
recvS
(s, buf, sizeof(buf), MSG_PEEK)) >= 0)
\r
+ while((len =
FTPS_recv
(s, buf, sizeof(buf), MSG_PEEK)) >= 0)
\r
{
\r
AskAsyncDone(s, &Error, FD_READ);
\r
{
\r
AskAsyncDone(s, &Error, FD_READ);
\r
-
recvS
(s, buf, len, 0);
\r
+
FTPS_recv
(s, buf, len, 0);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r