modify ls

Author: seheee

EXT2

@@ -0,0 +1 @@
+Subproject commit d91f9bfd6f2280d7a1f797c7b7557c6400d3a6a7

disksim.o

@@ -519,8 +519,10 @@ int insert_entry(UINT32 inode_num, EXT2_NODE * retEntry)
 
 			data_read(entry.fs, entry.location.group, entry.location.block, sector);
 			printf("새로운 엔트리 추가 끝1\n");
+			printf("retEntry->entry : %s\n", retEntry->entry.name);
 			//ent[entry.location.offset] = retEntry->entry;
 			memcpy(&ent[entry.location.offset], &retEntry->entry, sizeof(EXT2_DIR_ENTRY));
+			printf("ent[offset] : %s\n", ent[entry.location.offset].name);
 			printf("새로운 엔트리 추가 끝2\n");
 			data_write(entry.fs, entry.location.group, entry.location.block, sector);
 			printf("새로운 엔트리 추가 끝3\n");
@@ -672,7 +674,7 @@ int data_read(EXT2_FILESYSTEM * fs, SECTOR group, SECTOR block, BYTE* sector)
 	  	{printf("2\n");
      	return EXT2_ERROR;} 
 
-    blockLocation =1+ group* sector_num_per_group  + block;
+    blockLocation = 1+group* sector_num_per_group  + block;
     printf("blocklocation:%d\n", blockLocation);
 	printf("aa\n");
    fs->disk->read_sector(fs->disk,blockLocation   ,sector);
@@ -687,7 +689,7 @@ int data_write(EXT2_FILESYSTEM * fs, SECTOR group, SECTOR block, BYTE* sector)
       if(group<0 || group>NUMBER_OF_GROUPS)
       return EXT2_ERROR; 
 
-    blockLocation = 1+group* sector_num_per_group +17 + block;
+    blockLocation = 1+group* sector_num_per_group + block;
 
 
    fs->disk->write_sector(fs->disk,blockLocation   ,sector);
@@ -708,6 +710,8 @@ str++;
 }
 }
 
+
+
 int format_name(EXT2_FILESYSTEM* fs, char* name)
 {
 	INT32 length = strlen(name);
@@ -966,7 +970,12 @@ int get_inode(EXT2_FILESYSTEM * fs, const UINT32 inode, INODE *inodeBuffer)
 	printf("1\n");
 
 	// for문 안써도 됨. offset 계산해서 더해주면 됨
-	memcpy(inodeBuffer, &inode_table[inode_offset%8], sizeof(INODE));
+	for(int i = 1; i < (inode_offset % 8); i++)
+		inode_table++;
+	
+
+	*inodeBuffer = *inode_table;
+
 
 	return EXT2_SUCCESS;
 }
@@ -1305,9 +1314,11 @@ int ext2_read_dir(EXT2_NODE* dir, EXT2_NODE_ADD adder, void* list)
 	int entriesPerSector = (MAX_SECTOR_SIZE/sizeof(EXT2_DIR_ENTRY));
 	INODE* inodeBuffer; 
 	inodeBuffer = (INODE *)sector ;
-		printf("%d\n",dir->entry.inode);
+
+	printf("%d\n",dir->entry.inode);
 	get_inode(dir->fs,dir->entry.inode,inodeBuffer);
 	printf("%d\n",dir->entry.inode);
+
 	int  inodeGroup  = dir->entry.inode/ (dir->fs->sb.inode_per_group+1); // 몇번째 아이노드 그룹인지 
 	printf("hello world\n");
    if(dir->entry.inode==2)// 루트 디렉토리일경우 
@@ -1353,20 +1364,25 @@ int read_dir_from_sector(EXT2_FILESYSTEM* fs, BYTE* sector, EXT2_NODE_ADD adder,
 
 	  for( i=0; i<entriesPerSector ; i++)
 	  {
-
-       if(dir->name[0]== DIR_ENTRY_FREE)
-	    continue ;
+		  printf("dir->name : %s\n", dir->name);
+		if(dir->name[0]== DIR_ENTRY_FREE)
+			continue ;
 		else if(dir->name[0]==DIR_ENTRY_NO_MORE)
-		break;
-		else 
-     {
+		{
+			printf("nomore\n");
+				break;
+		}
 
-     node.fs = fs;
-	 node.entry=*dir;
-    node.location.offset =i; 
-     adder(fs,list,&node);
-	 }
-          dir ++;
+		else 
+		{
+			node.fs = fs;
+			node.entry=*dir;
+			//memcpy(&node.entry, dir, sizeof(EXT2_DIR_ENTRY));
+			node.location.offset =i; 
+			adder(fs,list,&node);
+			printf("adder, list : %s\n", list);
+		}
+		dir ++;
 	  }
 	  return (i == entriesPerSector ? 0:1);  
 }

entrylist.o

@@ -251,7 +251,9 @@ int ext2_entry_to_shell_entry(EXT2_FILESYSTEM* fs, const EXT2_NODE* ext2_entry,
 {
 	EXT2_NODE* entry = (EXT2_NODE*)shell_entry->pdata;
 	INODE inodeBuffer;
-	BYTE* str = "/";
+	//BYTE* str = "/";
+	BYTE str [MAX_NAME_LENGTH];
+	str[0]="/";
 
 	ZeroMemory(shell_entry, sizeof(SHELL_ENTRY));
 
@@ -265,12 +267,13 @@ int ext2_entry_to_shell_entry(EXT2_FILESYSTEM* fs, const EXT2_NODE* ext2_entry,
 	if (ext2_entry->entry.name[0] != '.' && inode == 2);
 	else {
 		printf("1\n");
-		str = shell_entry->name;
+		*str = shell_entry->name;
 		 printf("ddfsf \n");
-		str = my_strncpy(str, ext2_entry->entry.name, 8);
+		memcpy(&str[1], ext2_entry->entry.name, MAX_NAME_LENGTH);
 
-		 printf("ddfsf \n");
-	/*	if (ext2_entry->entry.name[8] != 0x20)
+		 printf("str : %s\n", str);
+		 printf("ext2_entry->entry.name; : %s\n", ext2_entry->entry.name);
+		/*if (ext2_entry->entry.name[8] != 0x20)
 		{    printf("ddfsf \n");
 
 			str = my_strncpy(str, ".", 1);
@@ -323,7 +326,7 @@ int fs_read_dir(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_
 	shell_entry_to_ext2_entry(parent, &entry);
 	printf("before reading directory \n");
 	ext2_read_dir(&entry, adder, list);
-          printf("after reading directory \n");
+    printf("after reading directory \n");
 	return EXT2_SUCCESS;
 }
 

ext2.c

@@ -558,7 +558,7 @@ int shell_cmd_cat(int argc, char* argv[])
 
 int shell_cmd_ls(int argc, char* argv[])
 {
-	SHELL_ENTRY_LIST		list;
+	SHELL_ENTRY_LIST		list = {0, };
 	SHELL_ENTRY_LIST_ITEM*	current;
 
 	if (argc > 2)