Commit: fade6db78df2af1e75f0cdb7b68240eea92c1c54 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: fade6db78df2af1e75f0cdb7b68240eea92c1c54 (tree)
• Hora: 2012-10-25 23:58:43
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Add support for uClinux ftpd (untested).

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: filelist.c

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
@@ -313,6 +313,8 @@
 #if defined(HAVE_TANDEM)
 #define LIST_TANDEM		50		/* HP NonStop Server */
 #endif
+// uClinux
+#define LIST_UNIX_17	51		/* UNIX 17 */
 
 #define LIST_MELCOM		0x100	/* MELCOM80 */
 
@@ -694,6 +696,17 @@ LIST_UNIX_70
 	drwxr-x--- 3 root root      4096 2011-12-06 23:39 ..
 	-rw-r----- 1 root root       251 2011-12-06 23:39 .hoge
 
+// uClinux
+*LIST_UNIX_17
+	0          1 2 3 4   5
+	-------------------------------------------------------
+	-rw-r--r-- 1 0 0 100 services
+	lrwxrwxrwx 1 0 0 20 resolv.conf -> /var/run/resolv.conf
+	drwxr-sr-x 1 0 0 0 rc.d
+	-rw-r--r-- 1 0 0 290 rc
+	-rw-r--r-- 1 0 0 34 passwd
+	lrwxrwxrwx 1 0 0 18 inittab -> ../var/tmp/inittab
+
 *LIST_TANDEM
 	 0             1               2    3         4        5       6
 	---------------------------------------------------------------

--- a/filelist.c
+++ b/filelist.c
@@ -3653,6 +3653,13 @@ static int AnalizeFileInfo(char *Str)
 
 				if((Ret != LIST_UNKNOWN) && (Flag1 == YES))
 					Ret |= LIST_MELCOM;
+
+				// uClinux
+				if((Ret == LIST_UNKNOWN) &&
+				   (FindField(Str, Tmp, 5+Add1, NO) == FFFTP_SUCCESS))
+				{
+					Ret = LIST_UNIX_17;
+				}
 			}
 		}
 
@@ -5143,6 +5150,8 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 //		case LIST_MELCOM :
 		// linux-ftpd
 		case LIST_UNIX_16 :
+		// uClinux
+		case LIST_UNIX_17 :
 		default:
 			/* offsはサイズの位置, offs=0はカラム4 */
 			offs = 0;
@@ -5198,6 +5207,9 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			   (ListType == LIST_UNIX_73) ||
 			   (ListType == LIST_UNIX_16))
 				offs2 = -1;
+			// uClinux
+			if(ListType == LIST_UNIX_17)
+				offs2 = -3;
 
 			/* offs3はオーナ名の位置 */
 			offs3 = 0;
@@ -5228,6 +5240,9 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 			   (ListType == LIST_UNIX_74) ||
 			   (ListType == LIST_UNIX_75))
 				Flag2 = 1;
+			// uClinux
+			if(ListType == LIST_UNIX_17)
+				Flag2 = -1;
 
 			*InfoExist |= (FINFO_DATE | FINFO_SIZE | FINFO_ATTR);
 
@@ -5325,6 +5340,11 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 					}
 				}
 			}
+			// uClinux
+			else if(Flag2 == -1)
+			{
+				*InfoExist &= ~(FINFO_DATE | FINFO_TIME);
+			}
 			else
 			{
 				/* LIST_UNIX_?4, LIST_UNIX_?5 の時 */