OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FFFTPのソースコードです。


Commit MetaInfo

Revisãoa6ad52fc660a65af4a3a9680a2aeaf1aebceaeb5 (tree)
Hora2013-10-19 20:03:05
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Mensagem de Log

Fix spelling mistakes.

Mudança Sumário

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
--- a/common.h
+++ b/common.h
@@ -316,7 +316,7 @@
316316 // uClinux
317317 #define LIST_UNIX_17 51 /* UNIX 17 */
318318 // Windows Server 2008 R2
319-#define LIST_DOS_5 52 /* MS-DOS 4 */
319+#define LIST_DOS_5 52 /* MS-DOS 5 */
320320
321321 #define LIST_MELCOM 0x100 /* MELCOM80 */
322322
--- a/connect.c
+++ b/connect.c
@@ -99,7 +99,7 @@ extern int FwallPort;
9999 extern int FwallType;
100100 extern int FwallDefault;
101101 extern int FwallSecurity;
102-extern int FwallResolv;
102+extern int FwallResolve;
103103 extern int FwallLower;
104104 extern int FwallDelimiter;
105105 extern int PasvDefault;
@@ -2018,7 +2018,7 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
20182018 if((Type == MD4) || (Type == MD5) || (Type == SHA1))
20192019 {
20202020 /* シーケンス番号を見つけるループ */
2021- DoPrintf("Analize OTP");
2021+ DoPrintf("Analyze OTP");
20222022 DoPrintf("%s", Pos);
20232023 Sts = FFFTP_FAIL;
20242024 while((Pos = GetNextField(Pos)) != NULL)
@@ -2248,7 +2248,7 @@ SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
22482248 // ホスト名が指定された
22492249 // ホスト名からアドレスを求める
22502250 if(((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER)) &&
2251- (FwallResolv == YES))
2251+ (FwallResolve == YES))
22522252 {
22532253 // ホスト名解決はSOCKSサーバに任せる
22542254 pHostEntry = NULL;
@@ -2453,7 +2453,7 @@ SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
24532453 // ホスト名が指定された
24542454 // ホスト名からアドレスを求める
24552455 if(((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER)) &&
2456- (FwallResolv == YES))
2456+ (FwallResolve == YES))
24572457 {
24582458 // ホスト名解決はSOCKSサーバに任せる
24592459 pHostEntry = NULL;
--- a/filelist.c
+++ b/filelist.c
@@ -98,14 +98,14 @@ static int GetListOneLine(char *Buf, int Max, FILE *Fd);
9898 static int MakeDirPath(char *Str, int ListType, char *Path, char *Dir);
9999 static void MakeLocalTree(char *Path, FILELIST **Base);
100100 static void AddFileList(FILELIST *Pkt, FILELIST **Base);
101-static int AnalizeFileInfo(char *Str);
101+static int AnalyzeFileInfo(char *Str);
102102 static int CheckUnixType(char *Str, char *Tmp, int Add1, int Add2, int Day);
103103 static int CheckHHMMformat(char *Str);
104104 static int CheckYYMMDDformat(char *Str, char Sym, int Dig3);
105105 static int CheckYYYYMMDDformat(char *Str, char Sym);
106106 // Windows Server 2008 R2
107107 static int CheckMMDDYYYYformat(char *Str, char Sym);
108-static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist);
108+static int ResolveFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist);
109109 static int FindField(char *Str, char *Buf, int Num, int ToLast);
110110 // MLSD対応
111111 static int FindField2(char *Str, char *Buf, char Separator, int Num, int ToLast);
@@ -1303,9 +1303,9 @@ void GetRemoteDirForWnd(int Mode, int *CancelCheckWork)
13031303
13041304 while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)
13051305 {
1306- if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)
1306+ if((ListType = AnalyzeFileInfo(Str)) != LIST_UNKNOWN)
13071307 {
1308- if((Type = ResolvFileInfo(Str, ListType, Buf, &Size, &Time, &Attr, Owner, &Link, &InfoExist)) != NODE_NONE)
1308+ if((Type = ResolveFileInfo(Str, ListType, Buf, &Size, &Time, &Attr, Owner, &Link, &InfoExist)) != NODE_NONE)
13091309 {
13101310 if(AskFilterStr(Buf, Type) == YES)
13111311 {
@@ -3195,7 +3195,7 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
31953195
31963196 while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)
31973197 {
3198- if((ListType = AnalizeFileInfo(Str)) == LIST_UNKNOWN)
3198+ if((ListType = AnalyzeFileInfo(Str)) == LIST_UNKNOWN)
31993199 {
32003200 if(MakeDirPath(Str, ListType, Path, Dir) == FFFTP_SUCCESS)
32013201 {
@@ -3215,7 +3215,7 @@ void AddRemoteTreeToFileList(int Num, char *Path, int IncDir, FILELIST **Base)
32153215 }
32163216 else
32173217 {
3218- Node = ResolvFileInfo(Str, ListType, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);
3218+ Node = ResolveFileInfo(Str, ListType, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);
32193219
32203220 if(AskFilterStr(Name, Node) == YES)
32213221 {
@@ -3576,7 +3576,7 @@ FILELIST *SearchFileList(char *Fname, FILELIST *Base, int Caps)
35763576 * int リストタイプ (LIST_xxx)
35773577 *----------------------------------------------------------------------------*/
35783578
3579-static int AnalizeFileInfo(char *Str)
3579+static int AnalyzeFileInfo(char *Str)
35803580 {
35813581 int Ret;
35823582 char Tmp[FMAX_PATH+1];
@@ -4403,7 +4403,7 @@ static int CheckMMDDYYYYformat(char *Str, char Sym)
44034403 * int 種類 (NODE_xxxx)
44044404 *----------------------------------------------------------------------------*/
44054405
4406-static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist)
4406+static int ResolveFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist)
44074407 {
44084408 SYSTEMTIME sTime;
44094409 SYSTEMTIME sTimeNow;
@@ -6177,10 +6177,10 @@ int AnalyzeNameKanjiCode(int Num)
61776177 {
61786178 while(GetListOneLine(Str, FMAX_PATH, fd) == FFFTP_SUCCESS)
61796179 {
6180- if((ListType = AnalizeFileInfo(Str)) != LIST_UNKNOWN)
6180+ if((ListType = AnalyzeFileInfo(Str)) != LIST_UNKNOWN)
61816181 {
61826182 strcpy(Name, "");
6183- Node = ResolvFileInfo(Str, ListType | LIST_RAW_NAME, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);
6183+ Node = ResolveFileInfo(Str, ListType | LIST_RAW_NAME, Name, &Size, &Time, &Attr, Owner, &Link, &InfoExist);
61846184 p = Name;
61856185 while(*p != '\0')
61866186 {
--- a/main.c
+++ b/main.c
@@ -209,7 +209,7 @@ int FwallPort = PORT_NOR;
209209 int FwallType = 1;
210210 int FwallDefault = NO;
211211 int FwallSecurity = SECURITY_AUTO;
212-int FwallResolv = NO;
212+int FwallResolve = NO;
213213 int FwallLower = NO;
214214 int FwallDelimiter = '@';
215215 // ルータ対策
--- a/option.c
+++ b/option.c
@@ -136,7 +136,7 @@ extern int FwallPort;
136136 extern int FwallType;
137137 extern int FwallDefault;
138138 extern int FwallSecurity;
139-extern int FwallResolv;
139+extern int FwallResolve;
140140 extern int FwallLower;
141141 extern int FwallDelimiter;
142142 extern int PasvDefault;
@@ -1428,7 +1428,7 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
14281428
14291429 SendDlgItemMessage(hDlg, FIRE_USEIT, BM_SETCHECK, FwallDefault, 0);
14301430 SendDlgItemMessage(hDlg, FIRE_PASV, BM_SETCHECK, PasvDefault, 0);
1431- SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_SETCHECK, FwallResolv, 0);
1431+ SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_SETCHECK, FwallResolve, 0);
14321432 SendDlgItemMessage(hDlg, FIRE_LOWER, BM_SETCHECK, FwallLower, 0);
14331433
14341434 SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_ADDSTRING, 0, (LPARAM)MSGJPN212);
@@ -1455,7 +1455,7 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
14551455 FwallDelimiter = Tmp[0];
14561456 FwallDefault = SendDlgItemMessage(hDlg, FIRE_USEIT, BM_GETCHECK, 0, 0);
14571457 PasvDefault = SendDlgItemMessage(hDlg, FIRE_PASV, BM_GETCHECK, 0, 0);
1458- FwallResolv = SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_GETCHECK, 0, 0);
1458+ FwallResolve = SendDlgItemMessage(hDlg, FIRE_RESOLV, BM_GETCHECK, 0, 0);
14591459 FwallLower = SendDlgItemMessage(hDlg, FIRE_LOWER, BM_GETCHECK, 0, 0);
14601460 FwallSecurity = SendDlgItemMessage(hDlg, FIRE_SECURITY, CB_GETCURSEL, 0, 0);
14611461 break;
--- a/protectprocess.c
+++ b/protectprocess.c
@@ -94,12 +94,12 @@ _CryptCATAdminCalcHashFromFileHandle p_CryptCATAdminCalcHashFromFileHandle;
9494
9595 #define MAX_LOCKED_THREAD 16
9696 #define MAX_TRUSTED_FILENAME_TABLE 16
97-#define MAX_TRUSTED_MD5_HASH_TABLE 16
97+#define MAX_TRUSTED_SHA1_HASH_TABLE 16
9898
9999 DWORD g_ProcessProtectionLevel;
100100 DWORD g_LockedThread[MAX_LOCKED_THREAD];
101101 WCHAR* g_pTrustedFilenameTable[MAX_TRUSTED_FILENAME_TABLE];
102-BYTE g_TrustedMD5HashTable[MAX_TRUSTED_MD5_HASH_TABLE][20];
102+BYTE g_TrustedSHA1HashTable[MAX_TRUSTED_SHA1_HASH_TABLE][20];
103103 WNDPROC g_PasswordEditControlProc;
104104
105105 // 以下フック関数
@@ -379,9 +379,9 @@ BOOL FindTrustedModuleSHA1Hash(void* pHash)
379379 int i;
380380 bResult = FALSE;
381381 i = 0;
382- while(i < MAX_TRUSTED_MD5_HASH_TABLE)
382+ while(i < MAX_TRUSTED_SHA1_HASH_TABLE)
383383 {
384- if(memcmp(&g_TrustedMD5HashTable[i], pHash, 20) == 0)
384+ if(memcmp(&g_TrustedSHA1HashTable[i], pHash, 20) == 0)
385385 {
386386 bResult = TRUE;
387387 break;
@@ -852,11 +852,11 @@ BOOL RegisterTrustedModuleSHA1Hash(void* pHash)
852852 else
853853 {
854854 i = 0;
855- while(i < MAX_TRUSTED_MD5_HASH_TABLE)
855+ while(i < MAX_TRUSTED_SHA1_HASH_TABLE)
856856 {
857- if(memcmp(&g_TrustedMD5HashTable[i], &NullHash, 20) == 0)
857+ if(memcmp(&g_TrustedSHA1HashTable[i], &NullHash, 20) == 0)
858858 {
859- memcpy(&g_TrustedMD5HashTable[i], pHash, 20);
859+ memcpy(&g_TrustedSHA1HashTable[i], pHash, 20);
860860 bResult = TRUE;
861861 break;
862862 }
@@ -874,11 +874,11 @@ BOOL UnregisterTrustedModuleSHA1Hash(void* pHash)
874874 int i;
875875 bResult = FALSE;
876876 i = 0;
877- while(i < MAX_TRUSTED_MD5_HASH_TABLE)
877+ while(i < MAX_TRUSTED_SHA1_HASH_TABLE)
878878 {
879- if(memcmp(&g_TrustedMD5HashTable[i], pHash, 20) == 0)
879+ if(memcmp(&g_TrustedSHA1HashTable[i], pHash, 20) == 0)
880880 {
881- memcpy(&g_TrustedMD5HashTable[i], &NullHash, 20);
881+ memcpy(&g_TrustedSHA1HashTable[i], &NullHash, 20);
882882 bResult = TRUE;
883883 break;
884884 }
--- a/registry.c
+++ b/registry.c
@@ -165,7 +165,7 @@ extern int FwallPort;
165165 extern int FwallType;
166166 extern int FwallDefault;
167167 extern int FwallSecurity;
168-extern int FwallResolv;
168+extern int FwallResolve;
169169 extern int FwallLower;
170170 extern int FwallDelimiter;
171171 extern int PasvDefault;
@@ -455,7 +455,7 @@ void SaveRegistry(void)
455455 WriteIntValueToReg(hKey4, "FwallDef", FwallDefault);
456456 WriteIntValueToReg(hKey4, "FwallSec", FwallSecurity);
457457 WriteIntValueToReg(hKey4, "PasvDef", PasvDefault);
458- WriteIntValueToReg(hKey4, "FwallRes", FwallResolv);
458+ WriteIntValueToReg(hKey4, "FwallRes", FwallResolve);
459459 WriteIntValueToReg(hKey4, "FwallLow", FwallLower);
460460 WriteIntValueToReg(hKey4, "FwallDel", FwallDelimiter);
461461
@@ -906,7 +906,7 @@ int LoadRegistry(void)
906906 ReadIntValueFromReg(hKey4, "FwallDef", &FwallDefault);
907907 ReadIntValueFromReg(hKey4, "FwallSec", &FwallSecurity);
908908 ReadIntValueFromReg(hKey4, "PasvDef", &PasvDefault);
909- ReadIntValueFromReg(hKey4, "FwallRes", &FwallResolv);
909+ ReadIntValueFromReg(hKey4, "FwallRes", &FwallResolve);
910910 ReadIntValueFromReg(hKey4, "FwallLow", &FwallLower);
911911 ReadIntValueFromReg(hKey4, "FwallDel", &FwallDelimiter);
912912