OSDN Git Service

replace 'SUCCESS' and 'FAIL' macro to 'FFFTP_SUCCESS' and 'FFFTP_FAIL' to suppress... hiromichi-m
authorhylom <hylom@users.sourceforge.jp>
Fri, 16 Sep 2011 10:53:00 +0000 (19:53 +0900)
committerhylom <hylom@users.sourceforge.jp>
Fri, 16 Sep 2011 10:53:00 +0000 (19:53 +0900)
27 files changed:
.gitignore [new file with mode: 0644]
OLDregistory.c
bookmark.c
cache.c
clipboard.c
common.h
connect.c
filelist.c
ftpproc.c
getput.c
history.c
hostman.c
local.c
lvtips.c
main.c
misc.c
ras.c
registory.c
remote.c
sha.c
skey.c
socket.c
statuswin.c
taskwin.c
tool.c
toolmenu.c
wildcard.c

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..9cf77f3
--- /dev/null
@@ -0,0 +1,8 @@
+*~\r
+Release\r
+Debug\r
+FFFTP_Eng_Release\r
+FFFTP_Eng_Debug\r
+*.ncb\r
+*.suo\r
+*.user\r
index bc60605..382cc2c 100644 (file)
@@ -220,7 +220,7 @@ int ValidateMasterPassword(void)
        int i;\r
 \r
        SetRegType(REGTYPE_INI);\r
-       if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)\r
+       if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)\r
        {\r
                if(AskForceIni() == NO)\r
                {\r
@@ -228,14 +228,14 @@ int ValidateMasterPassword(void)
                        i = OpenReg("FFFTP", &hKey3);\r
                }\r
        }\r
