mid modifying

Author: joongsukim

ext2.c

@@ -8,7 +8,103 @@ typedef struct
 #define MAX( a, b ) ( ( a ) > ( b ) ? ( a ) : ( b ) )
 int* get_data_block_at_inode(EXT2_FILESYSTEM *fs, INODE *inode);
 int ext2_write(EXT2_NODE* file, unsigned long offset, unsigned long length, const char* buffer)
-{
+{  
+	int writeEnd ;
+  int currentOffset ,currentBlock , blockSeq,copyLength ;
+  int fileSize ,i=0  ;
+  INODE * inodeBuffer ;
+  char sector[MAX_SECTOR_SIZE];
+  ZeroMemory(sector,sizeof(sector));
+ inodeBuffer = (INODE *)sector ;
+  int * dataBlocks;
+  get_inode(file->fs,file->entry.inode,&inodeBuffer);
+  // 새로만든 파일이라서 쓸 블럭이 없으면 추가시켜준다 
+   printf("hello \n");
+  if(inodeBuffer->blocks==0)
+  {
+    expand_block(file->fs,file->entry.inode);
+    printf("블럭이 없어서 추가시켜줬어영\n");
+  }       
+  get_inode(file->fs,file->entry.inode,inodeBuffer);  
+  currentOffset = offset ;  // 어디부터 쓸건지 
+   fileSize =inodeBuffer->blocks;  // 파일 사이즈를 기록한다  
+
+   printf("%d \n",fileSize) ;
+   while((offset) >(inodeBuffer->blocks*MAX_BLOCK_SIZE-1))   // offset이 가지고 있는 블록보다 클경우 
+   {
+        
+      expand_block(file->fs,file->entry.inode);
+   }
+   
+   
+     dataBlocks =get_data_block_at_inode(file->fs,&inodeBuffer); // 블럭 받는다 
+      printf("  aaa %d\n"   ,dataBlocks[0]);
+      writeEnd =  MIN(offset +length , fileSize *MAX_BLOCK_SIZE);  // 어디까지 쓸건지 
+  int blockOffset = currentOffset % MAX_BLOCK_SIZE ;   // 해당 블록 내에서의 위치 
+   printf("hello \n");  
+   while((offset) >(inodeBuffer->blocks*MAX_BLOCK_SIZE-1))
+   {
+       dataBlocks[++i];
+   }        // 해당 블럭을 찾는 일 
+    
+    currentBlock = dataBlocks[i]; // 몇번째 블록 부터 읽을지 정한다 
+
+	ZeroMemory(sector,sizeof(sector));
+	 printf("hello \n");  
+   while(currentOffset<writeEnd)  // 어디까지 읽을지 정하는 것 
+   {       printf("여기까진함 \n");
+         data_read(file->fs ,file->location.group ,currentBlock,sector);  // 일단 해당 그룹의 블록을 읽어온다 
+		 printf("여기까진함 \n");
+        copyLength =MIN(MAX_BLOCK_SIZE-blockOffset , writeEnd - currentOffset );
+      memcpy(&sector[blockOffset],buffer,copyLength);
+	   data_write(file->fs,file->location.group,currentBlock,sector);
+        buffer += copyLength ; // 읽은만큼 더해준다 
+        currentOffset += offset ;       
+   }
+
+  return currentOffset - offset ; // 얼마나 읽었는지 알려준다 
+}
+int ext2_read(EXT2_NODE * file, unsigned long offset , unsigned long length , const char * buffer)
+{   
+
+	printf("hello \n");
+  int readEnd ;
+  int currentOffset ,currentBlock , blockSeq,copyLength ;
+  int fileSize ,i=0  ;
+  INODE * inodeBuffer ;
+  char sector[MAX_SECTOR_SIZE];
+  ZeroMemory(sector,sizeof(sector));
+  inodeBuffer = (INODE *)sector ;
+  int * dataBlocks;
+   get_inode(file->fs,file->entry.inode,inodeBuffer);
+   if(inodeBuffer->blocks==0)   // 파일에 해당되는 블록이 아예없을경우 
+   {
+     return EXT2_ERROR ;
+   }
+  dataBlocks =get_data_block_at_inode(file->fs,inodeBuffer); 
+  currentOffset = offset ;
+  fileSize =inodeBuffer->blocks;
+   readEnd =  MIN(offset +length , fileSize *MAX_BLOCK_SIZE);
+  int blockOffset = currentOffset % MAX_BLOCK_SIZE ;   // 해당 블록 내에서 몇번째 섹터인지 
+  printf("hello 2\n");
+  printf("   %d",dataBlocks[i]);
+   while((offset/MAX_BLOCK_SIZE) > i )
+   {
+       dataBlocks[++i];
+   }        // 해당 블럭을 찾는 일 
+    currentBlock = dataBlocks[i]; // 몇번째 블록 부터 읽을지 정한다 
+	ZeroMemory(sector,sizeof(sector));
+	printf("hello 3\n");
+   while(currentOffset<readEnd)  // 어디까지 읽을지 정하는 것 
+   {     
+         data_read(file->fs ,file->location.group ,currentBlock,sector);  // 일단 해당 그룹의 블록을 읽어온다 
+        copyLength =MIN(MAX_BLOCK_SIZE-blockOffset , readEnd - currentOffset );
+      memcpy(buffer,&sector[blockOffset],copyLength);
+        buffer += copyLength ; // 읽은만큼 더해준다 
+        currentOffset += offset ;       
+   }
+  return currentOffset - offset ; // 얼마나 읽었는지 알려준다 
+
 }
 
 UINT32 get_free_inode_number(EXT2_FILESYSTEM* fs, int group);
@@ -630,7 +726,12 @@ UINT32 expand_block(EXT2_FILESYSTEM * fs, UINT32 inode_num)
         blocks++;
 
 	}
