moved macros to common.h

Signed-off-by: Nick1296 <[email protected]>

common.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <inttypes.h>
 #include <sys/stat.h>
@@ -29,6 +29,17 @@
 #define FILE 0
 #define FILENAME_MAX_LENGTH 128
 #define PERM_ERR (-2)
+// root uid
 #define ROOT ((unsigned) 0)
 #define GROUP_SIZE 1024
-#define NAME_LENGTH 128
+// uasername length
+#define NAME_LENGTH 128
+// gpasswd operation type
+#define ADD 1
+#define REMOVE 0
+// empty group entry
+#define EMPTY (-1)
+// defining permissions number
+#define READ 4
+#define WRITE 2
+#define EXECUTE 1

shell.c

@@ -490,7 +490,7 @@ do_cmd(SimpleFS *fs, DirectoryHandle *dh, char tok_buf[MAX_NUM_TOK][MAX_COMMAND_
 			       "\t- info per avere informazioni sul disco\n"
 			       "\t- info -bmap per avere informazioni sulla bitmap del disco\n"
 			       "\t- touch [nome file] per creare un file vuoto\n"
-			       "\t- echo [-a] [contenuto] > [file] per scrivere un messaggio su un file (sovrascive il contenuto se"
+			       "\t- echo [-a] [contenuto] > [file] per scrivere un messaggio su un file (sovrascrive il contenuto se"
 			       "non viene usata l'opzione -a)\n"
 			       "\t- cat [files] per concatenare i file e scriverli sullo schermo\n"
 			       "\t- mkdir [directory] per creare una nuova directory\n"

simplefs.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "bitmap.h"
 #include "disk_driver.h"
@@ -58,5 +58,3 @@ int SimpleFS_mkDir(DirectoryHandle *d, const char *dirname);
 // returns -1 on failure 0 on success
 // if a directory, it removes recursively all contained files
 int SimpleFS_remove(DirectoryHandle *d, const char *filename);
-
-

simplefs_apis.h

@@ -1,13 +1,9 @@
-#pragma once
+#pragma once
 //macros used to identify the permission octal values
 #include "simplefs_structures.h"
 #include "common.h"
 #include "disk_driver_structures.h"
 
-#define READ 4
-#define WRITE 2
-#define EXECUTE 1
-
 
 /* setting the permissions on a file/directory according to the values of each set
 it can be called by the root user or the owner of the file
@@ -91,4 +87,4 @@ int mkDir(DirectoryHandle *d, const char *dirname, int current_user, int user_pr
 // returns -1 on failure 0 on success
 // if a directory, it removes recursively all contained files
 // it requires WRITE permission on the directory which contains the element to remove
-int removeFile(DirectoryHandle *d, const char *filename, int current_user, int usr_in_grp);
+int removeFile(DirectoryHandle *d, const char *filename, int current_user, int usr_in_grp);

users.h

@@ -1,15 +1,9 @@
-#pragma once
+#pragma once
 
 #include "common.h"
 #include "simplefs_structures.h"
 #include "list.h"
 
-//macros for gpasswd operation type
-#define ADD 1
-#define REMOVE 0
-//macro to define and empty group entry
-#define EMPTY (-1)
-
 //all the operation must be executed as root user
 
 //this struct represents a user account