merge changes

souravsaha · Jul 28, 2019 · 30d7ee7 · 30d7ee7
2 parents 6014a3b + 93cee76
commit 30d7ee7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/common.c b/common.c
@@ -121,7 +121,7 @@ WholeFS* readFS(char const *fileName,int* isInitialized)
     fs->fileSystemName = Malloc(512, char);
     strcpy(fs->fileSystemName, fileName);
 
-    printf("Temp Code %d\n", tmp);
+    //printf("Temp Code %d\n", tmp);
     if(tmp==code) // fresh
     {
         // super block
@@ -161,7 +161,7 @@ WholeFS* readFS(char const *fileName,int* isInitialized)
     }
     else // read from the file to memory structure
     {
-        printf("****superblock print");
+        //printf("****superblock print");
         readSuperBlock(fs);
         char *buff = readInodeBlockFromFile(fs,fs->pwdInodeNumber);
         Inode *inode = strToInode(buff,sizeof(Inode));

diff --git a/driver.c b/driver.c
@@ -113,7 +113,7 @@ int main(int argc, char const *argv[])
         else if(strcmp(commandName, "rm") == 0)
         {
             //printf("Currently under development\n");
-            printf("Enter the pathname\n");
+            //printf("Enter the pathname\n");
             scanf("%s", arg1);
             int res = system_rm( fileSystem, arg1,strlen(arg1));
 

diff --git a/file_handling_functions.c b/file_handling_functions.c
@@ -71,14 +71,14 @@ void readSuperBlock(WholeFS* fs)
 
 
     /*print */
-    printf("inodecount: %d \n", (fs->sb.inodeCount));
-    printf("freeInode: %d \n", (fs->sb.freeInodeCount));
-    printf("inodeOfsset: %d \n", (fs->sb.iNodeOffset));
-    printf("datablockoffset %d \n", (fs->sb.dataBlockOffset));
-    printf("datablockCount %d \n", (fs->sb.dataBlockCount));
-    printf("freeDataBlockCount %d\n", (fs->sb.freeDataBlockCount));
-    printf("inodesize: %d ", (fs->sb.iNodeSize));
-    printf("datablocksize: %d ", (fs->sb.dataBlockSize));
+    //printf("inodecount: %d \n", (fs->sb.inodeCount));
+    //printf("freeInode: %d \n", (fs->sb.freeInodeCount));
+    //printf("inodeOfsset: %d \n", (fs->sb.iNodeOffset));
+    //printf("datablockoffset %d \n", (fs->sb.dataBlockOffset));
+    //printf("datablockCount %d \n", (fs->sb.dataBlockCount));
+    //printf("freeDataBlockCount %d\n", (fs->sb.freeDataBlockCount));
+    //printf("inodesize: %d ", (fs->sb.iNodeSize));
+    //printf("datablocksize: %d ", (fs->sb.dataBlockSize));
 
     fs->pwdInodeNumber = 1;
     strcpy(fs->pwdPath,"/");

diff --git a/system.c b/system.c
@@ -102,7 +102,7 @@ void system_pwd(WholeFS *fs)
 
 int system_rm(WholeFS* fs,char* name,int len)
 {
-    printf("###################################################################");
+    //printf("###################################################################");
     // get current inode number of current working directory
     int dirInode = getPwdInodeNumber(fs);
 
@@ -214,8 +214,6 @@ int system_rm(WholeFS* fs,char* name,int len)
             }
 
         }
-
-    //}
 
     printf("\nFile Not found") ;
     return 0;

diff --git a/util.c b/util.c
@@ -70,11 +70,13 @@ void printDirectoryContent(WholeFS* fs,char *data,int size)
 
         sscanf(data+offset,"%d %s",&inodeIndex,name);
         //printf("index: %d, name : %s \n",inodeIndex,name);
-        buffer = readInodeBlockFromFile(fs,inodeIndex);
-        //printf("buffer : %s\n",buffer);
-        inode = strToInode(buffer,sizeof(Inode));
-        printf("fileMode : %c ,fileSize: %d, linkCount: %d, name: %s \n",getFileType(inode->fileMode),inode->fileSize,inode->linkCount,name);
-
+        if(inodeIndex > 0)
+        {
+            buffer = readInodeBlockFromFile(fs,inodeIndex);
+            //printf("buffer : %s\n",buffer);
+            inode = strToInode(buffer,sizeof(Inode));
+            printf("fileMode : %c ,fileSize: %d, linkCount: %d, name: %s \n",getFileType(inode->fileMode),inode->fileSize,inode->linkCount,name);
+        }
         offset += DIRECTORY_ENTRY_LENGTH;
     }
 }