-
+	inodeBuffer->blocks = blocks;
+	printf("used blocks   %d \n",used_blocks);
+	write_bitmap( used_blocks,1,sector);
+   	fs->disk->write_sector(fs->disk, 1+groupNum*fs->sb.block_per_group+2, sector);   // 블록 비트맵 수정 
+	printf("ddd %d", inodeBuffer->blocks);
+    set_inode_onto_inode_table(fs,inode_num,inodeBuffer);
    return EXT2_SUCCESS ;
 
 

ext2.h

@@ -161,7 +161,7 @@ int data_write(EXT2_FILESYSTEM * fs, SECTOR group, SECTOR block, BYTE* sector);
 int ext2_format(DISK_OPERATIONS* disk);
 int ext2_create(EXT2_NODE* parent, char* entryName, EXT2_NODE* retEntry);
 int ext2_lookup(EXT2_NODE* parent, const char* entryName, EXT2_NODE* retEntry);
-
+int ext2_read(EXT2_NODE * file, unsigned long offset , unsigned long length , const char * buffer);
 UINT32 expand_block(EXT2_FILESYSTEM * , UINT32 );
 int fill_super_block(EXT2_SUPER_BLOCK * sb, SECTOR numberOfSectors, UINT32 bytesPerSector);
 int fill_descriptor_block(EXT2_GROUP_DESCRIPTOR * gd, EXT2_SUPER_BLOCK * sb, SECTOR numberOfSectors, UINT32 bytesPerSector);

ext2.o

@@ -130,7 +130,7 @@ static SHELL_FILE_OPERATIONS g_file =
 {
 	fs_create,
 	NULL,
-	NULL,
+	fs_read,
 	fs_write
 };
 
@@ -211,7 +211,7 @@ int fs_write(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENT
 	EXT2_NODE EXT2Entry;
 
 	shell_entry_to_ext2_entry(entry, &EXT2Entry);
-
+       
 	return ext2_write(&EXT2Entry, offset, length, buffer);
 }
 
@@ -323,7 +323,15 @@ int fs_read_dir(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_
 
 	return EXT2_SUCCESS;
 }
+int	fs_read( DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, SHELL_ENTRY* entry, unsigned long offset, unsigned long length, char* buffer )
+{                 
+	EXT2_NODE	EXTEntry;
 
+	shell_entry_to_ext2_entry( entry, &EXTEntry );
+              printf("thissis me\n");
+	return ext2_read( &EXTEntry, offset, length, buffer );
+	
+}
 int my_strnicmp(const char* str1, const char* str2, int length)
 {
 	char   c1, c2;
@@ -354,7 +362,7 @@ int is_exist(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENT
 
 	fs_read_dir(disk, fsOprs, parent, &list);
 	current = list.first;
-
+      printf("%s ffffff \n",list.first->entry.name);
 	while (current)
 	{
 		if (my_strnicmp((char*)current->entry.name, name, 12) == 0)

ext2_shell.c

@@ -7,6 +7,7 @@
 void shell_register_filesystem( SHELL_FILESYSTEM* );
 int fs_write( DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, SHELL_ENTRY* entry, unsigned long offset, unsigned long length, const char* buffer );
 int	fs_create(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, const char* name, SHELL_ENTRY* retEntry);
+int	fs_read( DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, SHELL_ENTRY* entry, unsigned long offset, unsigned long length, char* buffer );
 int fs_lookup(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, SHELL_ENTRY* entry, const char* name);
 int fs_read_dir(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, SHELL_ENTRY_LIST* list);
 int fs_mkdir(DISK_OPERATIONS* disk, SHELL_FS_OPERATIONS* fsOprs, const SHELL_ENTRY* parent, const char* name, SHELL_ENTRY* retEntry);

ext2_shell.h

@@ -43,10 +43,11 @@ int shell_cmd_dumpdatablockbyname(int argc, char * agrv[]);
 int shell_cmd_dumpfileinode(int argc, char * argv[]);
 int shell_cmd_fill(int argc, char* argv[]);
 int shell_cmd_dumpdatablockbynum(int argc, char * argv[]);
-
+int shell_cmd_cat(int argc, char * argv[]);
 static COMMAND g_commands[] =
 {
 	{ "cd",		shell_cmd_cd,		COND_MOUNT	},
+	{ "cat",    shell_cmd_cat,		COND_MOUNT	},
 	{ "mount",	shell_cmd_mount,	COND_UMOUNT	},
 	{ "touch",	shell_cmd_touch,	COND_MOUNT	},
 	{ "fill",	shell_cmd_fill,		COND_MOUNT	},
@@ -384,6 +385,7 @@ int shell_cmd_fill(int argc, char* argv[])
 		memcpy(tmp, "Can you see? ", 13);
 		tmp += 13;
 	}
+	
 	g_fsOprs.fileOprs->write(&g_disk, &g_fsOprs, &g_currentDir, &entry, offset, size, buffer);
 	free(buffer);
 
@@ -546,7 +548,7 @@ int shell_cmd_cat(int argc, char* argv[])
 		printf("%s lookup failed\n", argv[1]);
 		return -1;
 	}
-
+	printf("1\n");
 	while (g_fsOprs.fileOprs->read(&g_disk, &g_fsOprs, &g_currentDir, &entry, offset, 1024, buf) > 0)
 	{
 		printf("%s", buf);