-       if(i == SUCCESS){\r
+       if(i == FFFTP_SUCCESS){\r
                char checkbuf[48];\r
                int salt = 0;\r
 \r
                if( ReadIntValueFromReg(hKey3, "CredentialSalt", &salt)){\r
                        SetHashSalt( salt );\r
                }\r
-               if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == SUCCESS ){\r
+               if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == FFFTP_SUCCESS ){\r
                        switch( CheckPasswordValidity( SecretKey, SecretKeyLength, checkbuf ) ){\r
                        case 0: /* not match */\r
                                IsMasterPasswordError = PASSWORD_UNMATCH;\r
@@ -283,7 +283,7 @@ void SaveRegistory(void)
        }\r
 \r
        SetRegType(RegType);\r
-       if(CreateReg("FFFTP", &hKey3) == SUCCESS)\r
+       if(CreateReg("FFFTP", &hKey3) == FFFTP_SUCCESS)\r
        {\r
                char buf[48];\r
                int salt = GetTickCount();\r
@@ -296,7 +296,7 @@ void SaveRegistory(void)
                CreatePasswordHash( SecretKey, SecretKeyLength, buf );\r
                WriteStringToReg(hKey3, "CredentialCheck", buf);\r
 \r
-               if(CreateSubKey(hKey3, "Options", &hKey4) == SUCCESS)\r
+               if(CreateSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)\r
                {\r
                        WriteIntValueToReg(hKey4, "NoSave", SuppressSave);\r
 \r
@@ -412,10 +412,10 @@ void SaveRegistory(void)
                                n = 0;\r
                                for(i = AskHistoryNum(); i > 0; i--)\r
                                {\r
-                                       if(GetHistoryByNum(i-1, &Hist) == SUCCESS)\r
+                                       if(GetHistoryByNum(i-1, &Hist) == FFFTP_SUCCESS)\r
                                        {\r
                                                sprintf(Str, "History%d", n);\r
-                                               if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                                               if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                                {\r
                                                        SaveStr(hKey5, "HostAdrs", Hist.HostAdrs, DefaultHist.HostAdrs);\r
                                                        SaveStr(hKey5, "UserName", Hist.UserName, DefaultHist.UserName);\r
@@ -459,17 +459,17 @@ void SaveRegistory(void)
                                for(; n < 999; n++)\r
                                {\r
                                        sprintf(Str, "History%d", n);\r
-                                       if(DeleteSubKey(hKey4, Str) != SUCCESS)\r
+                                       if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
 \r
                                /* ホストの設定を保存 */\r
                                CopyDefaultHost(&DefaultHost);\r
                                i = 0;\r
-                               while(CopyHostFromList(i, &Host) == SUCCESS)\r
+                               while(CopyHostFromList(i, &Host) == FFFTP_SUCCESS)\r
                                {\r
                                        sprintf(Str, "Host%d", i);\r
-                                       if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                                       if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                        {\r
 //                                             SaveIntNum(hKey5, "Set", Host.Level, DefaultHost.Level);\r
                                                WriteIntValueToReg(hKey5, "Set", Host.Level);\r
@@ -526,7 +526,7 @@ void SaveRegistory(void)
                                for(; i < 998; i++)\r
                                {\r
                                        sprintf(Str, "Host%d", i);\r
-                                       if(DeleteSubKey(hKey4, Str) != SUCCESS)\r
+                                       if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
 \r
@@ -571,7 +571,7 @@ int LoadRegistory(void)
        Sts = NO;\r
 \r
        SetRegType(REGTYPE_INI);\r
-       if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)\r
+       if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)\r
        {\r
                if(AskForceIni() == NO)\r
                {\r
@@ -580,7 +580,7 @@ int LoadRegistory(void)
                }\r
        }\r
 \r
-       if(i == SUCCESS)\r
+       if(i == FFFTP_SUCCESS)\r
        {\r
                char checkbuf[48];\r
                int salt = 0;\r
@@ -588,7 +588,7 @@ int LoadRegistory(void)
 \r
                ReadIntValueFromReg(hKey3, "Version", &Version);\r
 \r
-               if(OpenSubKey(hKey3, "Options", &hKey4) == SUCCESS)\r
+               if(OpenSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)\r
                {\r
                        ReadIntValueFromReg(hKey4, "WinPosX", &WinPosX);\r
                        ReadIntValueFromReg(hKey4, "WinPosY", &WinPosY);\r
@@ -647,7 +647,7 @@ int LoadRegistory(void)
                        ReadIntValueFromReg(hKey4, "RegExp", &FindMode);\r
                        ReadIntValueFromReg(hKey4, "Reg", &RegType);\r
 \r
-                       if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FAIL)\r
+                       if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FFFTP_FAIL)\r
                        {\r
                                /* 旧ASCIIモードの拡張子の設定を新しいものに変換 */\r
                                ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);\r
@@ -679,9 +679,9 @@ int LoadRegistory(void)
                        ReadIntValueFromReg(hKey4, "MirUNot", &MirUpDelNotify);\r
                        ReadIntValueFromReg(hKey4, "MirDNot", &MirDownDelNotify);\r
 \r
-                       if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == SUCCESS)\r
+                       if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == FFFTP_SUCCESS)\r
                        {\r
-                               if(RestoreFontData(Str, &ListLogFont) == SUCCESS)\r
+                               if(RestoreFontData(Str, &ListLogFont) == FFFTP_SUCCESS)\r
                                        ListFont = CreateFontIndirect(&ListLogFont);\r
                        }\r
                        ReadIntValueFromReg(hKey4, "ListHide", &DispIgnoreHide);\r
@@ -730,7 +730,7 @@ int LoadRegistory(void)
                        for(i = 0; i < Sets; i++)\r
                        {\r
                                sprintf(Str, "History%d", i);\r
-                               if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                               if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                {\r
                                        CopyDefaultHistory(&Hist);\r
 \r
@@ -778,7 +778,7 @@ int LoadRegistory(void)
                        for(i = 0; i < Sets; i++)\r
                        {\r
                                sprintf(Str, "Host%d", i);\r
-                               if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                               if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                {\r
                                        CopyDefaultHost(&Host);\r
                                        /* 下位互換性のため */\r
@@ -893,17 +893,17 @@ DWORD LoadHideDriveListRegistory(void)
        DWORD Ret;\r
 \r
        Ret = 0;\r
-       if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hKey1) == ERROR_SUCCESS)\r
+       if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hKey1) == ERROR_FFFTP_SUCCESS)\r
        {\r
-               if(RegOpenKeyEx(hKey1, "Microsoft", 0, KEY_READ, &hKey2) == ERROR_SUCCESS)\r
+               if(RegOpenKeyEx(hKey1, "Microsoft", 0, KEY_READ, &hKey2) == ERROR_FFFTP_SUCCESS)\r
                {\r
-                       if(RegOpenKeyEx(hKey2, "Windows", 0, KEY_READ, &hKey3) == ERROR_SUCCESS)\r
+                       if(RegOpenKeyEx(hKey2, "Windows", 0, KEY_READ, &hKey3) == ERROR_FFFTP_SUCCESS)\r
                        {\r
-                               if(RegOpenKeyEx(hKey3, "CurrentVersion", 0, KEY_READ, &hKey4) == ERROR_SUCCESS)\r
+                               if(RegOpenKeyEx(hKey3, "CurrentVersion", 0, KEY_READ, &hKey4) == ERROR_FFFTP_SUCCESS)\r
                                {\r
-                                       if(RegOpenKeyEx(hKey4, "Policies", 0, KEY_READ, &hKey5) == ERROR_SUCCESS)\r
+                                       if(RegOpenKeyEx(hKey4, "Policies", 0, KEY_READ, &hKey5) == ERROR_FFFTP_SUCCESS)\r
                                        {\r
-                                               if(RegOpenKeyEx(hKey5, "Explorer", 0, KEY_READ, &hKey6) == ERROR_SUCCESS)\r
+                                               if(RegOpenKeyEx(hKey5, "Explorer", 0, KEY_READ, &hKey6) == ERROR_FFFTP_SUCCESS)\r
                                                {\r
                                                        Size = sizeof(DWORD);\r
                                                        RegQueryValueEx(hKey6, "NoDrives", NULL, &Type, (BYTE *)&Ret, &Size);\r
@@ -941,22 +941,22 @@ void ClearRegistory(void)
        char Str[20];\r
        int i;\r
 \r
-       if(RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Sota", 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey2, &Dispos) == ERROR_SUCCESS)\r
+       if(RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Sota", 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey2, &Dispos) == ERROR_FFFTP_SUCCESS)\r
        {\r
-               if(RegCreateKeyEx(hKey2, "FFFTP", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey3, &Dispos) == ERROR_SUCCESS)\r
+               if(RegCreateKeyEx(hKey2, "FFFTP", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey3, &Dispos) == ERROR_FFFTP_SUCCESS)\r
                {\r
-                       if(RegCreateKeyEx(hKey3, "Options", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey4, &Dispos) == ERROR_SUCCESS)\r
+                       if(RegCreateKeyEx(hKey3, "Options", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey4, &Dispos) == ERROR_FFFTP_SUCCESS)\r
                        {\r
                                for(i = 0; ; i++)\r
                                {\r
                                        sprintf(Str, "Host%d", i);\r
-                                       if(RegDeleteKey(hKey4, Str) != ERROR_SUCCESS)\r
+                                       if(RegDeleteKey(hKey4, Str) != ERROR_FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
                                for(i = 0; ; i++)\r
                                {\r
                                        sprintf(Str, "History%d", i);\r
-                                       if(RegDeleteKey(hKey4, Str) != ERROR_SUCCESS)\r
+                                       if(RegDeleteKey(hKey4, Str) != ERROR_FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
                                RegCloseKey(hKey4);\r
@@ -1141,7 +1141,7 @@ static void MakeFontData(LOGFONT Font, HFONT hFont, char *Buf)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL=変換できない\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL=変換できない\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int RestoreFontData(char *Str, LOGFONT *Font)\r
@@ -1149,7 +1149,7 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
        int i;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(sscanf(Str, "%d %d %d %d %d %d %d %d %d %d %d %d %d",\r
                        &(Font->lfHeight), &(Font->lfWidth), &(Font->lfEscapement), &(Font->lfOrientation),\r
                        &(Font->lfWeight), &(Font->lfItalic), &(Font->lfUnderline), &(Font->lfStrikeOut),\r
@@ -1165,11 +1165,11 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
                if(i == 0)\r
                {\r
                        strcpy(Font->lfFaceName, Str);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
 \r
-       if(Sts == FAIL)\r
+       if(Sts == FFFTP_FAIL)\r
                memset(Font, NUL, sizeof(LOGFONT));\r
 \r
        return(Sts);\r
@@ -1445,7 +1445,7 @@ static int TmpRegType;
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static void SetRegType(int Type)\r
@@ -1463,7 +1463,7 @@ static void SetRegType(int Type)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int OpenReg(char *Name, void **Handle)\r
@@ -1471,17 +1471,17 @@ static int OpenReg(char *Name, void **Handle)
        int Sts;\r
        char Tmp[FMAX_PATH+1];\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                strcpy(Tmp, "Software\\Sota\\");\r
                strcat(Tmp, Name);\r
-               if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == SUCCESS)\r
+               if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == FFFTP_SUCCESS)\r
                        ((REGDATATBL *)(*Handle))->Mode = 0;\r
        }\r
        return(Sts);\r
@@ -1496,7 +1496,7 @@ static int OpenReg(char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CreateReg(char *Name, void **Handle)\r
@@ -1505,13 +1505,13 @@ static int CreateReg(char *Name, void **Handle)
        char Tmp[FMAX_PATH+1];\r
        DWORD Dispos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                strcpy(Tmp, "Software\\Sota\\");\r
                strcat(Tmp, Name);\r
-               if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -1521,7 +1521,7 @@ static int CreateReg(char *Name, void **Handle)
                        ((REGDATATBL *)(*Handle))->ValLen = 0;\r
                        ((REGDATATBL *)(*Handle))->Next = NULL;\r
                        ((REGDATATBL *)(*Handle))->Mode = 1;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -1535,7 +1535,7 @@ static int CreateReg(char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CloseReg(void *Handle)\r
@@ -1574,7 +1574,7 @@ static int CloseReg(void *Handle)
                        Pos = Next;\r
                }\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -1627,7 +1627,7 @@ static BOOL WriteOutRegToFile(REGDATATBL *Pos)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadInReg(char *Name, REGDATATBL **Handle)\r
@@ -1640,7 +1640,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
        REGDATATBL *Pos;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        *Handle = NULL;\r
 \r
        if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)\r
@@ -1683,7 +1683,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
                                        }\r
                                }\r
                        }\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                        free(Buf);\r
                }\r
                fclose(Strm);\r
@@ -1701,7 +1701,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int OpenSubKey(void *Parent, char *Name, void **Handle)\r
@@ -1710,11 +1710,11 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
        char Key[80];\r
        REGDATATBL *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -1727,7 +1727,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
                        if(strcmp(Pos->KeyName, Key) == 0)\r
                        {\r
                                *Handle = Pos;\r
-                               Sts = SUCCESS;\r
+                               Sts = FFFTP_SUCCESS;\r
                                break;\r
                        }\r
                        Pos = Pos->Next;\r
@@ -1746,7 +1746,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CreateSubKey(void *Parent, char *Name, void **Handle)\r
@@ -1755,11 +1755,11 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
        DWORD Dispos;\r
        REGDATATBL *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -1776,7 +1776,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
                        while(Pos->Next != NULL)\r
                                Pos = Pos->Next;\r
                        Pos->Next = *Handle;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -1790,7 +1790,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CloseSubKey(void *Handle)\r
@@ -1801,7 +1801,7 @@ static int CloseSubKey(void *Handle)
        {\r
                /* Nothing */\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -1813,22 +1813,22 @@ static int CloseSubKey(void *Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DeleteSubKey(void *Handle, char *Name)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegDeleteKey(Handle, Name) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegDeleteKey(Handle, Name) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -1842,22 +1842,22 @@ static int DeleteSubKey(void *Handle, char *Name)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DeleteValue(void *Handle, char *Name)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegDeleteValue(Handle, Name) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegDeleteValue(Handle, Name) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -1872,7 +1872,7 @@ static int DeleteValue(void *Handle, char *Name)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)\r
@@ -1881,19 +1881,19 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
        DWORD Size;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                Size = sizeof(int);\r
-               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
                if((Pos = ScanValue(Handle, Name)) != NULL)\r
                {\r
                        *Value = atoi(Pos);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -1909,7 +1909,7 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteIntValueToReg(void *Handle, char *Name, int Value)\r
@@ -1930,7 +1930,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
                strcat(Data, Tmp);\r
                Pos->ValLen += strlen(Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -1944,7 +1944,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)\r
@@ -1952,14 +1952,14 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)\r
+               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_FFFTP_SUCCESS)\r
                {\r
                        if(*(Str + Size - 1) != NUL)\r
                                *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        else\r
@@ -1969,7 +1969,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
                        Size = min1(Size-1, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Str);\r
                        *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -1985,7 +1985,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteStringToReg(void *Handle, char *Name, char *Str)\r
@@ -2005,7 +2005,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Str, strlen(Str), Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2019,7 +2019,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)\r
@@ -2027,14 +2027,14 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)\r
+               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_FFFTP_SUCCESS)\r
                {\r
                        if(*(Str + Size - 1) != NUL)\r
                                *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        else\r
@@ -2044,7 +2044,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
                        Size = min1(Size-1, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Str);\r
                        *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2060,7 +2060,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)\r
@@ -2080,7 +2080,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Str, StrMultiLen(Str), Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2094,7 +2094,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)\r
@@ -2102,11 +2102,11 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
-               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+               if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_FFFTP_SUCCESS)\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -2114,7 +2114,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
                {\r
                        Size = min1(Size, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Bin);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2131,7 +2131,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)\r
@@ -2151,7 +2151,7 @@ static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Bin, Len, Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
index a0b04b7..866ea34 100644 (file)
@@ -125,7 +125,7 @@ void AddCurDirToBookMark(int Win)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int AddBookMark(char *Path)\r
@@ -134,11 +134,11 @@ static int AddBookMark(char *Path)
        int MarkID;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        hMenu = GetSubMenu(GetMenu(GetMainHwnd()), BMARK_SUB_MENU);\r
        MarkID = (GetMenuItemCount(hMenu) - DEFAULT_BMARK_ITEM) + MENU_BMARK_TOP;\r
        if(AppendMenu(hMenu, MF_STRING, MarkID, Path) == TRUE)\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        return(Sts);\r
 }\r
 \r
diff --git a/cache.c b/cache.c
index 45626cc..b26f1e4 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -74,7 +74,7 @@ static int ProgNum;                                           /* FFFTPの起動番号 */
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeCacheBuf(int Num)\r
@@ -82,16 +82,16 @@ int MakeCacheBuf(int Num)
        int Sts;\r
        int i;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(Num > 0)\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
                if((RemoteCache = malloc(sizeof(CACHELIST) * Num)) != NULL)\r
                {\r
                        TmpCacheEntry = Num;\r
                        for(i = 0; i < TmpCacheEntry; i++)\r
                                ClearCache(i);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
index f6d10f5..c12553b 100644 (file)
@@ -54,7 +54,7 @@ int CopyStrToClipBoard(char *Str)
        void *gBuf;\r
        HGLOBAL hGlobal;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(OpenClipboard(GetMainHwnd()))\r
        {\r
                if(EmptyClipboard())\r
@@ -67,7 +67,7 @@ int CopyStrToClipBoard(char *Str)
 \r
                                        GlobalUnlock(hGlobal);\r
                                        SetClipboardData(CF_TEXT, hGlobal);\r
-                                       Sts = SUCCESS;\r
+                                       Sts = FFFTP_SUCCESS;\r
                                }\r
                        }\r
                }\r
index b3ef8bd..3395d99 100644 (file)
--- a/common.h
+++ b/common.h
@@ -52,8 +52,9 @@
 #define ushort                 unsigned short\r
 #define ulong                  unsigned long\r
 \r
-#define FAIL                   0\r
-#define SUCCESS                        1\r
+#define FFFTP_FAIL                     0\r
+#define FFFTP_SUCCESS                  1\r
+#undef SUCCESS\r
 \r
 #define NO                             0\r
 #define YES                            1\r
index 7c7596e..117ac18 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -137,7 +137,7 @@ void ConnectProc(int Type, int Num)
                InitPWDcommand();\r
                CopyHostFromList(AskCurrentHost(), &CurHost);\r
 \r
-               if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == SUCCESS)\r
+               if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)\r
                {\r
                        SetHostKanaCnvImm(CurHost.KanaCnv);\r
                        SetHostKanjiCodeImm(CurHost.KanjiCode);\r
@@ -216,7 +216,7 @@ void QuickConnectProc(void)
 \r
                InitPWDcommand();\r
                CopyDefaultHost(&CurHost);\r
-               if(SplitUNCpath(Tmp, CurHost.HostAdrs, CurHost.RemoteInitDir, File, CurHost.UserName, CurHost.PassWord, &CurHost.Port) == SUCCESS)\r
+               if(SplitUNCpath(Tmp, CurHost.HostAdrs, CurHost.RemoteInitDir, File, CurHost.UserName, CurHost.PassWord, &CurHost.Port) == FFFTP_SUCCESS)\r
                {\r
                        if(strlen(CurHost.UserName) == 0)\r
                        {\r
@@ -304,7 +304,7 @@ static BOOL CALLBACK QuickConDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
                        SendDlgItemMessage(hDlg, QHOST_PASV, BM_SETCHECK, PasvDefault, 0);\r
                        for(i = 0; i < HISTORY_MAX; i++)\r
                        {\r
-                               if(GetHistoryByNum(i, &Tmp) == SUCCESS)\r
+                               if(GetHistoryByNum(i, &Tmp) == FFFTP_SUCCESS)\r
                                {\r
 //sprintf(Str, "%s (%s) %s", Tmp.HostAdrs, Tmp.UserName, Tmp.RemoteInitDir);\r
 //SendDlgItemMessage(hDlg, QHOST_HOST, CB_ADDSTRING, 0, (LPARAM)Str);\r
@@ -373,7 +373,7 @@ void DirectConnectProc(char *unc, int Kanji, int Kana, int Fkanji, int TrMode)
        SetTaskMsg("----------------------------");\r
 \r
        InitPWDcommand();\r
-       if(SplitUNCpath(unc, Host, Path, File, User, Pass, &Port) == SUCCESS)\r
+       if(SplitUNCpath(unc, Host, Path, File, User, Pass, &Port) == FFFTP_SUCCESS)\r
        {\r
                if(strlen(User) == 0)\r
                {\r
@@ -453,7 +453,7 @@ void HistoryConnectProc(int MenuCmd)
        int RFSort;\r
        int RDSort;\r
 \r
-       if(GetHistoryByCmd(MenuCmd, &Hist) == SUCCESS)\r
+       if(GetHistoryByCmd(MenuCmd, &Hist) == FFFTP_SUCCESS)\r
        {\r
                SaveBookMark();\r
                SaveCurrentSetToHost();\r
@@ -467,7 +467,7 @@ void HistoryConnectProc(int MenuCmd)
                InitPWDcommand();\r
                CopyHistoryToHost(&Hist, &CurHost);\r
 \r
-               if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == SUCCESS)\r
+               if(ConnectRas(CurHost.Dialup, CurHost.DialupAlways, CurHost.DialupNotify, CurHost.DialEntry) == FFFTP_SUCCESS)\r
                {\r
                        SetCurrentHost(HOSTNUM_NOENTRY);\r
                        SetHostKanaCnvImm(CurHost.KanaCnv);\r
@@ -574,7 +574,7 @@ static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List)
        *List = NO;\r
 \r
        i = 0;\r
-       while(CopyHostFromList(i, &Tmp) == SUCCESS)\r
+       while(CopyHostFromList(i, &Tmp) == FFFTP_SUCCESS)\r
        {\r
                if(strcmp(Host, Tmp.HostAdrs) == 0)\r
                {\r
@@ -905,7 +905,7 @@ static void SaveCurrentSetToHistory(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int ReConnectCmdSkt(void)\r
@@ -931,7 +931,7 @@ int ReConnectCmdSkt(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 //int ReConnectTrnSkt(void)\r
@@ -947,7 +947,7 @@ int ReConnectCmdSkt(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReConnectSkt(SOCKET *Skt)\r
@@ -955,7 +955,7 @@ static int ReConnectSkt(SOCKET *Skt)
        char Path[FMAX_PATH+1];\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
 \r
        SetTaskMsg(MSGJPN003);\r
 \r
@@ -968,7 +968,7 @@ static int ReConnectSkt(SOCKET *Skt)
        {\r
                AskRemoteCurDir(Path, FMAX_PATH);\r
                DoCWD(Path, YES, YES, YES);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
                SoundPlay(SND_ERROR);\r
@@ -1221,7 +1221,7 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
                                Flg = 1;\r
                                if(setsockopt(ContSock, SOL_SOCKET, SO_OOBINLINE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)\r
                                        ReportWSError("setsockopt", WSAGetLastError());\r
-#pragma aaa\r
+/* #pragma aaa */\r
                                Flg = 1;\r
                                if(setsockopt(ContSock, SOL_SOCKET, SO_KEEPALIVE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)\r
                                        ReportWSError("setsockopt", WSAGetLastError());\r
@@ -1402,7 +1402,7 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              ワンタイムパスワードでない時はPassをそのままReplyにコピー\r
@@ -1416,7 +1416,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
        char Seed[MAX_SEED_LEN+1];\r
        int i;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        Pos = NULL;\r
 \r
        if(Type == SECURITY_AUTO)\r
@@ -1445,7 +1445,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
                /* シーケンス番号を見つけるループ */\r
                DoPrintf("Analize OTP");\r
                DoPrintf("%s", Pos);\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
                while((Pos = GetNextField(Pos)) != NULL)\r
                {\r
                        if(IsDigit(*Pos))\r
@@ -1456,7 +1456,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
                                /* Seed */\r
                                if((Pos = GetNextField(Pos)) != NULL)\r
                                {\r
-                                       if(GetOneField(Pos, Seed, MAX_SEED_LEN) == SUCCESS)\r
+                                       if(GetOneField(Pos, Seed, MAX_SEED_LEN) == FFFTP_SUCCESS)\r
                                        {\r
                                                /* Seedは英数字のみ有効とする */\r
                                                for(i = strlen(Seed)-1; i >= 0; i--)\r
@@ -1474,7 +1474,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
                                                        if(Seq <= 10)\r
                                                                DialogBox(GetFtpInst(), MAKEINTRESOURCE(otp_notify_dlg), GetMainHwnd(), ExeEscDialogProc);\r
 \r
-                                                       Sts = SUCCESS;\r
+                                                       Sts = FFFTP_SUCCESS;\r
                                                }\r
                                        }\r
                                }\r
@@ -1482,7 +1482,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
                        }\r
                }\r
 \r
-               if(Sts == FAIL)\r
+               if(Sts == FFFTP_FAIL)\r
                        SetTaskMsg(MSGJPN015);\r
        }\r
        else\r
@@ -1636,8 +1636,8 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
                        if(Fwall == FWALL_SOCKS4)\r
                        {\r
                                Socks4Reply.Result = -1;\r
-                               if((SocksSendCmd(sSocket, &Socks4Cmd, Len, CancelCheckWork) != SUCCESS) ||\r
-                                  (Socks4GetCmdReply(sSocket, &Socks4Reply) != SUCCESS) || \r
+                               if((SocksSendCmd(sSocket, &Socks4Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+                                  (Socks4GetCmdReply(sSocket, &Socks4Reply) != FFFTP_SUCCESS) || \r
                                   (Socks4Reply.Result != SOCKS4_RES_OK))\r
                                {\r
                                        SetTaskMsg(MSGJPN023, Socks4Reply.Result);\r
@@ -1647,15 +1647,15 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
                        }\r
                        else if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))\r
                        {\r
-                               if(Socks5SelMethod(sSocket, CancelCheckWork) == FAIL)\r
+                               if(Socks5SelMethod(sSocket, CancelCheckWork) == FFFTP_FAIL)\r
                                {\r
                                        DoClose(sSocket);\r
                                        sSocket = INVALID_SOCKET;\r
                                }\r
 \r
                                Socks5Reply.Result = -1;\r
-                               if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != SUCCESS) ||\r
-                                  (Socks5GetCmdReply(sSocket, &Socks5Reply) != SUCCESS) || \r
+                               if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+                                  (Socks5GetCmdReply(sSocket, &Socks5Reply) != FFFTP_SUCCESS) || \r
                                   (Socks5Reply.Result != SOCKS5_RES_OK))\r
                                {\r
                                        SetTaskMsg(MSGJPN024, Socks5Reply.Result);\r
@@ -1727,8 +1727,8 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
                                Len = offsetof(SOCKS4CMD, UserID) + strlen(FwallUser) + 1;\r
 \r
                                Socks4Reply.Result = -1;\r
-                               if((SocksSendCmd(listen_skt, &Socks4Cmd, Len, CancelCheckWork) != SUCCESS) ||\r
-                                  (Socks4GetCmdReply(listen_skt, &Socks4Reply) != SUCCESS) || \r
+                               if((SocksSendCmd(listen_skt, &Socks4Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+                                  (Socks4GetCmdReply(listen_skt, &Socks4Reply) != FFFTP_SUCCESS) || \r
                                   (Socks4Reply.Result != SOCKS4_RES_OK))\r
                                {\r
                                        SetTaskMsg(MSGJPN028, Socks4Reply.Result);\r
@@ -1749,7 +1749,7 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
                        DoPrintf("Use SOCKS5 BIND");\r
                        if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)\r
                        {\r
-                               if(Socks5SelMethod(listen_skt, CancelCheckWork) == FAIL)\r
+                               if(Socks5SelMethod(listen_skt, CancelCheckWork) == FFFTP_FAIL)\r
                                {\r
                                        DoClose(listen_skt);\r
                                        listen_skt = INVALID_SOCKET;\r
@@ -1759,8 +1759,8 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
                                Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);\r
 \r
                                Socks5Reply.Result = -1;\r
-                               if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != SUCCESS) ||\r
-                                  (Socks5GetCmdReply(listen_skt, &Socks5Reply) != SUCCESS) || \r
+                               if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+                                  (Socks5GetCmdReply(listen_skt, &Socks5Reply) != FFFTP_SUCCESS) || \r
                                   (Socks5Reply.Result != SOCKS5_RES_OK))\r
                                {\r
                                        SetTaskMsg(MSGJPN029, Socks5Reply.Result);\r
@@ -1945,7 +1945,7 @@ static int Socks5MakeCmdPacket(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, ulo
 *              int Size : サイズ\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWork)\r
@@ -1954,7 +1954,7 @@ static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWor
 \r
        Ret = SendData(Socket, (char *)Data, Size, 0, CancelCheckWork);\r
 \r
-       if(Ret != SUCCESS)\r
+       if(Ret != FFFTP_SUCCESS)\r
                SetTaskMsg(MSGJPN033, *((short *)Data));\r
 \r
        return(Ret);\r
@@ -1968,7 +1968,7 @@ static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWor
 *              SOCKS5REPLY *Packet : パケット\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)\r
@@ -1980,7 +1980,7 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
        Pos = (uchar *)Packet;\r
        Pos += SOCKS5REPLY_SIZE;\r
 \r
-       if((Ret = ReadNchar(Socket, (char *)Packet, SOCKS5REPLY_SIZE, &CancelFlg)) == SUCCESS)\r
+       if((Ret = ReadNchar(Socket, (char *)Packet, SOCKS5REPLY_SIZE, &CancelFlg)) == FFFTP_SUCCESS)\r
        {\r
                if(Packet->Type == SOCKS5_ADRS_IPV4)\r
                        Len = 4 + 2;\r
@@ -1988,18 +1988,18 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
                        Len = 6 + 2;\r
                else\r
                {\r
-                       if((Ret = ReadNchar(Socket, (char *)Pos, 1, &CancelFlg)) == SUCCESS)\r
+                       if((Ret = ReadNchar(Socket, (char *)Pos, 1, &CancelFlg)) == FFFTP_SUCCESS)\r
                        {\r
                                Len = *Pos + 2;\r
                                Pos++;\r
                        }\r
                }\r
 \r
-               if(Ret == SUCCESS)\r
+               if(Ret == FFFTP_SUCCESS)\r
                        Ret = ReadNchar(Socket, (char *)Pos, Len, &CancelFlg);\r
        }\r
 \r
-       if(Ret != SUCCESS)\r
+       if(Ret != FFFTP_SUCCESS)\r
                SetTaskMsg(MSGJPN034);\r
 \r
        return(Ret);\r
@@ -2013,7 +2013,7 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet)
 *              SOCKS5REPLY *Packet : パケット\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)\r
@@ -2022,7 +2022,7 @@ static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)
 \r
        Ret = ReadNchar(Socket, (char *)Packet, SOCKS4REPLY_SIZE, &CancelFlg);\r
 \r
-       if(Ret != SUCCESS)\r
+       if(Ret != FFFTP_SUCCESS)\r
                DoPrintf(MSGJPN035);\r
 \r
        return(Ret);\r
@@ -2035,7 +2035,7 @@ static int Socks4GetCmdReply(SOCKET Socket, SOCKS4REPLY *Packet)
 *              SOCKET Socket : ソケット\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)\r
@@ -2048,7 +2048,7 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
        int Len;\r
        int Len2;\r
 \r
-       Ret = SUCCESS;\r
+       Ret = FFFTP_SUCCESS;\r
        Socks5Method.Ver = SOCKS5_VER;\r
        Socks5Method.Num = 1;\r
        if(FwallType == FWALL_SOCKS5_NOAUTH)\r
@@ -2056,12 +2056,12 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
        else\r
                Socks5Method.Methods[0] = SOCKS5_AUTH_USER;\r
 \r
-       if((SocksSendCmd(Socket, &Socks5Method, SOCKS5METHODREQUEST_SIZE, CancelCheckWork) != SUCCESS) ||\r
-          (ReadNchar(Socket, (char *)&Socks5MethodReply, SOCKS5METHODREPLY_SIZE, &CancelFlg) != SUCCESS) ||\r
+       if((SocksSendCmd(Socket, &Socks5Method, SOCKS5METHODREQUEST_SIZE, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+          (ReadNchar(Socket, (char *)&Socks5MethodReply, SOCKS5METHODREPLY_SIZE, &CancelFlg) != FFFTP_SUCCESS) ||\r
           (Socks5MethodReply.Method == (uchar)0xFF))\r
        {\r
                SetTaskMsg(MSGJPN036);\r
-               Ret = FAIL;\r
+               Ret = FFFTP_FAIL;\r
        }\r
        else if(Socks5MethodReply.Method == SOCKS5_AUTH_USER)\r
        {\r
@@ -2074,12 +2074,12 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
                Buf[2 + Len] = Len2;\r
                strcpy(Buf+3+Len, FwallPass);\r
 \r
-               if((SocksSendCmd(Socket, &Buf, Len+Len2+3, CancelCheckWork) != SUCCESS) ||\r
-                  (ReadNchar(Socket, (char *)&Socks5Status, SOCKS5USERPASSSTATUS_SIZE, &CancelFlg) != SUCCESS) ||\r
+               if((SocksSendCmd(Socket, &Buf, Len+Len2+3, CancelCheckWork) != FFFTP_SUCCESS) ||\r
+                  (ReadNchar(Socket, (char *)&Socks5Status, SOCKS5USERPASSSTATUS_SIZE, &CancelFlg) != FFFTP_SUCCESS) ||\r
                   (Socks5Status.Status != 0))\r
                {\r
                        SetTaskMsg(MSGJPN037);\r
-                       Ret = FAIL;\r
+                       Ret = FFFTP_FAIL;\r
                }\r
        }\r
        else\r
@@ -2096,7 +2096,7 @@ static int Socks5SelMethod(SOCKET Socket, int *CancelCheckWork)
 *              SOCKET *Data : データソケットを返すワーク\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data)\r
@@ -2104,19 +2104,19 @@ int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data)
        int Ret;\r
        char Buf[300];\r
 \r
-       Ret = FAIL;\r
+       Ret = FFFTP_FAIL;\r
        if((AskHostFireWall() == YES) && (FwallType == FWALL_SOCKS4))\r
        {\r
                Socks4GetCmdReply(Socket, (SOCKS4REPLY *)Buf);\r
                *Data = Socket;\r
-               Ret = SUCCESS;\r
+               Ret = FFFTP_SUCCESS;\r
        }\r
        else if((AskHostFireWall() == YES) &&\r
                        ((FwallType == FWALL_SOCKS5_NOAUTH) || (FwallType == FWALL_SOCKS5_USER)))\r
        {\r
                Socks5GetCmdReply(Socket, (SOCKS5REPLY *)Buf);\r
                *Data = Socket;\r
-               Ret = SUCCESS;\r
+               Ret = FFFTP_SUCCESS;\r
        }\r
        return(Ret);\r
 }\r
index 271a729..d8c26fe 100644 (file)
@@ -157,7 +157,7 @@ static char remoteFileDir[FMAX_PATH + 1];
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeListWin(HWND hWnd, HINSTANCE hInst)\r
@@ -275,11 +275,11 @@ int MakeListWin(HWND hWnd, HINSTANCE hInst)
                SendMessage(hWndListRemote, LVM_INSERTCOLUMN, 5, (LPARAM)&LvCol);\r
        }\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if((hWndListLocal == NULL) ||\r
           (hWndListRemote == NULL))\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -1198,7 +1198,7 @@ void GetRemoteDirForWnd(int Mode, int *CancelCheckWork)
                        {\r
                                ListType = LIST_UNKNOWN;\r
 \r
-                               while(GetListOneLine(Str, FMAX_PATH, fd) == SUCCESS)\r
+                               while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)\r
                                {\r
                                        if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)\r
                                        {\r
@@ -1705,7 +1705,7 @@ void SelectFileInList(HWND hWnd, int Type)
                                                LvItem.state = 0;\r
                                                if(GetNodeType(Win, i) != NODE_DRIVE)\r
                                                {\r
-                                                       if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||\r
+                                                       if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||\r
                                                           ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))\r
                                                        {\r
                                                                LvItem.state = LVIS_SELECTED;\r
@@ -1859,7 +1859,7 @@ void FindFileInList(HWND hWnd, int Type)
                                                _mbslwr(Name);\r
 \r
                                                LvItem.state = 0;\r
-                                               if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||\r
+                                               if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||\r
                                                   ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))\r
                                                {\r
                                                        LvItem.mask = LVIF_STATE;\r
@@ -1883,7 +1883,7 @@ void FindFileInList(HWND hWnd, int Type)
                                _mbslwr(Name);\r
 \r
                                LvItem.state = 0;\r
-                               if(((FindMode == 0) && (CheckFname(Name, RegExp) == SUCCESS)) ||\r
+                               if(((FindMode == 0) && (CheckFname(Name, RegExp) == FFFTP_SUCCESS)) ||\r
                                   ((FindMode != 0) && (JreGetStrMatchInfo(Name, 0) != NULL)))\r
                                {\r
                                        LvItem.mask = LVIF_STATE;\r
@@ -2775,11 +2775,11 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
 \r
                ListType = LIST_UNKNOWN;\r
 \r
-               while(GetListOneLine(Str, FMAX_PATH, fd) == SUCCESS)\r
+               while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)\r
                {\r
                        if((ListType = AnalizeFileInfo(Str)) == LIST_UNKNOWN)\r
                        {\r
-                               if(MakeDirPath(Str, ListType, Path, Dir) == SUCCESS)\r
+                               if(MakeDirPath(Str, ListType, Path, Dir) == FFFTP_SUCCESS)\r
                                {\r
                                        if(IncDir == RDIR_NLST)\r
                                        {\r
@@ -2830,7 +2830,7 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
 *              FILE *Fd : ストリーム\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *\r
 *      Note\r
 *              VAX VMS以外の時は fgets(Buf, Max, Fd) と同じ\r
@@ -2842,10 +2842,10 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
        char Tmp[FMAX_PATH+1];\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
-       while((Sts == FAIL) && (fgets(Buf, Max, Fd) != NULL))\r
+       Sts = FFFTP_FAIL;\r
+       while((Sts == FFFTP_FAIL) && (fgets(Buf, Max, Fd) != NULL))\r
        {\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
                RemoveReturnCode(Buf);\r
                ReplaceAll(Buf, '\x08', ' ');\r
 \r
@@ -2854,7 +2854,7 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
                if(AskHostType() == HTYPE_VMS)\r
                {\r
                        if(strchr(Buf, ';') == NULL)    /* ファイル名以外の行 */\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                        else\r
                        {\r
                                Max -= strlen(Buf);\r
@@ -2892,14 +2892,14 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL=ディレクトリ情報でない\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL=ディレクトリ情報でない\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        switch(ListType)\r
        {\r
                case LIST_ACOS :\r
@@ -2929,7 +2929,7 @@ static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir)
                                                ReplaceAll(Dir, '\\', '/');\r
                                        }\r
                                }\r
-                               Sts = SUCCESS;\r
+                               Sts = FFFTP_SUCCESS;\r
                        }\r
                        break;\r
        }\r
@@ -3177,13 +3177,13 @@ static int AnalizeFileInfo(char *Str)
                /* LIST_UNIX_10, LIST_UNIX_20, LIST_UNIX_12, LIST_UNIX_22, LIST_UNIX_50, LIST_UNIX_60 */\r
                /* MELCOM80 */\r
 \r
-               if(FindField(Str, Tmp, 0, NO) == SUCCESS)\r
+               if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)\r
                {\r
                        /* MELCOM80は "d rwxrwxrwx" のようにスペースが空いている */\r
                        Flag1 = NO;\r
                        if((strlen(Tmp) == 1) && (strchr("-dDlL", Tmp[0]) != NULL))\r
                        {\r
-                               if(FindField(Str, Tmp, 1, NO) == SUCCESS)\r
+                               if(FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS)\r
                                {\r
                                        if((strlen(Tmp) == 9) ||\r
                                           ((strlen(Tmp) > 9) && (IsDigit(Tmp[9]) != 0)))\r
@@ -3207,7 +3207,7 @@ static int AnalizeFileInfo(char *Str)
 \r
 ////////////\r
 // LIST_UNIX_60 support\r
-                               if(FindField(Str, Tmp, 7+Add1, NO) == SUCCESS)\r
+                               if(FindField(Str, Tmp, 7+Add1, NO) == FFFTP_SUCCESS)\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3220,7 +3220,7 @@ static int AnalizeFileInfo(char *Str)
 ////////////\r
 // LIST_UNIX_12 support\r
                                if((Ret == LIST_UNKNOWN) &&\r
-                                  (FindField(Str, Tmp, 6+Add1, NO) == SUCCESS))\r
+                                  (FindField(Str, Tmp, 6+Add1, NO) == FFFTP_SUCCESS))\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3233,7 +3233,7 @@ static int AnalizeFileInfo(char *Str)
 ////////////\r
 // LIST_UNIX_70 support\r
                                if((Ret == LIST_UNKNOWN) &&\r
-                                  (FindField(Str, Tmp, 6+Add1, NO) == SUCCESS))\r
+                                  (FindField(Str, Tmp, 6+Add1, NO) == FFFTP_SUCCESS))\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3244,7 +3244,7 @@ static int AnalizeFileInfo(char *Str)
 ///////////\r
 \r
                                if((Ret == LIST_UNKNOWN) &&\r
-                                  (FindField(Str, Tmp, 5+Add1, NO) == SUCCESS))\r
+                                  (FindField(Str, Tmp, 5+Add1, NO) == FFFTP_SUCCESS))\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3254,7 +3254,7 @@ static int AnalizeFileInfo(char *Str)
                                }\r
 \r
                                if((Ret == LIST_UNKNOWN) &&\r
-                                  (FindField(Str, Tmp, 4+Add1, NO) == SUCCESS))\r
+                                  (FindField(Str, Tmp, 4+Add1, NO) == FFFTP_SUCCESS))\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3264,7 +3264,7 @@ static int AnalizeFileInfo(char *Str)
                                }\r
 \r
                                if((Ret == LIST_UNKNOWN) &&\r
-                                  (FindField(Str, Tmp, 3+Add1, NO) == SUCCESS))\r
+                                  (FindField(Str, Tmp, 3+Add1, NO) == FFFTP_SUCCESS))\r
                                {\r
                                        GetMonth(Tmp, &Month, &Day);\r
                                        if(Month != 0)\r
@@ -3283,16 +3283,16 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                        {\r
-                               if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&\r
                                   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                                           (IsDigit(Tmp[0]) != 0))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 5, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_AS400;\r
                                                }\r
@@ -3306,19 +3306,19 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYMMDDformat(Tmp, '*', NO) != 0))\r
                        {\r
-                               if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                   ((IsDigit(Tmp[0]) != 0) || (StrAllSameChar(Tmp, '*') == YES)))\r
                                {\r
-                                       if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&\r
                                           ((IsDigit(Tmp[0]) != 0) || (StrAllSameChar(Tmp, '*') == YES)))\r
                                        {\r
-                                               if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                                               if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                                                   (strlen(Tmp) == 4))\r
                                                {\r
-                                                       if(FindField(Str, Tmp, 6, NO) == SUCCESS)\r
+                                                       if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)\r
                                                        {\r
                                                                Ret = LIST_M1800;\r
                                                        }\r
@@ -3333,16 +3333,16 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                        {\r
-                               if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&\r
                                           (IsDigit(Tmp[0]) != 0))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 6, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_GP6000;\r
                                                }\r
@@ -3356,15 +3356,15 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                           (CheckHHMMformat(Tmp) == YES))\r
                        {\r
-                               if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
                                {\r
-                                       if(FindField(Str, Tmp, 3, NO) == SUCCESS)\r
+                                       if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)\r
                                        {\r
-                                               if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                                               if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                                                   (CheckYYMMDDformat(Tmp, NUL, YES) != 0))\r
                                                {\r
                                                        TmpInt = atoi(Tmp);\r
@@ -3383,13 +3383,13 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&\r
                           (CheckHHMMformat(Tmp) == YES))\r
                        {\r
-                               if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                                   ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
                                {\r
-                                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                           (CheckYYMMDDformat(Tmp, NUL, YES) != 0))\r
                                        {\r
                                                Ret = LIST_DOS_3;\r
@@ -3403,16 +3403,16 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYYYMMDDformat(Tmp, NUL) == YES))\r
                        {\r
-                               if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                                   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                           ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 3, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_DOS_4;\r
                                                }\r
@@ -3426,15 +3426,15 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if(FindField(Str, Tmp, 2, NO) == SUCCESS)\r
+                       if(FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS)\r
                        {\r
                                GetMonth(Tmp, &Month, &Day);\r
                                if((Month != 0) && (Day == 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                                           ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
                                        {\r
-                                               if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&\r
+                                               if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&\r
                                                   (CheckHHMMformat(Tmp) == YES))\r
                                                {\r
                                                        Ret = LIST_CHAMELEON;\r
@@ -3449,16 +3449,16 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&\r
                           (CheckHHMMformat(Tmp) == YES))\r
                        {\r
-                               if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                                   (IsDigit(Tmp[0]) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                           (CheckYYMMDDformat(Tmp, NUL, YES) != 0))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 4, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 4, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_OS2;\r
                                                }\r
@@ -3472,32 +3472,32 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                           (strlen(Tmp) == 10))\r
                        {\r
-                               if((FindField(Str, Tmp, 3, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS) &&\r
                                   (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 4, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 4, NO) == FFFTP_SUCCESS) &&\r
                                           (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                        {\r
-                                               if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                                               if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                                   (IsDigit(Tmp[0]) != 0))\r
                                                {\r
-                                                       if(FindField(Str, Tmp, 5, NO) == SUCCESS)\r
+                                                       if(FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS)\r
                                                        {\r
                                                                Ret = LIST_OS7_2;\r
                                                        }\r
                                                }\r
                                        }\r
                                }\r
-                               else if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                               else if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                                                (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                {\r
-                                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                           (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 3, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_OS7_1;\r
                                                }\r
@@ -3511,18 +3511,18 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 0, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS) &&\r
                           ((Tmp[0] == '<') || (IsDigit(Tmp[0]) != 0)))\r
                        {\r
-                               if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&\r
                                   (CheckHHMMformat(Tmp) == YES))\r
                                {\r
-                                       if(FindField(Str, Tmp, 3, NO) == SUCCESS)\r
+                                       if(FindField(Str, Tmp, 3, NO) == FFFTP_SUCCESS)\r
                                        {\r
                                                GetMonth(Tmp, &Month, &Day);\r
                                                if(Month != 0)\r
                                                {\r
-                                                       if((FindField(Str, Tmp, 6, NO) == SUCCESS) &&\r
+                                                       if((FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS) &&\r
                                                           (IsDigit(Tmp[0]) != 0))\r
                                                        {\r
                                                                Ret = LIST_ALLIED;\r
@@ -3538,16 +3538,16 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 1, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYMMDDformat(Tmp, NUL, NO) != 0))\r
                        {\r
-                               if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                                   (IsDigit(Tmp[0]) != 0) && (strlen(Tmp) == 4))\r
                                {\r
-                                       if((FindField(Str, Tmp, 5, NO) == SUCCESS) &&\r
+                                       if((FindField(Str, Tmp, 5, NO) == FFFTP_SUCCESS) &&\r
                                           (IsDigit(Tmp[0]) != 0))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 6, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 6, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_OS9;\r
                                                }\r
@@ -3561,14 +3561,14 @@ static int AnalizeFileInfo(char *Str)
 \r
                if(Ret == LIST_UNKNOWN)\r
                {\r
-                       if((FindField(Str, Tmp, 2, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 2, NO) == FFFTP_SUCCESS) &&\r
                           (CheckYYYYMMDDformat(Tmp, NUL) == YES))\r
                        {\r
-                               if((FindField(Str, Tmp, 1, NO) == SUCCESS) && IsDigit(Tmp[0]))\r
+                               if((FindField(Str, Tmp, 1, NO) == FFFTP_SUCCESS) && IsDigit(Tmp[0]))\r
                                {\r
-                                       if((FindField(Str, Tmp, 7, NO) == SUCCESS) && IsDigit(Tmp[0]))\r
+                                       if((FindField(Str, Tmp, 7, NO) == FFFTP_SUCCESS) && IsDigit(Tmp[0]))\r
                                        {\r
-                                               if(FindField(Str, Tmp, 9, NO) == SUCCESS)\r
+                                               if(FindField(Str, Tmp, 9, NO) == FFFTP_SUCCESS)\r
                                                {\r
                                                        Ret = LIST_IBM;\r
                                                }\r
@@ -3617,13 +3617,13 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
 \r
        // unix系チェック\r
        if((Day != 0) ||\r
-          ((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == SUCCESS) &&\r
+          ((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&\r
                ((atoi(Tmp) >= 1) && (atoi(Tmp) <= 31))))\r
        {\r
-               if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == SUCCESS) &&\r
-                  ((atoi(Tmp) >= 1900) || (GetHourAndMinute(Tmp, &Hour, &Minute) == SUCCESS)))\r
+               if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&\r
+                  ((atoi(Tmp) >= 1900) || (GetHourAndMinute(Tmp, &Hour, &Minute) == FFFTP_SUCCESS)))\r
                {\r
-                       if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == SUCCESS)\r
+                       if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == FFFTP_SUCCESS)\r
                        {\r
                                Flag = 1;\r
                        }\r
@@ -3633,13 +3633,13 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
        // 中国語Solaris専用\r
        if(Flag == 0)\r
        {\r
-          if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == SUCCESS) &&\r
+          if((FindField(Str, Tmp, 7+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&\r
                  ((atoi(Tmp) >= 1) && (atoi(Tmp) <= 31)))\r
                {\r
-                       if((FindField(Str, Tmp, 5+Add1+Add2+Add3, NO) == SUCCESS) &&\r
+                       if((FindField(Str, Tmp, 5+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&\r
                           (atoi(Tmp) >= 1900))\r
                        {\r
-                               if((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Tmp, 6+Add1+Add2+Add3, NO) == FFFTP_SUCCESS) &&\r
                                   (((atoi(Tmp) >= 1) && (atoi(Tmp) <= 9) && \r
                                         ((unsigned char)Tmp[1] == 0xD4) &&\r
                                         ((unsigned char)Tmp[2] == 0xC2)) ||\r
@@ -3647,7 +3647,7 @@ static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day)
                                         ((unsigned char)Tmp[2] == 0xD4) && \r
                                         ((unsigned char)Tmp[3] == 0xC2))))\r
                                {\r
-                                       if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == SUCCESS)\r
+                                       if(FindField(Str, Tmp, 8+Add1+Add2+Add3, NO) == FFFTP_SUCCESS)\r
                                        {\r
                                                Flag = 2;\r
                                        }\r
@@ -3967,7 +3967,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, DosPos[offs][3], DosLongFname[offs]) == SUCCESS)\r
+                       if(FindField(Str, Fname, DosPos[offs][3], DosLongFname[offs]) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(Buf[0] == '<')\r
@@ -3999,7 +3999,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 3, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 3, YES) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(Buf[0] == '<')\r
@@ -4034,7 +4034,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 4, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 4, YES) == FFFTP_SUCCESS)\r
                        {\r
                                FindField(Str, Buf, 1, NO);\r
                                Ret = NODE_FILE;\r
@@ -4073,7 +4073,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 0, NO) == SUCCESS)\r
+                       if(FindField(Str, Fname, 0, NO) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(Buf[0] == '<')\r
@@ -4108,7 +4108,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 5, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 5, YES) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if((Pos = strchr(Fname, '/')) != NULL)\r
@@ -4147,7 +4147,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        }\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 6, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 6, YES) == FFFTP_SUCCESS)\r
                        {\r
                                RemoveTailingSpaces(Fname);\r
                                Ret = NODE_FILE;\r
@@ -4190,7 +4190,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Attr = AttrString2Value(Buf+1);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 6, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 6, YES) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(strchr("dl", Buf[0]) != NULL)\r
@@ -4274,7 +4274,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Attr = AttrString2Value(Buf+1);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 3+offs, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 3+offs, YES) == FFFTP_SUCCESS)\r
                        {\r
                                RemoveTailingSpaces(Fname);\r
                                Ret = NODE_FILE;\r
@@ -4284,7 +4284,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        break;\r
 \r
                case LIST_STRATUS :\r
-                       if(FindField(Str, Buf, 0, NO) != SUCCESS)\r
+                       if(FindField(Str, Buf, 0, NO) != FFFTP_SUCCESS)\r
                                break;\r
                        if(_strnicmp(Buf, "Files:", 6) == 0)\r
                                StratusMode = 0;\r
@@ -4304,14 +4304,14 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                                *InfoExist |= (FINFO_TIME | FINFO_DATE);\r
 \r
                                /* 日付 */\r
-                               if(FindField(Str, Buf, 2+offs, NO) != SUCCESS)\r
+                               if(FindField(Str, Buf, 2+offs, NO) != FFFTP_SUCCESS)\r
                                        break;\r
                                sTime.wYear = Assume1900or2000(atoi(Buf));\r
                                sTime.wMonth = atoi(Buf + 3);\r
                                sTime.wDay = atoi(Buf + 6);\r
 \r
                                /* 時刻 */\r
-                               if(FindField(Str, Buf, 3+offs, NO) != SUCCESS)\r
+                               if(FindField(Str, Buf, 3+offs, NO) != FFFTP_SUCCESS)\r
                                        break;\r
                                sTime.wHour = atoi(Buf);\r
                                sTime.wMinute = atoi(Buf+3);\r
@@ -4321,7 +4321,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                                SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
 \r
                                /* 名前 */\r
-                               if(FindField(Str, Fname, 4+offs, YES) != SUCCESS)\r
+                               if(FindField(Str, Fname, 4+offs, YES) != FFFTP_SUCCESS)\r
                                        break;\r
 \r
                                if(StratusMode == 0)\r
@@ -4329,12 +4329,12 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                                        *InfoExist |= FINFO_SIZE;\r
 \r
                                        /* サイズ */\r
-                                       if(FindField(Str, Buf, 1, NO) != SUCCESS)\r
+                                       if(FindField(Str, Buf, 1, NO) != FFFTP_SUCCESS)\r
                                                break;\r
                                        *Size = _atoi64(Buf) * 4096;\r
 \r
                                        /* 種類(オーナ名のフィールドにいれる) */\r
-                                       if(FindField(Str, Buf, 2, NO) != SUCCESS)\r
+                                       if(FindField(Str, Buf, 2, NO) != FFFTP_SUCCESS)\r
                                                break;\r
                                        strncpy(Owner, Buf, OWNER_NAME_LEN);\r
 \r
@@ -4351,18 +4351,18 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        /* 日付 */\r
                        for(offs = 11; offs > 7; offs--)\r
                        {\r
-                               if((err = FindField(Str, Buf, offs, NO)) == SUCCESS)\r
+                               if((err = FindField(Str, Buf, offs, NO)) == FFFTP_SUCCESS)\r
                                        break;\r
                        }\r
-                       if(err != SUCCESS)\r
+                       if(err != FFFTP_SUCCESS)\r
                                break;\r
                        if(IsDigit(*Buf) == 0)\r
                                break;\r
                        sTime.wYear = Assume1900or2000(atoi(Buf));\r
-                       if(FindField(Str, Buf, --offs, NO) != SUCCESS)\r
+                       if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)\r
                                break;\r
                        GetMonth(Buf, &sTime.wMonth, &sTime.wDay);\r
-                       if(FindField(Str, Buf, --offs, NO) != SUCCESS)\r
+                       if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)\r
                                break;\r
                        if(IsDigit(*Buf) == 0)\r
                                break;\r
@@ -4375,35 +4375,35 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
 \r
                        /* オーナ名 */\r
-                       if(FindField(Str, Buf, --offs, NO) != SUCCESS)\r
+                       if(FindField(Str, Buf, --offs, NO) != FFFTP_SUCCESS)\r
                                break;\r
                        strncpy(Owner, Buf, OWNER_NAME_LEN);\r
 \r
                        /* サイズ */\r
                        do\r
                        {\r
-                               if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)\r
+                               if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)\r
                                        break;\r
                        }\r
                        while(IsDigit(*Buf) == 0);\r
                        --offs;\r
-                       if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)\r
+                       if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)\r
                                break;\r
                        RemoveComma(Buf);\r
                        *Size = _atoi64(Buf);\r
-                       if((err = FindField(Str, Buf, --offs, NO)) != SUCCESS)\r
+                       if((err = FindField(Str, Buf, --offs, NO)) != FFFTP_SUCCESS)\r
                                break;\r
                        if(IsDigit(*Buf) == 0)\r
                                break;\r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 0, NO) != SUCCESS)\r
+                       if(FindField(Str, Fname, 0, NO) != FFFTP_SUCCESS)\r
                                break;\r
                        /* 種類 */\r
                        if(offs == 0)\r
                                Ret = NODE_FILE;\r
                        else\r
                        {\r
-                               if((FindField(Str, Buf, 1, NO) == SUCCESS) &&\r
+                               if((FindField(Str, Buf, 1, NO) == FFFTP_SUCCESS) &&\r
                                   (strcmp(Buf, "DR") == 0))\r
                                        Ret = NODE_DIR;\r
                                else\r
@@ -4436,7 +4436,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Size = _atoi64(Buf);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 1, NO) == SUCCESS)\r
+                       if(FindField(Str, Fname, 1, NO) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(Buf[0] == '<')\r
@@ -4476,7 +4476,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        FindField(Str, Buf, 3, NO);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 6, NO) == SUCCESS)\r
+                       if(FindField(Str, Fname, 6, NO) == FFFTP_SUCCESS)\r
                        {\r
                                if((Buf[0] == 'd') || (Buf[0] == 'D'))\r
                                        Ret = NODE_DIR;\r
@@ -4503,7 +4503,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 \r
                        /* 名前 */\r
                        FindField(Str, Buf, 8, NO);\r
-                       if(FindField(Str, Fname, 9, NO) == SUCCESS)\r
+                       if(FindField(Str, Fname, 9, NO) == FFFTP_SUCCESS)\r
                        {\r
                                if(strcmp(Buf, "PO") == 0)\r
                                        Ret = NODE_DIR;\r
@@ -4528,7 +4528,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        *Attr = AttrString2Value(Buf+1);\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 5, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 5, YES) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = NODE_FILE;\r
                                if(strchr("dl", Buf[0]) != NULL)\r
@@ -4566,7 +4566,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 \r
                                /* 種類 */\r
                                Ret = NODE_FILE;\r
-                               if(FindField(Str, Buf, 4, NO) == SUCCESS)\r
+                               if(FindField(Str, Buf, 4, NO) == FFFTP_SUCCESS)\r
                                {\r
                                        if(strcmp(Buf, "<DIR>") == 0)\r
                                                Ret = NODE_DIR;\r
@@ -4715,12 +4715,12 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 \r
                                FindField(Str, Buf, 5+offs, NO);\r
                                /* 日付が yy/mm/dd の場合に対応 */\r
-                               if(GetYearMonthDay(Buf, &sTime.wYear, &sTime.wMonth, &sTime.wDay) == SUCCESS)\r
+                               if(GetYearMonthDay(Buf, &sTime.wYear, &sTime.wMonth, &sTime.wDay) == FFFTP_SUCCESS)\r
                                {\r
                                        sTime.wYear = Assume1900or2000(sTime.wYear);\r
 \r
                                        FindField(Str, Buf, 7+offs+offs2, NO);\r
-                                       if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == SUCCESS)\r
+                                       if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FFFTP_SUCCESS)\r
                                                *InfoExist |= FINFO_TIME;\r
                                }\r
                                else\r
@@ -4733,7 +4733,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                                        }\r
 \r
                                        FindField(Str, Buf, 7+offs+offs2, NO);\r
-                                       if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FAIL)\r
+                                       if(GetHourAndMinute(Buf, &sTime.wHour, &sTime.wMinute) == FFFTP_FAIL)\r
                                        {\r
                                                sTime.wYear = atoi(Buf);\r
                                        }\r
@@ -4780,7 +4780,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
                        SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());\r
 \r
                        /* 名前 */\r
-                       if(FindField(Str, Fname, 8+offs+offs2, YES) == SUCCESS)\r
+                       if(FindField(Str, Fname, 8+offs+offs2, YES) == FFFTP_SUCCESS)\r
                        {\r
                                Flag = 'B';\r
                                if(OrgListType & LIST_MELCOM)\r
@@ -4836,7 +4836,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int FindField(char *Str, char *Buf, int Num, int ToLast)\r
@@ -4844,7 +4844,7 @@ static int FindField(char *Str, char *Buf, int Num, int ToLast)
        char *Pos;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        *Buf = NUL;\r
        if(Num >= 0)\r
        {\r
@@ -4879,7 +4879,7 @@ static int FindField(char *Str, char *Buf, int Num, int ToLast)
                        strncpy(Buf, Str, Pos - Str);\r
                        *(Buf + (Pos - Str)) = NUL;\r
                }\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -4977,18 +4977,18 @@ static void GetMonth(char *Str, WORD *Month, WORD *Day)
 *              WORD *Day : 日\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL=日付を表す文字ではない)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=日付を表す文字ではない)\r
 *\r
 *      Note\r
 *              以下の形式をサポート\r
 *                      01/07/25\r
-*              FAILを返す時は *Year = 0; *Month = 0; *Day = 0\r
+*              FFFTP_FAILを返す時は *Year = 0; *Month = 0; *Day = 0\r
 *----------------------------------------------------------------------------*/\r
 static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(strlen(Str) == 8)\r
        {\r
                if(IsDigit(Str[0]) && IsDigit(Str[1]) && !IsDigit(Str[2]) &&\r
@@ -4998,7 +4998,7 @@ static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)
                        *Year = atoi(&Str[0]);\r
                        *Month = atoi(&Str[3]);\r
                        *Day = atoi(&Str[6]);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -5013,13 +5013,13 @@ static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day)
 *              WORD *Minute : 分\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL=時刻を表す文字ではない)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=時刻を表す文字ではない)\r
 *\r
 *      Note\r
 *              以下の形式をサポート\r
 *                      HH:MM\r
 *                      HH時MM分\r
-*              FAILを返す時は *Hour = 0; *Minute = 0\r
+*              FFFTP_FAILを返す時は *Hour = 0; *Minute = 0\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)\r
@@ -5027,7 +5027,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
        int Ret;\r
        char *Pos;\r
 \r
-       Ret = FAIL;\r
+       Ret = FFFTP_FAIL;\r
        if((_mbslen(Str) >= 3) && (isdigit(Str[0]) != 0))\r
        {\r
                *Hour = atoi(Str);\r
@@ -5040,7 +5040,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
                                {\r
                                        *Minute = atoi(Pos);\r
                                        if(*Minute < 60)\r
-                                               Ret = SUCCESS;\r
+                                               Ret = FFFTP_SUCCESS;\r
                                }\r
                        }\r
                        else\r
@@ -5061,7 +5061,7 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
                                                        {\r
                                                                *Minute = atoi(Pos);\r
                                                                if(*Minute < 60)\r
-                                                                       Ret = SUCCESS;\r
+                                                                       Ret = FFFTP_SUCCESS;\r
                                                        }\r
                                                }\r
                                                break;\r
@@ -5075,10 +5075,10 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
        {\r
                *Hour = 0;\r
                *Minute = 0;\r
-               Ret = SUCCESS;\r
+               Ret = FFFTP_SUCCESS;\r
        }\r
 \r
-       if(Ret == FAIL)\r
+       if(Ret == FFFTP_FAIL)\r
        {\r
                *Hour = 0;\r
                *Minute = 0;\r
@@ -5096,12 +5096,12 @@ static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute)
 *              WORD *Day : 日\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL=日付を表す文字ではない)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL=日付を表す文字ではない)\r
 *\r
 *      Note\r
 *              以下の形式をサポート\r
 *                      18-SEP-1998\r
-*              FAILを返す時は *Year = 0; *Month = 0; *Day = 0\r
+*              FFFTP_FAILを返す時は *Year = 0; *Month = 0; *Day = 0\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)\r
@@ -5111,7 +5111,7 @@ static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)
        WORD Tmp;\r
        char Buf[4];\r
 \r
-       Ret = FAIL;\r
+       Ret = FFFTP_FAIL;\r
        *Day = atoi(Str);\r
        if((Pos = strchr(Str, '-')) != NULL)\r
        {\r
@@ -5123,11 +5123,11 @@ static int GetVMSdate(char *Str, WORD *Year, WORD *Month, WORD *Day)
                {\r
                        Pos++;\r
                        *Year = atoi(Pos);\r
-                       Ret = SUCCESS;\r
+                       Ret = FFFTP_SUCCESS;\r
                }\r
        }\r
 \r
-       if(Ret == FAIL)\r
+       if(Ret == FFFTP_FAIL)\r
        {\r
                *Year = 0;\r
                *Month = 0;\r
@@ -5216,7 +5216,7 @@ static int AskFilterStr(char *Fname, int Type)
                        if((Pos = strchr(Tmp, ';')) != NULL)\r
                                *Pos = NUL;\r
 \r
-                       if(CheckFname(Fname, Tmp) == SUCCESS)\r
+                       if(CheckFname(Fname, Tmp) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = YES;\r
                                break;\r
index f0088ec..f984ebf 100644 (file)
--- a/ftpproc.c
+++ b/ftpproc.c
@@ -118,7 +118,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
        FILELIST *Pos;\r
        TRANSPACKET Pkt;\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -148,7 +148,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
                                else if(FnameCnv == FNAME_UPPER)\r
                                        _mbsupr(TmpString);\r
                                RemoveAfterSemicolon(TmpString);\r
-                               if(RenameUnuseableName(TmpString) == FAIL)\r
+                               if(RenameUnuseableName(TmpString) == FFFTP_FAIL)\r
                                        break;\r
                        }\r
                        else\r
@@ -156,7 +156,7 @@ void DownLoadProc(int ChName, int ForceFile, int All)
                                CurWin = WIN_REMOTE;\r
                                if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(updown_as_dlg), GetMainHwnd(), UpDownAsDialogCallBack) == YES)\r
                                {\r
-                                       if(RenameUnuseableName(TmpString) == FAIL)\r
+                                       if(RenameUnuseableName(TmpString) == FFFTP_FAIL)\r
                                                break;\r
                                }\r
                                else\r
@@ -244,7 +244,7 @@ void DirectDownLoadProc(char *Fname)
 {\r
        TRANSPACKET Pkt;\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -269,7 +269,7 @@ void DirectDownLoadProc(char *Fname)
                                _mbsupr(TmpString);\r
                        RemoveAfterSemicolon(TmpString);\r
 \r
-                       if(RenameUnuseableName(TmpString) == SUCCESS)\r
+                       if(RenameUnuseableName(TmpString) == FFFTP_SUCCESS)\r
                        {\r
                                strcat(Pkt.LocalFile, TmpString);\r
                                ReplaceAll(Pkt.LocalFile, '/', '\\');\r
@@ -378,7 +378,7 @@ void MirrorDownloadProc(int Notify)
        int Level;\r
        int Mode;\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -844,7 +844,7 @@ void UpLoadListProc(int ChName, int All)
        char Tmp[FMAX_PATH+1];\r
        int FirstAdd;\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -1007,7 +1007,7 @@ void UpLoadDragProc(WPARAM wParam)
        int FirstAdd;\r
        char Cur[FMAX_PATH+1];\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -1161,7 +1161,7 @@ void MirrorUploadProc(int Notify)
        FILETIME TmpFtimeL;\r
        FILETIME TmpFtimeR;\r
 \r
-       if(CheckClosedAndReconnect() == SUCCESS)\r
+       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -1570,7 +1570,7 @@ static BOOL CALLBACK MirrorDispListCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
                                                Num = SendDlgItemMessage(hDlg, MIRROR_LIST, LB_GETSELITEMS, Num, (LPARAM)List);\r
                                                for(Num--; Num >= 0; Num--)\r
                                                {\r
-                                                       if(RemoveTmpTransFileListItem(Base, List[Num]) == SUCCESS)\r
+                                                       if(RemoveTmpTransFileListItem(Base, List[Num]) == FFFTP_SUCCESS)\r
                                                                SendDlgItemMessage(hDlg, MIRROR_LIST, LB_DELETESTRING, List[Num], 0);\r
                                                        else\r
                                                                MessageBeep(-1);\r
@@ -1698,7 +1698,7 @@ static int AskMirrorNoTrn(char *Fname, int Mode)
                Fname = GetFileName(Fname);\r
                while(*Tbl != NUL)\r
                {\r
-                       if(CheckFname(Fname, Tbl) == SUCCESS)\r
+                       if(CheckFname(Fname, Tbl) == FFFTP_SUCCESS)\r
                        {\r
                                Ret = YES;\r
                                break;\r
@@ -1733,7 +1733,7 @@ static int AskUpLoadFileAttr(char *Fname)
                Sts = CheckFname(Fname, Tbl);\r
                Tbl += strlen(Tbl) + 1;\r
 \r
-               if((Sts == SUCCESS) && (*Tbl != NUL))\r
+               if((Sts == FFFTP_SUCCESS) && (*Tbl != NUL))\r
                {\r
                        Ret = xtoi(Tbl);\r
                        break;\r
@@ -1937,7 +1937,7 @@ void DeleteProc(void)
        else\r
        {\r
                Win = WIN_REMOTE;\r
-               if(CheckClosedAndReconnect() == SUCCESS)\r
+               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                        MakeSelectedFileList(Win, YES, NO, &FileListBase, &CancelFlg);\r
                else\r
                        Sts = NO;\r
@@ -2075,7 +2075,7 @@ static void DelNotifyAndDo(FILELIST *Dt, int Win, int *Sw, int *Flg, char *CurDi
                else\r
                {\r
                        /* フルパスを使わない時のための処理 */\r
-                       if(ProcForNonFullpath(Path, CurDir, GetMainHwnd(), 0) == FAIL)\r
+                       if(ProcForNonFullpath(Path, CurDir, GetMainHwnd(), 0) == FFFTP_FAIL)\r
                                *Sw = NO_ALL;\r
 \r
                        if(*Sw != NO_ALL)\r
@@ -2159,7 +2159,7 @@ void RenameProc(void)
        int RenFlg;\r
        int Sts;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(GetFocus() == GetLocalHwnd())\r
                Win = WIN_LOCAL;\r
        else\r
@@ -2168,7 +2168,7 @@ void RenameProc(void)
                Sts = CheckClosedAndReconnect();\r
        }\r
 \r
-       if(Sts == SUCCESS)\r
+       if(Sts == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -2252,7 +2252,7 @@ void MoveRemoteFileProc(int drop_index)
                }\r
        }\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
 #if 0\r
        if(GetFocus() == GetLocalHwnd())\r
                Win = WIN_LOCAL;\r
@@ -2266,7 +2266,7 @@ void MoveRemoteFileProc(int drop_index)
                Sts = CheckClosedAndReconnect();\r
 #endif\r
 \r
-       if(Sts == SUCCESS)\r
+       if(Sts == FFFTP_SUCCESS)\r
        {\r
                DisableUserOpe();\r
 \r
@@ -2428,7 +2428,7 @@ void MkdirProc(void)
                }\r
                else\r
                {\r
-                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                        {\r
                                DisableUserOpe();\r
                                DoMKD(Path);\r
@@ -2468,7 +2468,7 @@ void ChangeDirComboProc(HWND hWnd)
                }\r
                else\r
                {\r
-                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                        {\r
                                DisableUserOpe();\r
                                if(DoCWD(Tmp, YES, NO, YES) < FTP_RETRY)\r
@@ -2500,14 +2500,14 @@ void ChangeDirBmarkProc(int MarkID)
        if((Sts == BMARK_TYPE_LOCAL) || (Sts == BMARK_TYPE_BOTH))\r
        {\r
                DisableUserOpe();\r
-               if(DoLocalCWD(Local) == SUCCESS)\r
+               if(DoLocalCWD(Local) == FFFTP_SUCCESS)\r
                        GetLocalDirForWnd();\r
                EnableUserOpe();\r
        }\r
 \r
        if((Sts == BMARK_TYPE_REMOTE) || (Sts == BMARK_TYPE_BOTH))\r
        {\r
-               if(CheckClosedAndReconnect() == SUCCESS)\r
+               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                {\r
                        DisableUserOpe();\r
                        if(DoCWD(Remote, YES, NO, YES) < FTP_RETRY)\r
@@ -2557,7 +2557,7 @@ void ChangeDirDirectProc(int Win)
                }\r
                else\r
                {\r
-                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                        {\r
                                DisableUserOpe();\r
                                if(DoCWD(Path, YES, NO, YES) < FTP_RETRY)\r
@@ -2613,7 +2613,7 @@ void ChmodProc(void)
 \r
        if(GetFocus() == GetRemoteHwnd())\r
        {\r
-               if(CheckClosedAndReconnect() == SUCCESS)\r
+               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                {\r
                        DisableUserOpe();\r
                        FileListBase = NULL;\r
@@ -2836,7 +2836,7 @@ void SomeCmdProc(void)
 \r
        if(GetFocus() == GetRemoteHwnd())\r
        {\r
-               if(CheckClosedAndReconnect() == SUCCESS)\r
+               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                {\r
                        DisableUserOpe();\r
                        FileListBase = NULL;\r
@@ -2880,7 +2880,7 @@ void CalcFileSizeProc(void)
 \r
        if((All = DialogBox(GetFtpInst(), MAKEINTRESOURCE(filesize_notify_dlg), GetMainHwnd(), SizeNotifyDlgWndProc)) != NO_ALL)\r
        {\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
                if(GetFocus() == GetLocalHwnd())\r
                        Win = WIN_LOCAL;\r
                else\r
@@ -2889,7 +2889,7 @@ void CalcFileSizeProc(void)
                        Sts = CheckClosedAndReconnect();\r
                }\r
 \r
-               if(Sts == SUCCESS)\r
+               if(Sts == FFFTP_SUCCESS)\r
                {\r
                        ListBase = NULL;\r
                        MakeSelectedFileList(Win, YES, All, &ListBase, &CancelFlg);\r
@@ -3093,7 +3093,7 @@ void CopyURLtoClipBoard(void)
 *                      0=コマンドソケット, 1=転送ソケット\r
 *\r
 *      Return Value\r
-*              int ステータス(SUCCESS/FAIL)\r
+*              int ステータス(FFFTP_SUCCESS/FFFTP_FAIL)\r
 *\r
 *      Note\r
 *              フルパスを使わない時は、\r
@@ -3107,7 +3107,7 @@ int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type)
        int Cmd;\r
        char Tmp[FMAX_PATH+1];\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(AskNoFullPathMode() == YES)\r
        {\r
                strcpy(Tmp, Path);\r
@@ -3131,7 +3131,7 @@ int ProcForNonFullpath(char *Path, char *CurDir, HWND hWnd, int Type)
                        if(Cmd/100 != FTP_COMPLETE)\r
                        {\r
                                DispCWDerror(hWnd);\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                        }\r
                        else\r
                                strcpy(CurDir, Tmp);\r
@@ -3245,7 +3245,7 @@ void ReformVMSDirName(char *DirName, int Flg)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL=中止する\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL=中止する\r
 *\r
 *      Note\r
 *              Fnameを直接書きかえる\r
@@ -3256,7 +3256,7 @@ static int RenameUnuseableName(char *Fname)
        int Tmp;\r
        int Ret;\r
 \r
-       Ret = SUCCESS;\r
+       Ret = FFFTP_SUCCESS;\r
        while(1)\r
        {\r
                if((_mbschr(Fname, ':') != NULL) ||\r
@@ -3270,7 +3270,7 @@ static int RenameUnuseableName(char *Fname)
                {\r
                        if(InputDialogBox(forcerename_dlg, GetMainHwnd(), NULL, Fname, FMAX_PATH+1, &Tmp, IDH_HELP_TOPIC_0000001) == NO)\r
                        {\r
-                               Ret = FAIL;\r
+                               Ret = FFFTP_FAIL;\r
                                break;\r
                        }\r
                }\r
index 66642ca..226fd04 100644 (file)
--- a/getput.c
+++ b/getput.c
@@ -161,9 +161,9 @@ int MakeTransferThread(void)
        fTransferThreadExit = FALSE;\r
        hTransferThread = (HANDLE)_beginthreadex(NULL, 0, TransferThread, 0, 0, &dwID);\r
        if (hTransferThread == NULL)\r
-               return(FAIL); /* XXX */\r
+               return(FFFTP_FAIL); /* XXX */\r
 \r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -206,7 +206,7 @@ void CloseTransferThread(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)\r
@@ -215,7 +215,7 @@ int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)
        TRANSPACKET *Prev;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Pos = malloc(sizeof(TRANSPACKET))) != NULL)\r
        {\r
                memcpy(Pos, Pkt, sizeof(TRANSPACKET));\r
@@ -230,7 +230,7 @@ int AddTmpTransFileList(TRANSPACKET *Pkt, TRANSPACKET **Base)
                                Prev = Prev->Next;\r
                        Prev->Next = Pos;\r
                }\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -270,7 +270,7 @@ void EraseTmpTransFileList(TRANSPACKET **Base)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)\r
@@ -279,13 +279,13 @@ int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)
        TRANSPACKET *Prev;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        Pos = *Base;\r
        if(Num == 0)\r
        {\r
                *Base = Pos->Next;\r
                free(Pos);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -297,7 +297,7 @@ int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num)
                        {\r
                                Prev->Next = Pos->Next;\r
                                free(Pos);\r
-                               Sts = SUCCESS;\r
+                               Sts = FFFTP_SUCCESS;\r
                                break;\r
                        }\r
                }\r
@@ -321,7 +321,7 @@ void AddTransFileList(TRANSPACKET *Pkt)
 \r
        WaitForSingleObject(hListAccMutex, INFINITE);\r
 \r
-       if(AddTmpTransFileList(Pkt, &TransPacketBase) == SUCCESS)\r
+       if(AddTmpTransFileList(Pkt, &TransPacketBase) == FFFTP_SUCCESS)\r
        {\r
                if((strncmp(Pkt->Cmd, "RETR", 4) == 0) ||\r
                   (strncmp(Pkt->Cmd, "STOR", 4) == 0))\r
@@ -615,7 +615,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                if(CheckPathViolation(TransPacketBase) == NO)\r
                                {\r
                                        /* フルパスを使わないための処理 */\r
-                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)\r
+                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)\r
                                        {\r
                                                if(strncmp(TransPacketBase->Cmd, "RETR-S", 6) == 0)\r
                                                {\r
@@ -628,7 +628,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                                Down = YES;\r
 //                                             if(DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO) == 429)\r
 //                                             {\r
-//                                                     if(ReConnectTrnSkt() == SUCCESS)\r
+//                                                     if(ReConnectTrnSkt() == FFFTP_SUCCESS)\r
                                                                DoDownLoad(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);\r
 //                                             }\r
                                        }\r
@@ -638,12 +638,12 @@ static ULONG WINAPI TransferThread(void *Dummy)
                        else if(strncmp(TransPacketBase->Cmd, "STOR", 4) == 0)\r
                        {\r
                                /* フルパスを使わないための処理 */\r
-                               if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)\r
+                               if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)\r
                                {\r
                                        Up = YES;\r
 //                                     if(DoUpLoad(AskTrnCtrlSkt(), TransPacketBase) == 429)\r
 //                                     {\r
-//                                             if(ReConnectTrnSkt() == SUCCESS)\r
+//                                             if(ReConnectTrnSkt() == FFFTP_SUCCESS)\r
                                                        DoUpLoad(AskTrnCtrlSkt(), TransPacketBase);\r
 //                                     }\r
                                }\r
@@ -659,7 +659,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                        CwdSts = FTP_COMPLETE;\r
 \r
                                        strcpy(Tmp, TransPacketBase->RemoteFile);\r
-                                       if(ProcForNonFullpath(Tmp, CurDir, hWndTrans, 1) == FAIL)\r
+                                       if(ProcForNonFullpath(Tmp, CurDir, hWndTrans, 1) == FFFTP_FAIL)\r
                                        {\r
                                                ClearAll = YES;\r
                                                CwdSts = FTP_ERROR;\r
@@ -688,7 +688,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                DispTransFileInfo(TransPacketBase, MSGJPN079, FALSE, YES);\r
 \r
                                /* フルパスを使わないための処理 */\r
-                               if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)\r
+                               if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)\r
                                {\r
                                        Up = YES;\r
                                        CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);\r
@@ -706,7 +706,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                if((DelNotify == YES) || (DelNotify == YES_ALL))\r
                                {\r
                                        /* フルパスを使わないための処理 */\r
-                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)\r
+                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)\r
                                        {\r
                                                Up = YES;\r
                                                CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);\r
@@ -722,7 +722,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                                if((DelNotify == YES) || (DelNotify == YES_ALL))\r
                                {\r
                                        /* フルパスを使わないための処理 */\r
-                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == SUCCESS)\r
+                                       if(MakeNonFullPath(TransPacketBase, CurDir, Tmp) == FFFTP_SUCCESS)\r
                                        {\r
                                                Up = YES;\r
                                                CommandProcTrn(NULL, "%s%s", TransPacketBase->Cmd+2, TransPacketBase->RemoteFile);\r
@@ -872,7 +872,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 *              char *Tmp : 作業用エリア\r
 *\r
 *      Return Value\r
-*              int ステータス(SUCCESS/FAIL)\r
+*              int ステータス(FFFTP_SUCCESS/FFFTP_FAIL)\r
 *\r
 *      Note\r
 *              フルパスを使わない時は、\r
@@ -885,7 +885,7 @@ static int MakeNonFullPath(TRANSPACKET *Pkt, char *Cur, char *Tmp)
        int Sts;\r
 \r
        Sts = ProcForNonFullpath(Pkt->RemoteFile, Cur, Pkt->hWndTrans, 1);\r
-       if(Sts == FAIL)\r
+       if(Sts == FFFTP_FAIL)\r
                ClearAll = YES;\r
 \r
        return(Sts);\r
@@ -990,7 +990,7 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
                        iRetCode = command(Pkt->ctrl_skt, Reply, CancelCheckWork, "%s", Buf);\r
                        if(iRetCode/100 == FTP_PRELIM)\r
                        {\r
-                               if(SocksGet2ndBindReply(listen_socket, &data_socket) == FAIL)\r
+                               if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)\r
                                {\r
                                        iLength = sizeof(saSockAddr1);\r
                                        data_socket = do_accept(listen_socket, (struct sockaddr *)&saSockAddr1, (int *)&iLength);\r
@@ -1060,7 +1060,7 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
        iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "PASV");\r
        if(iRetCode/100 == FTP_COMPLETE)\r
        {\r
-               if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == SUCCESS)\r
+               if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)\r
                {\r
                        if((data_socket = connectsock(Adrs, Port, MSGJPN091, CancelCheckWork)) != INVALID_SOCKET)\r
                        {\r
@@ -1568,7 +1568,7 @@ static int DoUpLoad(SOCKET cSkt, TRANSPACKET *Pkt)
 \r
        if(Pkt->Mode != EXIST_IGNORE)\r
        {\r
-               if(CheckFileReadable(Pkt->LocalFile) == SUCCESS)\r
+               if(CheckFileReadable(Pkt->LocalFile) == FFFTP_SUCCESS)\r
                {\r
                        if(Pkt->Type == TYPE_I)\r
                                Pkt->KanjiCode = KANJI_NOCNV;\r
@@ -1649,7 +1649,7 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
                iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled, "%s", Buf);\r
                if((iRetCode/100) == FTP_PRELIM)\r
                {\r
-                       if(SocksGet2ndBindReply(listen_socket, &data_socket) == FAIL)\r
+                       if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)\r
                        {\r
                                iLength=sizeof(saSockAddr1);\r
                                data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddr1, (int *)&iLength);\r
@@ -1716,7 +1716,7 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
        iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled, "PASV");\r
        if(iRetCode/100 == FTP_COMPLETE)\r
        {\r
-               if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == SUCCESS)\r
+               if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)\r
                {\r
                        if((data_socket = connectsock(Adrs, Port, MSGJPN109, &Canceled)) != INVALID_SOCKET)\r
                        {\r
@@ -1865,7 +1865,7 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
                                        else\r
                                                Continue = ConvSJIStoEUC(&cInfo);\r
 \r
-                                       if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FAIL)\r
+                                       if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FFFTP_FAIL)\r
                                        {\r
                                                Pkt->Abort = ABORT_ERROR;\r
                                                        break;\r
@@ -1875,7 +1875,7 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
                        }\r
                        else\r
                        {\r
-                               if(TermCodeConvAndSend(&tInfo, dSkt, Buf, iNumBytes, Pkt->Type) == FAIL)\r
+                               if(TermCodeConvAndSend(&tInfo, dSkt, Buf, iNumBytes, Pkt->Type) == FFFTP_FAIL)\r
                                        Pkt->Abort = ABORT_ERROR;\r
                        }\r
 \r
@@ -1899,14 +1899,14 @@ static int UpLoadFile(TRANSPACKET *Pkt, SOCKET dSkt)
                                cInfo.BufSize = BUFSIZE+3;\r
                                FlushRestData(&cInfo);\r
 \r
-                               if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FAIL)\r
+                               if(TermCodeConvAndSend(&tInfo, dSkt, Buf2, cInfo.OutLen, Pkt->Type) == FFFTP_FAIL)\r
                                        Pkt->Abort = ABORT_ERROR;\r
                        }\r
 \r
                        tInfo.Buf = Buf2;\r
                        tInfo.BufSize = BUFSIZE+3;\r
                        FlushRestTermCodeConvData(&tInfo);\r
-                       if(SendData(dSkt, Buf2, tInfo.OutLen, 0, &Canceled) == FAIL)\r
+                       if(SendData(dSkt, Buf2, tInfo.OutLen, 0, &Canceled) == FFFTP_FAIL)\r
                                Pkt->Abort = ABORT_ERROR;\r
                }\r
 \r
@@ -1969,7 +1969,7 @@ static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data,
        int Continue;\r
        int Ret;\r
 \r
-       Ret = SUCCESS;\r
+       Ret = FFFTP_SUCCESS;\r
 \r
 // CR-LF以外の改行コードを変換しないモードはここへ追加\r
        if(Ascii == TYPE_A)\r
@@ -1981,7 +1981,7 @@ static int TermCodeConvAndSend(TERMCODECONVINFO *tInfo, SOCKET Skt, char *Data,
                do\r
                {\r
                        Continue = ConvTermCodeToCRLF(tInfo);\r
-                       if((Ret = SendData(Skt, Buf3, tInfo->OutLen, 0, &Canceled)) == FAIL)\r
+                       if((Ret = SendData(Skt, Buf3, tInfo->OutLen, 0, &Canceled)) == FFFTP_FAIL)\r
                                break;\r
                }\r
                while(Continue == YES);\r
@@ -2292,7 +2292,7 @@ static void DispTransFileInfo(TRANSPACKET *Pkt, char *Title, int SkipButton, int
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)\r
@@ -2301,7 +2301,7 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
        char *Btm;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
 \r
        Pos = strchr(Str, '(');\r
        if(Pos != NULL)\r
@@ -2334,7 +2334,7 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
                                                        {\r
                                                                Btm++;\r
                                                                *Port = (atoi(Pos) * 0x100) + atoi(Btm);\r
-                                                               Sts = SUCCESS;\r
+                                                               Sts = FFFTP_SUCCESS;\r
                                                        }\r
                                                }\r
                                        }\r
index 0283eac..27bd05d 100644 (file)
--- a/history.c
+++ b/history.c
@@ -389,7 +389,7 @@ static void RemoveAllHistoryFromMenu(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)\r
@@ -398,14 +398,14 @@ int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)
        int i;\r
        HISTORYDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        Pos = HistoryBase;\r
        for(i = 0; i < HistoryNum; i++)\r
        {\r
                if(MenuHistId[i] == MenuCmd)\r
                {\r
                        memcpy(Buf, Pos, sizeof(HISTORYDATA));\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
                Pos = Pos->Next;\r
        }\r
@@ -421,7 +421,7 @@ int GetHistoryByCmd(int MenuCmd, HISTORYDATA *Buf)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int GetHistoryByNum(int Num, HISTORYDATA *Buf)\r
index 02779c8..9593d8e 100644 (file)
--- a/hostman.c
+++ b/hostman.c
@@ -757,7 +757,7 @@ static int SetNodeLevelAll(void)
                Pos->Set.Level |= GetNodeLevelByData(Pos);\r
                Pos = GetNextNode(Pos);\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -770,7 +770,7 @@ static int SetNodeLevelAll(void)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int AddHostToList(HOSTDATA *Set, int Pos, int Level)\r
@@ -780,7 +780,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
        HOSTLISTDATA *Last;\r
        int Cur;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Pos >= -1) && (Pos <= Hosts))\r
        {\r
                if(Pos == -1)\r
@@ -838,7 +838,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
                                }\r
                        }\r
                        Hosts++;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -853,7 +853,7 @@ int AddHostToList(HOSTDATA *Set, int Pos, int Level)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int UpdateHostToList(int Num, HOSTDATA *Set)\r
@@ -861,12 +861,12 @@ static int UpdateHostToList(int Num, HOSTDATA *Set)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                memcpy(&Pos->Set, Set, sizeof(HOSTDATA));\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -879,7 +879,7 @@ static int UpdateHostToList(int Num, HOSTDATA *Set)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DelHostFromList(int Num)\r
@@ -887,7 +887,7 @@ static int DelHostFromList(int Num)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                if(Num == 0)\r
@@ -912,7 +912,7 @@ static int DelHostFromList(int Num)
                }\r
                free(Pos);\r
                Hosts--;\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -925,7 +925,7 @@ static int DelHostFromList(int Num)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              Pos->Next, Pos->Childの全てのノードを削除する\r
@@ -945,7 +945,7 @@ static int DeleteChildAndNext(HOSTLISTDATA *Pos)
                Hosts--;\r
                Pos = Next;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -957,7 +957,7 @@ static int DeleteChildAndNext(HOSTLISTDATA *Pos)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              現在ホストに接続中の時は、CopyHostFromListInConnect() を使う事\r
@@ -968,12 +968,12 @@ int CopyHostFromList(int Num, HOSTDATA *Set)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                memcpy(Set, &Pos->Set, sizeof(HOSTDATA));\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -987,7 +987,7 @@ int CopyHostFromList(int Num, HOSTDATA *Set)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              現在ホストに接続中の時に使う\r
@@ -998,7 +998,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
@@ -1015,7 +1015,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
                Set->UseNLST_R = Pos->Set.UseNLST_R;\r
                Set->LastDir = Pos->Set.LastDir;\r
                Set->TimeZone = Pos->Set.TimeZone;\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1030,7 +1030,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SetHostBookMark(int Num, char *Bmask, int Len)\r
@@ -1038,12 +1038,12 @@ int SetHostBookMark(int Num, char *Bmask, int Len)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                memcpy(Pos->Set.BookMark, Bmask, Len);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1082,7 +1082,7 @@ char *AskHostBookMark(int Num)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SetHostDir(int Num, char *LocDir, char *HostDir)\r
@@ -1090,13 +1090,13 @@ int SetHostDir(int Num, char *LocDir, char *HostDir)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                strcpy(Pos->Set.LocalInitDir, LocDir);\r
                strcpy(Pos->Set.RemoteInitDir, HostDir);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1110,7 +1110,7 @@ int SetHostDir(int Num, char *LocDir, char *HostDir)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SetHostPassword(int Num, char *Pass)\r
@@ -1118,12 +1118,12 @@ int SetHostPassword(int Num, char *Pass)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                strcpy(Pos->Set.PassWord, Pass);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1171,7 +1171,7 @@ int SearchHostName(char *Name)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SetHostSort(int Num, int LFSort, int LDSort, int RFSort, int RDSort)\r
@@ -1179,12 +1179,12 @@ int SetHostSort(int Num, int LFSort, int LDSort, int RFSort, int RDSort)
        int Sts;\r
        HOSTLISTDATA *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Num >= 0) && (Num < Hosts))\r
        {\r
                Pos = GetNodeByNum(Num);\r
                Pos->Set.Sort = LFSort * 0x1000000 | LDSort * 0x10000 | RFSort * 0x100 | RDSort;\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
diff --git a/local.c b/local.c
index 4bb245d..3988c6d 100644 (file)
--- a/local.c
+++ b/local.c
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int DoLocalCWD(char *Path)\r
 {\r
        int Sts;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        SetTaskMsg(">>CD %s", Path);\r
        if(SetCurrentDirectory(Path) != TRUE)\r
        {\r
                SetTaskMsg(MSGJPN145);\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
index fe1ee44..a833a99 100644 (file)
--- a/lvtips.c
+++ b/lvtips.c
@@ -61,7 +61,7 @@ static HWND hWndTips; /* tipsのウインドウハンドル */
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int InitListViewTips(HWND hWnd, HINSTANCE hInst)\r
@@ -69,7 +69,7 @@ int InitListViewTips(HWND hWnd, HINSTANCE hInst)
        WNDCLASSEX wClass;\r
        int Ret;\r
 \r
-       Ret = FAIL;\r
+       Ret = FFFTP_FAIL;\r
 \r
        wClass.cbSize = sizeof(WNDCLASSEX);\r
        wClass.style         = 0;\r
@@ -92,7 +92,7 @@ int InitListViewTips(HWND hWnd, HINSTANCE hInst)
                                hWnd, NULL, hInst, NULL);\r
 \r
        if(hWndTips != NULL)\r
-               Ret = SUCCESS;\r
+               Ret = FFFTP_SUCCESS;\r
 \r
        return(Ret);\r
 }\r
diff --git a/main.c b/main.c
index 636bfc4..2f7c292 100644 (file)
--- a/main.c
+++ b/main.c
@@ -235,7 +235,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
        Ret = FALSE;\r
        hWndFtp = NULL;\r
        hInstFtp = hInstance;\r
-       if(InitApp(lpszCmdLine, cmdShow) == SUCCESS)\r
+       if(InitApp(lpszCmdLine, cmdShow) == FFFTP_SUCCESS)\r
        {\r
                for(;;)\r
                {\r
@@ -276,7 +276,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int InitApp(LPSTR lpszCmdLine, int cmdShow)\r
@@ -288,7 +288,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
        int useDefautPassword = 0; /* 警告文表示用 */\r
        int masterpass;\r
 \r
-       sts = FAIL;\r
+       sts = FFFTP_FAIL;\r
 \r
        aes_init();\r
        srand(GetTickCount());\r
@@ -381,7 +381,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 \r
                        CountPrevFfftpWindows();\r
 \r
-                       if(MakeAllWindows(cmdShow) == SUCCESS)\r
+                       if(MakeAllWindows(cmdShow) == FFFTP_SUCCESS)\r
                        {\r
                                hWndCurFocus = GetLocalHwnd();\r
 \r
@@ -401,7 +401,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
                                if(CacheSave == YES)\r
                                        LoadCache();\r
 \r
-                               if(MakeTransferThread() == SUCCESS)\r
+                               if(MakeTransferThread() == FFFTP_SUCCESS)\r
                                {\r
                                        DoPrintf("DEBUG MESSAGE ON ! ##");\r
 \r
@@ -430,7 +430,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
                                        DispTransferFiles();\r
 \r
                                        StartupProc(lpszCmdLine);\r
-                                       sts = SUCCESS;\r
+                                       sts = FFFTP_SUCCESS;\r
 \r
                                        /* セキュリティ警告文の表示 */\r
                                        if( useDefautPassword ){\r
@@ -453,7 +453,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
                }\r
        }\r
 \r
-       if(sts == FAIL)\r
+       if(sts == FFFTP_FAIL)\r
                DeleteAllObject();\r
 \r
        return(sts);\r
@@ -467,7 +467,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int MakeAllWindows(int cmdShow)\r
@@ -552,19 +552,19 @@ static int MakeAllWindows(int cmdShow)
                StsLvtips = InitListViewTips(hWndFtp, hInstFtp);\r
        }\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if((hWndFtp == NULL) ||\r
-          (StsTbar == FAIL) ||\r
-          (StsList == FAIL) ||\r
-          (StsSbar == FAIL) ||\r
-          (StsTask == FAIL) ||\r
-          (StsLvtips == FAIL) ||\r
-          (StsSocket == FAIL))\r
+          (StsTbar == FFFTP_FAIL) ||\r
+          (StsList == FFFTP_FAIL) ||\r
+          (StsSbar == FFFTP_FAIL) ||\r
+          (StsTask == FFFTP_FAIL) ||\r
+          (StsLvtips == FFFTP_FAIL) ||\r
+          (StsSocket == FFFTP_FAIL))\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
 \r
-       if(Sts == SUCCESS)\r
+       if(Sts == FFFTP_SUCCESS)\r
                SetListViewType();\r
 \r
        return(Sts);\r
@@ -1034,7 +1034,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
                                case MENU_REFRESH :\r
                                        SuppressRefresh = 1;\r
                                        GetLocalDirForWnd();\r
-                                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                                                GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);\r
                                        SuppressRefresh = 0;\r
                                        break;\r
@@ -1057,7 +1057,7 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 \r
                                case REFRESH_REMOTE :\r
                                        SuppressRefresh = 1;\r
-                                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                                                GetRemoteDirForWnd(CACHE_REFRESH, &CancelFlg);\r
                                        SuppressRefresh = 0;\r
                                        break;\r
@@ -1842,7 +1842,7 @@ void DoubleClickProc(int Win, int Mode, int App)
                                        else\r
                                                ChangeDir(WIN_LOCAL, Tmp);\r
                                }\r
-                               else if(CheckClosedAndReconnect() == SUCCESS)\r
+                               else if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                                {\r
                                        if((App != -1) || (Type == NODE_FILE))\r
                                        {\r
@@ -1967,13 +1967,13 @@ static void ChangeDir(int Win, char *Path)
 \r
        if((Win == WIN_LOCAL) || (Sync == YES))\r
        {\r
-               if(DoLocalCWD(Path) == SUCCESS)\r
+               if(DoLocalCWD(Path) == FFFTP_SUCCESS)\r
                        GetLocalDirForWnd();\r
        }\r
 \r
        if((Win == WIN_REMOTE) || (Sync == YES))\r
        {\r
-               if(CheckClosedAndReconnect() == SUCCESS)\r
+               if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                {\r
 #if defined(HAVE_OPENVMS)\r
                        /* OpenVMSの場合、".DIR;?"を取る */\r
diff --git a/misc.c b/misc.c
index f1efc13..e64ee05 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -500,7 +500,7 @@ char *GetNextField(char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL=長さが長すぎる\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL=長さが長すぎる\r
 *----------------------------------------------------------------------------*/\r
 \r
 int GetOneField(char *Str, char *Buf, int Max)\r
@@ -508,13 +508,13 @@ int GetOneField(char *Str, char *Buf, int Max)
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Pos = strchr(Str, ' ')) == NULL)\r
        {\r
                if((int)strlen(Str) <= Max)\r
                {\r
                        strcpy(Buf, Str);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        else\r
@@ -523,7 +523,7 @@ int GetOneField(char *Str, char *Buf, int Max)
                {\r
                        strncpy(Buf, Str, Pos - Str);\r
                        *(Buf + (Pos - Str)) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -942,7 +942,7 @@ int hex2bin(char Ch)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      "\"は全て"/"に置き換える\r
 *----------------------------------------------------------------------------*/\r
@@ -1011,9 +1011,9 @@ int SplitUNCpath(char *unc, char *Host, char *Path, char *File, char *User, char
                strncpy(Host, Pos1, HOST_ADRS_LEN);\r
        }\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(strlen(Host) > 0)\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
 \r
        return(Sts);\r
 }\r
@@ -1479,7 +1479,7 @@ int xtoi(char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int CheckFileReadable(char *Fname)\r
@@ -1488,7 +1488,7 @@ int CheckFileReadable(char *Fname)
        HANDLE iFileHandle;\r
        SECURITY_ATTRIBUTES Sec;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
 \r
        Sec.nLength = sizeof(SECURITY_ATTRIBUTES);\r
        Sec.lpSecurityDescriptor = NULL;\r
@@ -1497,7 +1497,7 @@ int CheckFileReadable(char *Fname)
        if((iFileHandle = CreateFile(Fname, GENERIC_READ,\r
                FILE_SHARE_READ|FILE_SHARE_WRITE, &Sec, OPEN_EXISTING, 0, NULL)) != INVALID_HANDLE_VALUE)\r
        {\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
                CloseHandle(iFileHandle);\r
        }\r
        return(Sts);\r
diff --git a/ras.c b/ras.c
index 856fce4..4ad591c 100644 (file)
--- a/ras.c
+++ b/ras.c
@@ -268,7 +268,7 @@ static DWORD RasHangUpWait(HRASCONN hRasConn)
 *              int Num : 個数\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DoDisconnect(RASCONN *RasConn, int Num)\r
@@ -276,14 +276,14 @@ static int DoDisconnect(RASCONN *RasConn, int Num)
        int i;\r
        int Sts;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(Num > 0)\r
        {\r
                SetTaskMsg(MSGJPN220);\r
                for(i = 0; i < Num; i++)\r
                {\r
                        if(RasHangUpWait(RasConn[i].hrasconn) != 0)\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                }\r
        }\r
        return(Sts);\r
@@ -383,7 +383,7 @@ int SetRasEntryToComboBox(HWND hDlg, int Item, char *CurName)
 *              char *Name : 接続先\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *----------------------------------------------------------------------------*/\r
 \r
 int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)\r
@@ -398,7 +398,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
        BOOL Flg;\r
        OSVERSIONINFO VerInfo;\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(Dialup == YES)\r
        {\r
                if(m_hDll != NULL)\r
@@ -438,7 +438,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
                        {\r
                                /* 接続する */\r
                                SetTaskMsg(MSGJPN221);\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
 \r
                                Num = 0;\r
                                VerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);\r
@@ -460,7 +460,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
                                                DlgParam.reserved = 0;\r
                                                DlgParam.reserved2 = 0;\r
                                                if((*m_RasDialDlg)(NULL, Name, NULL, &DlgParam) != 0)\r
-                                                       Sts = SUCCESS;\r
+                                                       Sts = FFFTP_SUCCESS;\r
                                        }\r
                                        else\r
                                                SetTaskMsg(MSGJPN222);\r
@@ -478,7 +478,7 @@ int ConnectRas(int Dialup, int UseThis, int Notify, char *Name)
                                           (DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(dial_password_dlg), GetMainHwnd(), (DLGPROC)DialPassCallBackProc, (LPARAM)&Param) == YES))\r
                                        {\r
                                                if(DialogBoxParam(GetFtpInst(), MAKEINTRESOURCE(dial_dlg), GetMainHwnd(), (DLGPROC)DialCallBackProc, (LPARAM)&Param) == YES)\r
-                                                       Sts = SUCCESS;\r
+                                                       Sts = FFFTP_SUCCESS;\r
                                        }\r
                                }\r
                        }\r
index bc52359..7a03e10 100644 (file)
@@ -235,7 +235,7 @@ int ValidateMasterPassword(void)
        int i;\r
 \r
        SetRegType(REGTYPE_INI);\r
-       if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)\r
+       if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)\r
        {\r
                if(AskForceIni() == NO)\r
                {\r
@@ -243,14 +243,14 @@ int ValidateMasterPassword(void)
                        i = OpenReg("FFFTP", &hKey3);\r
                }\r
        }\r
-       if(i == SUCCESS){\r
+       if(i == FFFTP_SUCCESS){\r
                char checkbuf[48];\r
                int salt = 0;\r
 \r
                if( ReadIntValueFromReg(hKey3, "CredentialSalt", &salt)){\r
                        SetHashSalt( salt );\r
                }\r
-               if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == SUCCESS ){\r
+               if( ReadStringFromReg(hKey3, "CredentialCheck", checkbuf, sizeof( checkbuf )) == FFFTP_SUCCESS ){\r
                        switch( CheckPasswordValidity( SecretKey, SecretKeyLength, checkbuf ) ){\r
                        case 0: /* not match */\r
                                IsMasterPasswordError = PASSWORD_UNMATCH;\r
@@ -298,7 +298,7 @@ void SaveRegistory(void)
        }\r
 \r
        SetRegType(RegType);\r
-       if(CreateReg("FFFTP", &hKey3) == SUCCESS)\r
+       if(CreateReg("FFFTP", &hKey3) == FFFTP_SUCCESS)\r
        {\r
                char buf[48];\r
                int salt = GetTickCount();\r
@@ -311,7 +311,7 @@ void SaveRegistory(void)
                CreatePasswordHash( SecretKey, SecretKeyLength, buf );\r
                WriteStringToReg(hKey3, "CredentialCheck", buf);\r
 \r
-               if(CreateSubKey(hKey3, "Options", &hKey4) == SUCCESS)\r
+               if(CreateSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)\r
                {\r
                        WriteIntValueToReg(hKey4, "NoSave", SuppressSave);\r
 \r
@@ -427,10 +427,10 @@ void SaveRegistory(void)
                                n = 0;\r
                                for(i = AskHistoryNum(); i > 0; i--)\r
                                {\r
-                                       if(GetHistoryByNum(i-1, &Hist) == SUCCESS)\r
+                                       if(GetHistoryByNum(i-1, &Hist) == FFFTP_SUCCESS)\r
                                        {\r
                                                sprintf(Str, "History%d", n);\r
-                                               if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                                               if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                                {\r
                                                        SaveStr(hKey5, "HostAdrs", Hist.HostAdrs, DefaultHist.HostAdrs);\r
                                                        SaveStr(hKey5, "UserName", Hist.UserName, DefaultHist.UserName);\r
@@ -474,17 +474,17 @@ void SaveRegistory(void)
                                for(; n < 999; n++)\r
                                {\r
                                        sprintf(Str, "History%d", n);\r
-                                       if(DeleteSubKey(hKey4, Str) != SUCCESS)\r
+                                       if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
 \r
                                /* ホストの設定を保存 */\r
                                CopyDefaultHost(&DefaultHost);\r
                                i = 0;\r
-                               while(CopyHostFromList(i, &Host) == SUCCESS)\r
+                               while(CopyHostFromList(i, &Host) == FFFTP_SUCCESS)\r
                                {\r
                                        sprintf(Str, "Host%d", i);\r
-                                       if(CreateSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                                       if(CreateSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                        {\r
 //                                             SaveIntNum(hKey5, "Set", Host.Level, DefaultHost.Level);\r
                                                WriteIntValueToReg(hKey5, "Set", Host.Level);\r
@@ -541,7 +541,7 @@ void SaveRegistory(void)
                                for(; i < 998; i++)\r
                                {\r
                                        sprintf(Str, "Host%d", i);\r
-                                       if(DeleteSubKey(hKey4, Str) != SUCCESS)\r
+                                       if(DeleteSubKey(hKey4, Str) != FFFTP_SUCCESS)\r
                                                break;\r
                                }\r
 \r
@@ -586,7 +586,7 @@ int LoadRegistory(void)
        Sts = NO;\r
 \r
        SetRegType(REGTYPE_INI);\r
-       if((i = OpenReg("FFFTP", &hKey3)) != SUCCESS)\r
+       if((i = OpenReg("FFFTP", &hKey3)) != FFFTP_SUCCESS)\r
        {\r
                if(AskForceIni() == NO)\r
                {\r
@@ -595,15 +595,15 @@ int LoadRegistory(void)
                }\r
        }\r
 \r
-       if(i == SUCCESS)\r
+       if(i == FFFTP_SUCCESS)\r
        {\r
-               char checkbuf[48];\r
+               /* char checkbuf[48]; */\r
                int salt = 0;\r
                Sts = YES;\r
 \r
                ReadIntValueFromReg(hKey3, "Version", &Version);\r
 \r
-               if(OpenSubKey(hKey3, "Options", &hKey4) == SUCCESS)\r
+               if(OpenSubKey(hKey3, "Options", &hKey4) == FFFTP_SUCCESS)\r
                {\r
                        ReadIntValueFromReg(hKey4, "WinPosX", &WinPosX);\r
                        ReadIntValueFromReg(hKey4, "WinPosY", &WinPosY);\r
@@ -662,7 +662,7 @@ int LoadRegistory(void)
                        ReadIntValueFromReg(hKey4, "RegExp", &FindMode);\r
                        ReadIntValueFromReg(hKey4, "Reg", &RegType);\r
 \r
-                       if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FAIL)\r
+                       if(ReadMultiStringFromReg(hKey4, "AsciiFile", AsciiExt, ASCII_EXT_LEN+1) == FFFTP_FAIL)\r
                        {\r
                                /* 旧ASCIIモードの拡張子の設定を新しいものに変換 */\r
                                ReadStringFromReg(hKey4, "Ascii", Str, ASCII_EXT_LEN+1);\r
@@ -694,9 +694,9 @@ int LoadRegistory(void)
                        ReadIntValueFromReg(hKey4, "MirUNot", &MirUpDelNotify);\r
                        ReadIntValueFromReg(hKey4, "MirDNot", &MirDownDelNotify);\r
 \r
-                       if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == SUCCESS)\r
+                       if(ReadStringFromReg(hKey4, "ListFont", Str, 256) == FFFTP_SUCCESS)\r
                        {\r
-                               if(RestoreFontData(Str, &ListLogFont) == SUCCESS)\r
+                               if(RestoreFontData(Str, &ListLogFont) == FFFTP_SUCCESS)\r
                                        ListFont = CreateFontIndirect(&ListLogFont);\r
                        }\r
                        ReadIntValueFromReg(hKey4, "ListHide", &DispIgnoreHide);\r
@@ -745,7 +745,7 @@ int LoadRegistory(void)
                        for(i = 0; i < Sets; i++)\r
                        {\r
                                sprintf(Str, "History%d", i);\r
-                               if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                               if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                {\r
                                        CopyDefaultHistory(&Hist);\r
 \r
@@ -793,7 +793,7 @@ int LoadRegistory(void)
                        for(i = 0; i < Sets; i++)\r
                        {\r
                                sprintf(Str, "Host%d", i);\r
-                               if(OpenSubKey(hKey4, Str, &hKey5) == SUCCESS)\r
+                               if(OpenSubKey(hKey4, Str, &hKey5) == FFFTP_SUCCESS)\r
                                {\r
                                        CopyDefaultHost(&Host);\r
                                        /* 下位互換性のため */\r
@@ -1156,7 +1156,7 @@ static void MakeFontData(LOGFONT Font, HFONT hFont, char *Buf)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL=変換できない\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL=変換できない\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int RestoreFontData(char *Str, LOGFONT *Font)\r
@@ -1164,7 +1164,7 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
        int i;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(sscanf(Str, "%d %d %d %d %d %d %d %d %d %d %d %d %d",\r
                        &(Font->lfHeight), &(Font->lfWidth), &(Font->lfEscapement), &(Font->lfOrientation),\r
                        &(Font->lfWeight), &(Font->lfItalic), &(Font->lfUnderline), &(Font->lfStrikeOut),\r
@@ -1180,11 +1180,11 @@ static int RestoreFontData(char *Str, LOGFONT *Font)
                if(i == 0)\r
                {\r
                        strcpy(Font->lfFaceName, Str);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
 \r
-       if(Sts == FAIL)\r
+       if(Sts == FFFTP_FAIL)\r
                memset(Font, NUL, sizeof(LOGFONT));\r
 \r
        return(Sts);\r
@@ -1390,7 +1390,7 @@ static void EncodePassword3(char *Str, char *Buf, const char *Key)
                        }\r
                        *Put++ = ':';\r
 \r
-                       if(CreateAesKey(AesKey, Key) == SUCCESS)\r
+                       if(CreateAesKey(AesKey, Key) == FFFTP_SUCCESS)\r
                        {\r
                                aes_encrypt_key(AesKey, 32, &Ctx);\r
 \r
@@ -1578,7 +1578,7 @@ static void DecodePassword3(char *Str, char *Buf, const char *Key)
 \r
                        if(*Get++ == ':')\r
                        {\r
-                               if(CreateAesKey(AesKey, Key) == SUCCESS)\r
+                               if(CreateAesKey(AesKey, Key) == FFFTP_SUCCESS)\r
                                {\r
                                        aes_decrypt_key(AesKey, 32, &Ctx);\r
 \r
@@ -1606,7 +1606,7 @@ static void DecodePassword3(char *Str, char *Buf, const char *Key)
 *              const char *Key : 暗号化キー\r
 *\r
 *      Return Value\r
-*              int ステータス (SUCCESS/FAIL)\r
+*              int ステータス (FFFTP_SUCCESS/FFFTP_FAIL)\r
 *      Note\r
 *              SHA-1をもちいて32Byte鍵を生成する\r
 *----------------------------------------------------------------------------*/\r
@@ -1622,7 +1622,7 @@ static int CreateAesKey(unsigned char *AesKey, const char* Key)
 \r
        HashKeyLen = strlen(Key) + 16;\r
        if((HashKey = malloc(HashKeyLen + 1)) == NULL){\r
-               return (FAIL);\r
+               return (FFFTP_FAIL);\r
        }\r
 \r
        strcpy(HashKey, Key);\r
@@ -1643,7 +1643,7 @@ static int CreateAesKey(unsigned char *AesKey, const char* Key)
        }\r
        free(HashKey);\r
 \r
-       return (SUCCESS);\r
+       return (FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -1682,7 +1682,7 @@ static int TmpRegType;
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static void SetRegType(int Type)\r
@@ -1700,7 +1700,7 @@ static void SetRegType(int Type)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int OpenReg(char *Name, void **Handle)\r
@@ -1708,17 +1708,17 @@ static int OpenReg(char *Name, void **Handle)
        int Sts;\r
        char Tmp[FMAX_PATH+1];\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                strcpy(Tmp, "Software\\Sota\\");\r
                strcat(Tmp, Name);\r
                if(RegOpenKeyEx(HKEY_CURRENT_USER, Tmp, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == SUCCESS)\r
+               if((Sts = ReadInReg(Name, (REGDATATBL **)Handle)) == FFFTP_SUCCESS)\r
                        ((REGDATATBL *)(*Handle))->Mode = 0;\r
        }\r
        return(Sts);\r
@@ -1733,7 +1733,7 @@ static int OpenReg(char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CreateReg(char *Name, void **Handle)\r
@@ -1742,13 +1742,13 @@ static int CreateReg(char *Name, void **Handle)
        char Tmp[FMAX_PATH+1];\r
        DWORD Dispos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                strcpy(Tmp, "Software\\Sota\\");\r
                strcat(Tmp, Name);\r
                if(RegCreateKeyEx(HKEY_CURRENT_USER, Tmp, 0, "", REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -1758,7 +1758,7 @@ static int CreateReg(char *Name, void **Handle)
                        ((REGDATATBL *)(*Handle))->ValLen = 0;\r
                        ((REGDATATBL *)(*Handle))->Next = NULL;\r
                        ((REGDATATBL *)(*Handle))->Mode = 1;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -1772,7 +1772,7 @@ static int CreateReg(char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CloseReg(void *Handle)\r
@@ -1811,7 +1811,7 @@ static int CloseReg(void *Handle)
                        Pos = Next;\r
                }\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -1864,7 +1864,7 @@ static BOOL WriteOutRegToFile(REGDATATBL *Pos)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadInReg(char *Name, REGDATATBL **Handle)\r
@@ -1877,7 +1877,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
        REGDATATBL *Pos;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        *Handle = NULL;\r
 \r
        if((Strm = fopen(AskIniFilePath(), "rt")) != NULL)\r
@@ -1920,7 +1920,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
                                        }\r
                                }\r
                        }\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                        free(Buf);\r
                }\r
                fclose(Strm);\r
@@ -1938,7 +1938,7 @@ static int ReadInReg(char *Name, REGDATATBL **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int OpenSubKey(void *Parent, char *Name, void **Handle)\r
@@ -1947,11 +1947,11 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
        char Key[80];\r
        REGDATATBL *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegOpenKeyEx(Parent, Name, 0, KEY_READ, (HKEY *)Handle) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -1964,7 +1964,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
                        if(strcmp(Pos->KeyName, Key) == 0)\r
                        {\r
                                *Handle = Pos;\r
-                               Sts = SUCCESS;\r
+                               Sts = FFFTP_SUCCESS;\r
                                break;\r
                        }\r
                        Pos = Pos->Next;\r
@@ -1983,7 +1983,7 @@ static int OpenSubKey(void *Parent, char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CreateSubKey(void *Parent, char *Name, void **Handle)\r
@@ -1992,11 +1992,11 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
        DWORD Dispos;\r
        REGDATATBL *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegCreateKeyEx(Parent, Name, 0, "", REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, (HKEY *)Handle, &Dispos) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -2013,7 +2013,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
                        while(Pos->Next != NULL)\r
                                Pos = Pos->Next;\r
                        Pos->Next = *Handle;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2027,7 +2027,7 @@ static int CreateSubKey(void *Parent, char *Name, void **Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CloseSubKey(void *Handle)\r
@@ -2038,7 +2038,7 @@ static int CloseSubKey(void *Handle)
        {\r
                /* Nothing */\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2050,22 +2050,22 @@ static int CloseSubKey(void *Handle)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DeleteSubKey(void *Handle, char *Name)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegDeleteKey(Handle, Name) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -2079,22 +2079,22 @@ static int DeleteSubKey(void *Handle, char *Name)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int DeleteValue(void *Handle, char *Name)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegDeleteValue(Handle, Name) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -2109,7 +2109,7 @@ static int DeleteValue(void *Handle, char *Name)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)\r
@@ -2118,19 +2118,19 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
        DWORD Size;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                Size = sizeof(int);\r
                if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Value, &Size) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
                if((Pos = ScanValue(Handle, Name)) != NULL)\r
                {\r
                        *Value = atoi(Pos);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2146,7 +2146,7 @@ static int ReadIntValueFromReg(void *Handle, char *Name, int *Value)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteIntValueToReg(void *Handle, char *Name, int Value)\r
@@ -2167,7 +2167,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
                strcat(Data, Tmp);\r
                Pos->ValLen += strlen(Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2181,7 +2181,7 @@ static int WriteIntValueToReg(void *Handle, char *Name, int Value)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)\r
@@ -2189,14 +2189,14 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)\r
                {\r
                        if(*(Str + Size - 1) != NUL)\r
                                *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        else\r
@@ -2206,7 +2206,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
                        Size = min1(Size-1, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Str);\r
                        *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2222,7 +2222,7 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteStringToReg(void *Handle, char *Name, char *Str)\r
@@ -2242,7 +2242,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Str, strlen(Str), Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2256,7 +2256,7 @@ static int WriteStringToReg(void *Handle, char *Name, char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)\r
@@ -2264,14 +2264,14 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Str, &Size) == ERROR_SUCCESS)\r
                {\r
                        if(*(Str + Size - 1) != NUL)\r
                                *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        else\r
@@ -2281,7 +2281,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
                        Size = min1(Size-1, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Str);\r
                        *(Str + Size) = NUL;\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2297,7 +2297,7 @@ static int ReadMultiStringFromReg(void *Handle, char *Name, char *Str, DWORD Siz
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)\r
@@ -2317,7 +2317,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Str, StrMultiLen(Str), Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
@@ -2331,7 +2331,7 @@ static int WriteMultiStringToReg(void *Handle, char *Name, char *Str)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)\r
@@ -2339,11 +2339,11 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
        int Sts;\r
        char *Pos;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(TmpRegType == REGTYPE_REG)\r
        {\r
                if(RegQueryValueEx(Handle, Name, NULL, NULL, (BYTE *)Bin, &Size) == ERROR_SUCCESS)\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
        }\r
        else\r
        {\r
@@ -2351,7 +2351,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
                {\r
                        Size = min1(Size, strlen(Pos));\r
                        Size = StrReadIn(Pos, Size, Bin);\r
-                       Sts = SUCCESS;\r
+                       Sts = FFFTP_SUCCESS;\r
                }\r
        }\r
        return(Sts);\r
@@ -2368,7 +2368,7 @@ static int ReadBinaryFromReg(void *Handle, char *Name, void *Bin, DWORD Size)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)\r
@@ -2388,7 +2388,7 @@ static int WriteBinaryToReg(void *Handle, char *Name, void *Bin, int Len)
                Data = Pos->ValTbl + Pos->ValLen;\r
                Pos->ValLen += StrCatOut(Bin, Len, Data) + 1;\r
        }\r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
index 0f8d401..bda43e6 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -652,7 +652,7 @@ int CommandProcCmd(char *Reply, char *fmt, ...)
 \r
 //     if((Sts = command(AskCmdCtrlSkt(), Reply, "%s", Cmd)) == 429)\r
 //     {\r
-//             if(ReConnectCmdSkt() == SUCCESS)\r
+//             if(ReConnectCmdSkt() == FFFTP_SUCCESS)\r
 //             {\r
                        Sts = command(AskCmdCtrlSkt(), Reply, &CheckCancelFlg, "%s", Cmd);\r
 //             }\r
@@ -690,7 +690,7 @@ int CommandProcTrn(char *Reply, char *fmt, ...)
 \r
 //     if((Sts = command(AskTrnCtrlSkt(), Reply, "%s", Cmd)) == 429)\r
 //     {\r
-//             if(ReConnectTrnSkt() == SUCCESS)\r
+//             if(ReConnectTrnSkt() == FFFTP_SUCCESS)\r
                        Sts = command(AskTrnCtrlSkt(), Reply, &CheckCancelFlg, "%s", Cmd);\r
 //     }\r
        return(Sts);\r
@@ -749,7 +749,7 @@ int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...)
                        strcpy(Reply, "");\r
 \r
                Sts = 429;\r
-               if(SendData(cSkt, Cmd, strlen(Cmd), 0, CancelCheckWork) == SUCCESS)\r
+               if(SendData(cSkt, Cmd, strlen(Cmd), 0, CancelCheckWork) == FFFTP_SUCCESS)\r
                {\r
                        Sts = ReadReplyMessage(cSkt, Reply, 1024, CancelCheckWork, TmpBuf);\r
                }\r
@@ -779,7 +779,7 @@ int command(SOCKET cSkt, char *Reply, int *CancelCheckWork, char *fmt, ...)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)\r
@@ -791,10 +791,10 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
 //     struct timeval *ToutPtr;\r
        int TimeOutErr;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(Skt != INVALID_SOCKET)\r
        {\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
                while(Size > 0)\r
                {\r
 //                     FD_ZERO(&SendFds);\r
@@ -809,13 +809,13 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
 //                     Tmp = select(0, NULL, &SendFds, NULL, ToutPtr);\r
 //                     if(Tmp == SOCKET_ERROR)\r
 //                     {\r
-//                             Sts = FAIL;\r
+//                             Sts = FFFTP_FAIL;\r
 //                             ReportWSError("select", WSAGetLastError());\r
 //                             break;\r
 //                     }\r
 //                     else if(Tmp == 0)\r
 //                     {\r
-//                             Sts = FAIL;\r
+//                             Sts = FFFTP_FAIL;\r
 //                             SetTaskMsg(MSGJPN241);\r
 //                             break;\r
 //                     }\r
@@ -823,13 +823,13 @@ int SendData(SOCKET Skt, char *Data, int Size, int Mode, int *CancelCheckWork)
                        Tmp = do_send(Skt, Data, Size, Mode, &TimeOutErr, CancelCheckWork);\r
                        if(TimeOutErr == YES)\r
                        {\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                                SetTaskMsg(MSGJPN241);\r
                                break;\r
                        }\r
                        else if(Tmp == SOCKET_ERROR)\r
                        {\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                                ReportWSError("send", WSAGetLastError());\r
                                break;\r
                        }\r
@@ -1056,7 +1056,7 @@ static int ReadOneLine(SOCKET cSkt, char *Buf, int Max, int *CancelCheckWork)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)\r
@@ -1069,10 +1069,10 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
        int Sts;\r
        int TimeOutErr;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if(cSkt != INVALID_SOCKET)\r
        {\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
                while(Size > 0)\r
                {\r
 //                     FD_ZERO(&ReadFds);\r
@@ -1088,13 +1088,13 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
 //                     if(i == SOCKET_ERROR)\r
 //                     {\r
 //                             ReportWSError("select", WSAGetLastError());\r
-//                             Sts = FAIL;\r
+//                             Sts = FFFTP_FAIL;\r
 //                             break;\r
 //                     }\r
 //                     else if(i == 0)\r
 //                     {\r
 //                             SetTaskMsg(MSGJPN243);\r
-//                             Sts = FAIL;\r
+//                             Sts = FFFTP_FAIL;\r
 //                             break;\r
 //                     }\r
 \r
@@ -1102,7 +1102,7 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
                        {\r
                                if(TimeOutErr == YES)\r
                                        SetTaskMsg(MSGJPN243);\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                                break;\r
                        }\r
 \r
@@ -1111,7 +1111,7 @@ int ReadNchar(SOCKET cSkt, char *Buf, int Size, int *CancelCheckWork)
                }\r
        }\r
 \r
-       if(Sts == FAIL)\r
+       if(Sts == FFFTP_FAIL)\r
                SetTaskMsg(MSGJPN244);\r
 \r
        return(Sts);\r
@@ -1287,7 +1287,7 @@ void ReportWSError(char *Msg, UINT Error)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int ChangeFnameRemote2Local(char *Fname, int Max)\r
@@ -1297,7 +1297,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
        char *Pos;\r
        CODECONVINFO cInfo;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Buf = malloc(Max)) != NULL)\r
        {\r
                InitCodeConvInfo(&cInfo);\r
@@ -1351,7 +1351,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
                                break;\r
                }\r
                free(Buf);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1365,7 +1365,7 @@ int ChangeFnameRemote2Local(char *Fname, int Max)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int ChangeFnameLocal2Remote(char *Fname, int Max)\r
@@ -1375,7 +1375,7 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
        char *Pos;\r
        CODECONVINFO cInfo;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        if((Buf = malloc(Max)) != NULL)\r
        {\r
                InitCodeConvInfo(&cInfo);\r
@@ -1438,7 +1438,7 @@ int ChangeFnameLocal2Remote(char *Fname, int Max)
                                break;\r
                }\r
                free(Buf);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
diff --git a/sha.c b/sha.c
index 95fa081..1cbb2ed 100644 (file)
--- a/sha.c
+++ b/sha.c
@@ -69,8 +69,8 @@
 #define TRUE  1\r
 #define FALSE 0\r
 \r
-#define SUCCESS 0\r
-#define FAILURE -1\r
+#define FFFTP_SUCCESS 0\r
+#define FFFTP_FAILURE -1\r
 \r
 int sha_file();                         /* External entries */\r
 void sha_stream(), sha_memory();\r
@@ -121,7 +121,7 @@ char **argv;
            if (verbose) printf("%s:", *argv);\r
            file_args = TRUE;           /* Whether or not we could read it */\r
 \r
-           if (sha_file(*argv, hbuf) == FAILURE)\r
+           if (sha_file(*argv, hbuf) == FFFTP_FAILURE)\r
                printf("Can't open file %s.\n", *argv);\r
            else\r
                if (terse) printf("%08lx%08lx%08lx%08lx%08lx\n",\r
@@ -187,11 +187,11 @@ uint32 *buffer;
 \r
        for (i = 0; i < 5; i++)\r
            buffer[i] = 0xdeadbeef;\r
-       return FAILURE;\r
+       return FFFTP_FAILURE;\r
     }\r
     (void) sha_stream(infile, buffer);\r
     fclose(infile);\r
-    return SUCCESS;\r
+    return FFFTP_SUCCESS;\r
 }\r
 \r
 void sha_memory(mem, length, buffer)    /* Hash a memory block */\r
diff --git a/skey.c b/skey.c
index c1aab03..9d39d88 100644 (file)
--- a/skey.c
+++ b/skey.c
@@ -296,7 +296,7 @@ static const char Wp[2048][4] = {
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int Make6WordPass(int seq, char *seed, char *pass, int type, char *buf)\r
@@ -305,13 +305,13 @@ int Make6WordPass(int seq, char *seed, char *pass, int type, char *buf)
        int i;\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
-       if(keycrunch(key, seed, pass, type) != FAIL)\r
+       Sts = FFFTP_FAIL;\r
+       if(keycrunch(key, seed, pass, type) != FFFTP_FAIL)\r
        {\r
                for(i = 0; i < seq; i++)\r
                        secure_hash(key, type);\r
                btoe(key, buf);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -328,7 +328,7 @@ static int keycrunch(char *result, char *seed, char *passwd, int Type)
 \r
        buflen = strlen(seed) + strlen(passwd);\r
        if((buf = malloc(buflen + 1)) == NULL)\r
-               return(FAIL);\r
+               return(FFFTP_FAIL);\r
        strcpy(buf, seed);\r
        strcat(buf, passwd);\r
 \r
@@ -361,7 +361,7 @@ static int keycrunch(char *result, char *seed, char *passwd, int Type)
        /* Only works on byte-addressed little-endian machines!! */\r
        memcpy(result, (char *)results, 8);\r
 \r
-       return(SUCCESS);\r
+       return(FFFTP_SUCCESS);\r
 }\r
 \r
 \r
index 35a50d5..81dc730 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -115,7 +115,7 @@ static ASYNCSIGNALDATABASE SignalDbase[MAX_SIGNAL_ENTRY_DBASE];
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeSocketWin(HWND hWnd, HINSTANCE hInst)\r
@@ -138,7 +138,7 @@ int MakeSocketWin(HWND hWnd, HINSTANCE hInst)
        wClass.hIconSm       = NULL;\r
        RegisterClassEx(&wClass);\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        hWndSocket = CreateWindowEx(0, SocketWndClass, NULL,\r
                        WS_BORDER | WS_POPUP,\r
                        0, 0, 0, 0,\r
@@ -152,7 +152,7 @@ int MakeSocketWin(HWND hWnd, HINSTANCE hInst)
                        Signal[i].Socket = INVALID_SOCKET;\r
                for(i = 0; i < MAX_SIGNAL_ENTRY_DBASE; i++)\r
                        SignalDbase[i].Async = 0;\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
@@ -1015,7 +1015,7 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int CheckClosedAndReconnect(void)\r
@@ -1025,7 +1025,7 @@ int CheckClosedAndReconnect(void)
 \r
 //SetTaskMsg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE_BIT) == YES)\r
        {\r
                Sts = ReConnectCmdSkt();\r
index e86bd50..735dfbb 100644 (file)
@@ -58,14 +58,14 @@ static int SbarColWidth[5] = { 70, 230, 410, 570, -1 };
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeStatusBarWindow(HWND hWnd, HINSTANCE hInst)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        hWndSbar = CreateWindowEx(0,\r
                        STATUSCLASSNAME, NULL,\r
                        WS_CHILD | SBS_SIZEGRIP | WS_CLIPSIBLINGS | SBT_NOBORDERS,\r
@@ -76,7 +76,7 @@ int MakeStatusBarWindow(HWND hWnd, HINSTANCE hInst)
        {\r
                SendMessage(hWndSbar, SB_SETPARTS, sizeof(SbarColWidth)/sizeof(int), (LPARAM)SbarColWidth);\r
                ShowWindow(hWndSbar, SW_SHOW);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
        }\r
        return(Sts);\r
 }\r
index efaf763..1465aa3 100644 (file)
--- a/taskwin.c
+++ b/taskwin.c
@@ -74,14 +74,14 @@ static HANDLE DispLogSemaphore2;
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)\r
 {\r
        int Sts;\r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        hWndTask = CreateWindowEx(/*WS_EX_STATICEDGE*/WS_EX_CLIENTEDGE,\r
                        "EDIT", NULL,\r
                        WS_CHILD | WS_BORDER | ES_AUTOVSCROLL | WS_VSCROLL | ES_MULTILINE | ES_READONLY | WS_CLIPSIBLINGS,\r
@@ -96,7 +96,7 @@ int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)
                        SendMessage(hWndTask, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));\r
 \r
                ShowWindow(hWndTask, SW_SHOW);\r
-               Sts = SUCCESS;\r
+               Sts = FFFTP_SUCCESS;\r
 \r
                DispLogSemaphore = CreateSemaphore(NULL, 1, 1, NULL);\r
                DispLogSemaphore2 = CreateSemaphore(NULL, 1, 1, NULL);\r
@@ -211,7 +211,7 @@ void SetTaskMsg(char *szFormat, ...)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int SaveTaskMsg(char *Fname)\r
@@ -222,7 +222,7 @@ int SaveTaskMsg(char *Fname)
        int Sts;\r
 \r
 \r
-       Sts = FAIL;\r
+       Sts = FFFTP_FAIL;\r
        Size = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);\r
        if((Buf = malloc(Size)) != NULL)\r
        {\r
@@ -230,10 +230,10 @@ int SaveTaskMsg(char *Fname)
                {\r
                        SendMessage(GetTaskWnd(), WM_GETTEXT, Size, (LPARAM)Buf);\r
                        if(fwrite(Buf, strlen(Buf), 1, Strm) == 1)\r
-                               Sts = SUCCESS;\r
+                               Sts = FFFTP_SUCCESS;\r
                        fclose(Strm);\r
 \r
-                       if(Sts == FAIL)\r
+                       if(Sts == FFFTP_FAIL)\r
                                _unlink(Fname);\r
                }\r
                free(Buf);\r
@@ -259,7 +259,7 @@ void DispTaskMsg(void)
        SetYenTail(Buf);\r
        strcat(Buf, "_ffftp.tsk");\r
 \r
-       if(SaveTaskMsg(Buf) == SUCCESS)\r
+       if(SaveTaskMsg(Buf) == FFFTP_SUCCESS)\r
        {\r
                AddTempFileList(Buf);\r
                ExecViewer(Buf, 0);\r
diff --git a/tool.c b/tool.c
index efdf606..dbd7a60 100644 (file)
--- a/tool.c
+++ b/tool.c
@@ -122,7 +122,7 @@ static BOOL CALLBACK OtpCalcWinProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
                                                /* Seed */\r
                                                if((Pos = GetNextField(Pos)) != NULL)\r
                                                {\r
-                                                       if(GetOneField(Pos, Seed, MAX_SEED_LEN) == SUCCESS)\r
+                                                       if(GetOneField(Pos, Seed, MAX_SEED_LEN) == FFFTP_SUCCESS)\r
                                                        {\r
                                                                Make6WordPass(Seq, Seed, Pass, Type, Tmp);\r
                                                        }\r
index ceeeab4..1aa3595 100644 (file)
@@ -206,7 +206,7 @@ static const int HideMenus[] = {
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)\r
@@ -351,14 +351,14 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst)
                }\r
        }\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if((hWndTbarMain == NULL) ||\r
           (hWndTbarLocal == NULL) ||\r
           (hWndTbarRemote == NULL) ||\r
           (hWndDirLocal == NULL) ||\r
           (hWndDirRemote == NULL))\r
        {\r
-               Sts = FAIL;\r
+               Sts = FFFTP_FAIL;\r
        }\r
        return(Sts);\r
 }\r
@@ -385,7 +385,7 @@ static LRESULT CALLBACK HistEditBoxWndProc(HWND hWnd, UINT message, WPARAM wPara
                                else\r
                                {\r
                                        SendMessage(hWndDirRemoteEdit, WM_GETTEXT, FMAX_PATH+1, (LPARAM)Tmp);\r
-                                       if(CheckClosedAndReconnect() == SUCCESS)\r
+                                       if(CheckClosedAndReconnect() == FFFTP_SUCCESS)\r
                                        {\r
                                                if(DoCWD(Tmp, YES, NO, YES) < FTP_RETRY)\r
                                                        GetRemoteDirForWnd(CACHE_NORMAL, &CancelFlg);\r
@@ -925,7 +925,7 @@ int AskTransferTypeAssoc(char *Fname, int Type)
                        Pos = AsciiExt;\r
                        while(*Pos != NUL)\r
                        {\r
-                               if(CheckFname(Name, Pos) == SUCCESS)\r
+                               if(CheckFname(Name, Pos) == FFFTP_SUCCESS)\r
                                {\r
                                        Ret = TYPE_A;\r
                                        break;\r
index daa2026..42aeb70 100644 (file)
@@ -51,7 +51,7 @@ static int CheckNameMatch(char *str, char *regexp);
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *\r
 *      Note\r
 *              VAX VMSの時は ; 以降は無視する\r
@@ -84,14 +84,14 @@ int CheckFname(char *str, char *regexp)
        if((strcmp(p1, "*.*") == 0) || (strcmp(p1, "????????.???") == 0))\r
                strcpy(p1, "*");\r
 \r
-       Sts = SUCCESS;\r
+       Sts = FFFTP_SUCCESS;\r
        if(strcmp(p1, "*") != 0)\r
        {\r
                if(strcmp(p1, "*.") == 0)\r
                {\r
                        p = strchr(p2, '.');\r
                        if((p != NULL) && (*(p+1) != NUL))\r
-                               Sts = FAIL;\r
+                               Sts = FFFTP_FAIL;\r
                }\r
                else\r
                        Sts = CheckNameMatch(p2, p1);\r
@@ -108,7 +108,7 @@ int CheckFname(char *str, char *regexp)
 *\r
 *      Return Value\r
 *              int ステータス\r
-*                      SUCCESS/FAIL\r
+*                      FFFTP_SUCCESS/FFFTP_FAIL\r
 *----------------------------------------------------------------------------*/\r
 \r
 static int CheckNameMatch(char *str, char *regexp)\r
@@ -128,23 +128,23 @@ static int CheckNameMatch(char *str, char *regexp)
                                /* Look for a character matching the one after the '*' */\r
                                p++;\r
                                if(*p == NUL)\r
-                                       return SUCCESS; /* Automatic match */\r
+                                       return FFFTP_SUCCESS; /* Automatic match */\r
                                while(*str != NUL)\r
                                {\r
                                        while((*str != NUL) && (toupper(*p)!=toupper(*str)))\r
                                                str++;\r
                                        if(CheckNameMatch(str, p))\r
-                                               return SUCCESS;\r
+                                               return FFFTP_SUCCESS;\r
                                        if(*str == NUL)\r
-                                               return FAIL;\r
+                                               return FFFTP_FAIL;\r
                                        else\r
                                                str++;\r
                                }\r
-                               return FAIL;\r
+                               return FFFTP_FAIL;\r
 \r
                        default:\r
                                if(toupper(*str) != toupper(*p))\r
-                                       return FAIL;\r
+                                       return FFFTP_FAIL;\r
                                str++;\r
                                p++;\r
                                break;\r
@@ -152,10 +152,10 @@ static int CheckNameMatch(char *str, char *regexp)
        }\r
 \r
        if((*p == NUL) && (*str == NUL))\r
-               return SUCCESS;\r
+               return FFFTP_SUCCESS;\r
 \r
        if ((*p != NUL) && (str[0] == '.') && (str[1] == 0))\r
-               return(SUCCESS);\r
+               return(FFFTP_SUCCESS);\r
   \r
        if ((*str == NUL) && (*p == '?'))\r
        {\r
@@ -165,8 +165,8 @@ static int CheckNameMatch(char *str, char *regexp)
        }\r
 \r
        if((*str == NUL) && (*p == '*') && (p[1] == '\0'))\r
-               return SUCCESS;\r
+               return FFFTP_SUCCESS;\r
 \r
-       return FAIL;\r
+       return FFFTP_FAIL;\r
 }\r
 \r