remove embryo of feature multiple storages and refactor how arguments work

7 files changed, 415 insertions, 429 deletions

diff --git a/Makefile b/Makefile
index 4301985..775ad74 100755
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION = 1.01
 PREFIX = /usr/local/bin
 CC = gcc
 CFLAGS = -Wall -g
-SOURCES = easydir.c handerror.c main.c
+SOURCES = easydir.c handerror.c implementation.c main.c
 OBJECTS = $(SOURCES:.c=.o)
 EXECUTABLE = lpass
 
diff --git a/easydir.c b/easydir.c
index c6034dd..921549e 100644
--- a/easydir.c
+++ b/easydir.c
@@ -1,7 +1,6 @@
-#include <malloc.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/easydir.h b/easydir.h
index 13c6d30..5db1965 100644
--- a/easydir.h
+++ b/easydir.h
@@ -1,4 +1,9 @@
+#ifndef EASYDIR_H
+#define EASYDIR_H
+
 char* splitPath(char *source, char *path, char *file);
 int deleteFile(char *file_path);
 int deleteEmptyDir(char *dir_path);
-int checkFileExist(char *path_to_file);
\ No newline at end of file
+int checkFileExist(char *path_to_file);
+
+#endif
\ No newline at end of file
diff --git a/handerror.h b/handerror.h
index 1241b8d..e4c5039 100644
--- a/handerror.h
+++ b/handerror.h
@@ -1,2 +1,7 @@
+#ifndef HANDERROR_H
+#define HANDERROR_H
+
 void callError(int num);
-void printError(char *text);
\ No newline at end of file
+void printError(char *text);
+
+#endif
\ No newline at end of file
diff --git a/implementation.c b/implementation.c
new file mode 100644
index 0000000..0ef17c1
--- /dev/null
+++ b/implementation.c
@@ -0,0 +1,217 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <termios.h>
+#include <string.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <errno.h>
+
+#include "handerror.h"
+#include "easydir.h"
+
+// == global var == 
+extern char *gPath_rootdir;
+
+char* getPassword(char *path, char *password, int maxlen)
+{
+	FILE *filePass;
+	filePass = fopen(path, "r");
+	if(filePass == NULL) {
+		if(errno == ENOENT) { // file doesn't exist
+			printError("lpass: No such file exists\n");
+		}
+		callError(110);
+	}
+
+	char sign[maxlen];
+	if(!fgets(sign, sizeof(sign), filePass)) {
+		callError(111);
+	}
+
+	strcpy(password, sign);
+	fclose(filePass);
+	return password;
+}
+
+void nonvisibleEnter(int status)
+{
+	struct termios term_settings;
+	tcgetattr(0, &term_settings); // get current settings
+	if(status == 1) {
+		term_settings.c_lflag &= ~ECHO; // flag reset
+	}
+	else {
+		term_settings.c_lflag |= ECHO;
+	}
+	tcsetattr(0, TCSANOW, &term_settings);
+}
+
+void insertPass(char *add_path, char *password)
+{
+	/* gPath_rootdir = /home/[username]/.lock-password/Password-Storage/
+	add_path = banks/france/[number]
+	main_path = banks/france
+	file_path = [number] */
+
+	char *main_path = malloc( sizeof(char) * (strlen(add_path)+1) );
+	char *file_path = malloc( sizeof(char) * (strlen(add_path)+1) );
+
+	if(splitPath(add_path, main_path, file_path) == NULL) {
+		printError("lpass: The path you specified is incorrect\n");
+	}
+
+	int pass_buf = strlen(gPath_rootdir) + strlen(add_path) + 1;
+	char *final_path = (char*) malloc(sizeof(char) * pass_buf);
+
+	strcpy(final_path, gPath_rootdir);
+	strcat(final_path, main_path);
+
+	if(strcmp(main_path, "") != 0) {
+		int pid = fork();
+		if(pid == -1) callError(103);
+		if(pid == 0) { /* new process */
+			execlp("mkdir", "mkdir", "-p", main_path, NULL);
+			perror("mkdir");
+			exit(4);
+		}
+		wait(&pid);
+	}
+	
+	if(chdir(final_path) != 0) {
+		callError(107);
+	}
+
+	// create file, copy password there
+	FILE *filePass;
+	filePass = fopen(file_path, "w");	
+	if(filePass == NULL) {
+		callError(108);
+	}
+	fputs(password, filePass);
+	fclose(filePass);
+
+	free(main_path);
+	free(file_path);
+}
+
+char *typePass(char *text, char *dest, int minlen, int maxlen)
+{
+	printf("%s", text);
+	if(fgets(dest, sizeof(char)*maxlen, stdin) == NULL) {
+		nonvisibleEnter(0);
+		printError("lpass: Unexpected end of file\n");
+	}
+
+	int len = strlen(dest);
+	if(len < minlen || len > maxlen) {
+		nonvisibleEnter(0);
+		printError("lpass: incorrect password\n");
+	}
+	
+	if(dest[len-1] == '\n') {
+		dest[len-1] = '\0';
+	}
+
+	#if defined(DEBUG)
+		printf("%s", dest);
+	#endif
+
+	printf("\n"); // for new line
+	return dest;
+}
+
+int userEnterPassword(int minlen, int maxlen, char *path_insert)
+{
+	char *pass_one = (char *) malloc(sizeof(char) * maxlen);
+	char *pass_two = (char *) malloc(sizeof(char) * maxlen);
+
+	nonvisibleEnter(1); // change terminal work
+	typePass("Please type your new password: ", pass_one, minlen, maxlen);
+	typePass("Please type your new password again: ", pass_two, minlen, maxlen);
+	nonvisibleEnter(0);
+
+	int rvalue = 0;
+	if(strcmp(pass_one, pass_two) == 0) {
+		insertPass(path_insert, pass_one);
+		rvalue = 1;
+	}
+
+	free(pass_one);
+	free(pass_two);
+	return rvalue;
+}
+
+char *generatePassword(char *dest, int amount, int max_len)
+{
+	char allowed_symbols[] = {
+		'A','E','I','J','O','U','B','C','D','F','G','H',
+		'K','L','M','N','P','Q','R','S','T','V','W','X',
+		'Y','Z','a','e','i','j','o','u','b','c','d','f',
+		'g','h','k','l','m','n','p','q','r','s','t','v',
+		'w','x','y','z','1','2','3','4','5','6','7','8',
+		'9','0','!','#','$',';','%','^',':','&','?','*',
+		'(',')','-','_','+','=','<', '>'
+	};
+	int max = sizeof(allowed_symbols);
+	srand(time(NULL));
+
+	char password[max_len];
+	for(int i=0; i < amount; i++)
+	{
+		char c = allowed_symbols[rand() % max];
+
+		password[i] = c;
+		password[i+1] = '\0';
+	}
+
+	strcpy(dest, password);
+	return dest;
+}
+
+unsigned long hash(char *str)
+{
+    unsigned long hash = 5381;
+    char c;
+
+    while( (c = *str++) )
+        hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+
+    return hash;
+}
+
+static void clearStdinBuff()
+{
+	char garbage;
+
+	while( (garbage = fgetc(stdin)) != '\n' && garbage != EOF )
+		;
+}
+
+
+int getAnswer(char *text)
+{
+	char answer;
+	printf("%s\n", text);
+	while( (answer = fgetc(stdin)) )
+	{
+		clearStdinBuff();
+		switch(answer)
+		{
+			case 'Y':
+			case 'y':
+				return 1;
+			case 'N':
+			case 'n':
+				return 0;
+			case EOF:
+				printError("lpass: Unexpected end of file\n");
+			default: {
+				printf("%s\n", text);
+				break;
+			}
+		}
+	}
+
+	return -1;
+}
diff --git a/implementation.h b/implementation.h
new file mode 100644
index 0000000..cb0b401
--- /dev/null
+++ b/implementation.h
@@ -0,0 +1,13 @@
+#ifndef IMPLEMENTATION_H
+#define IMPLEMENTATION_H
+
+char* getPassword(char *path, char *password, int maxlen);
+void nonvisibleEnter(int status);
+void insertPass(char *add_path, char *password);
+char *typePass(char *text, char *dest, int minlen, int maxlen);
+int userEnterPassword(int minlen, int maxlen, char *path_insert);
+char *generatePassword(char *dest, int amount, int max_len);
+unsigned long hash(char *str);
+int getAnswer(char *text);
+
+#endif
\ No newline at end of file
diff --git a/main.c b/main.c
index b498b72..cd368df 100644
--- a/main.c
+++ b/main.c
@@ -1,27 +1,21 @@
 #include <stdio.h>
-#include <termios.h>
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 #include <sys/wait.h>
 #include <getopt.h>
-#include <errno.h>
 #include <dirent.h>
-#include <time.h>
 
 #include "easydir.h"
 #include "handerror.h"
+#include "implementation.h"
 
 //#define DEBUG
+#define MINLEN_PASSWORD 1
 #define MAXLEN_PASSWORD 128
 #define STANDARD_AMOUNT_GENERATE_SYMBOLS 10
-#define FULLNAMEFILE "/.lock-password/Password-Bank"
-#define TREENAMEFILE "/.lock-password"
-#define ADDNAMETOFULL "/Password-Bank"
-#define NAMEFILE "Password-Bank"
-
-
 #define LOCKPASS_DIR "/.lock-password/"
+#define STORAGEPASS_DIR "Password-Storage/"
 #define GPGKEY_FILE "/.gpg-key"
 
 #define HASH_INIT 6385337657
@@ -34,291 +28,162 @@
 #define HASH_INSERT 6953633055386
 #define HASH_REMOVE 6953974396019
 #define HASH_DELETE 6953426453624
-#define HASH_CHANGE 6953390490059
+#define WITHOUT_ARGUMENTS 1
 
 // == global var == 
-char *gPath_rootdir; // init ONLY in main
+char *gPath_rootdir;
 
-static void clearStdinBuff()
+static void cmd_init(int argc, char *argv[])
 {
-	char garbage;
+	char *gpg_key = argv[2];
 
-	while( (garbage = fgetc(stdin)) != '\n' && garbage != EOF )
-		;
-}
+	if(gpg_key == NULL)
+		printError("Use: lpass init [gpg key]\n");
 
-static char* getPassword(char *path, char *password)
-{
-	FILE *filePass;
-	filePass = fopen(path, "r");
-	if(filePass == NULL) {
-		if(errno == ENOENT) { // file doesn't exist
-			printError("lpass: No such file exists\n");
-		}
-		callError(110);
+	// create main directory:
+	int len_init_storage = strlen(gPath_rootdir) + strlen(GPGKEY_FILE) + 1; // +1 for '\0'
+	char *path_init_storage = (char *) malloc(sizeof(char) * len_init_storage);
+
+	strcpy(path_init_storage, gPath_rootdir);
+	
+	int pid = fork();
+	if(pid == -1) callError(100);
+	if(pid == 0) { /* new process */
+		execlp("mkdir", "mkdir", "-vp", path_init_storage, NULL);
+		perror("mkdir");
+		exit(4);
 	}
+	wait(&pid);
+
+	strcat(path_init_storage, GPGKEY_FILE);
 
-	char sign[MAXLEN_PASSWORD];
-	if(!fgets(sign, sizeof(sign), filePass)) {
-		callError(111);
+	// create .gpg-key in storage
+	FILE *filekey;
+	filekey = fopen(path_init_storage, "w");	
+	if(filekey == NULL) {
+		callError(122);
 	}
+	fputs(gpg_key, filekey);
+	fclose(filekey);
 
-	strcpy(password, sign);
-	fclose(filePass);
-	return password;
+	free(path_init_storage);
+	printf("LockPassword initialized successfully\n");
 }
 
-static void showTree(char *path)
+static void cmd_copy(int argc, char *argv[])
 {
-	if(opendir(path) != NULL) { // if it's directory
-		int pid;
-		pid = fork();
-		if(pid == -1) callError(101);
-		if(pid == 0) { /* new process */
-			execlp("tree", "tree", "-C", "--noreport", path, NULL);
-			perror("tree");
-			exit(4);
-		}
-		wait(&pid);
-	}
-	else {
-		char password[MAXLEN_PASSWORD];
-		getPassword(path, password);
-		printf("%s\n", password);
-	}
+	printf("Coming soon...\n");
 }
 
-static void insertPass(char *root_path, char *add_path, char *password)
+static void cmd_edit(int argc, char *argv[])
 {
-	/* root_path = /home/[username]/
-	add_path = banks/france/[number]
-	main_path = banks/france
-	file_path = [number] */
+	char *path_to_password = argv[2];
 
-	char *main_path = malloc(sizeof(char) * strlen(add_path) + sizeof(char));
-	char *file_path = malloc(sizeof(char) * strlen(add_path) + sizeof(char));
+	if(path_to_password == NULL)
+		printError("Use: lpass edit [path to password]\n");
 
-	if(splitPath(add_path, main_path, file_path) == NULL) {
-		printError("lpass: The path you specified is incorrect\n");
+	if(checkFileExist(path_to_password) == 0) {
+		printError("lpass: No such file exists\n");
 	}
 
-	int pass_buf = strlen(root_path) + strlen(add_path);
-	char *final_path = (char*) malloc(sizeof(char) * pass_buf + sizeof(char));
-
-	strcpy(final_path, root_path);
-	strcat(final_path, "/");
-	strcat(final_path, main_path);
-
-	if(strcmp(main_path, "") != 0) {
-		int pid = fork();
-		if(pid == -1) callError(103);
-		if(pid == 0) { /* new process */
-			execlp("mkdir", "mkdir", "-p", main_path, NULL);
-			perror("mkdir");
-			exit(4);
-		}
-		wait(&pid);
-	}
-	
-	if(chdir(final_path) != 0) {
-		callError(107);
-	}
+	/* ask user about change pass */
+	int buffSize = (strlen("Do you want edit password in '' (Y/N)?") + strlen(path_to_password)) * sizeof(char) + sizeof(char);
+	char *str = malloc(buffSize);
+	snprintf(str, buffSize, "Do you want edit password in '%s' (Y/N)?", path_to_password);
 
-	// create file, copy password there
-	FILE *filePass;
-	filePass = fopen(file_path, "w");	
-	if(filePass == NULL) {
-		callError(108);
+	if(getAnswer(str) != 1) {
+		free(str);
+		exit(EXIT_SUCCESS);
 	}
+	free(str);
 
-	fputs(password, filePass);
-
-	free(main_path);
-	free(file_path);
-	fclose(filePass);
+	if(userEnterPassword(MINLEN_PASSWORD, MAXLEN_PASSWORD, path_to_password) == 1)
+		printf("Password updated successfully for %s\n", path_to_password);
+	else
+		printf("Passwords do not match\n");
 }
 
-static char *generatePassword(char *dest, int amount)
+static void cmd_generate(int argc, char *argv[])
 {
-	char allowed_symbols[] = {
-		'A','E','I','J','O','U','B','C','D','F','G','H',
-		'K','L','M','N','P','Q','R','S','T','V','W','X',
-		'Y','Z','a','e','i','j','o','u','b','c','d','f',
-		'g','h','k','l','m','n','p','q','r','s','t','v',
-		'w','x','y','z','1','2','3','4','5','6','7','8',
-		'9','0','!','#','$',';','%','^',':','&','?','*',
-		'(',')','-','_','+','=','<', '>'
-	};
-	int max = sizeof(allowed_symbols);
-	srand(time(NULL));
-
-	char password[MAXLEN_PASSWORD];
-	for(int i=0; i < amount; i++)
-	{
-		char c = allowed_symbols[rand() % max];
-
-		password[i] = c;
-		password[i+1] = '\0';
-	}
+	char *len_pass = argv[2];
+	char *path_to_password = argv[argc-1];
 
-	strcpy(dest, password);
-	return dest;
-}
+	if(checkFileExist(path_to_password) == 1) {
+		// ask user about change pass 
+		int buffSize = (strlen("Do you want generate new password and paste it in '' (Y/N)?") + strlen(path_to_password)) * sizeof(char) + sizeof(char);
+		char *str = malloc(buffSize);
 
-static void nonvisibleEnter(int status)
-{
-	struct termios term_settings;
-	tcgetattr(0, &term_settings); // get current settings
-	if(status == 1) {
-		term_settings.c_lflag &= ~ECHO; // flag reset
-	}
-	else {
-		term_settings.c_lflag |= ECHO;
-	}
-	tcsetattr(0, TCSANOW, &term_settings);
-}
+		snprintf(str, buffSize, "Do you want generate new password and paste it in '%s' (Y/N)?", path_to_password);
+		
+		int answer = getAnswer(str);
+		free(str);
 
-static int getAnswer(char *text)
-{
-	char answer;
-	printf("%s\n", text);
-	while( (answer = fgetc(stdin)) )
-	{
-		clearStdinBuff();
-		switch(answer)
-		{
-			case 'Y':
-			case 'y':
-			{
-				return 1;
-			}
-			case 'N':
-			case 'n':
-			{
-				return 0;
-			}
-			case EOF:
-			{
-				printError("lpass: Unexpected end of file\n");
-			}
-			default:
-			{
-				printf("%s\n", text);
-				break;
-			}
-		}
+		if(answer != 1)
+			exit(EXIT_FAILURE);
 	}
 
-	return -1;
-}
+	int n_symbols = 0;
+	if(strcmp(len_pass, path_to_password) == 0)
+		n_symbols = STANDARD_AMOUNT_GENERATE_SYMBOLS;
+	else n_symbols = atoi(len_pass);
 
-static char *typePass(char *text, char *dest)
-{
-	printf("%s", text);
-	if(fgets(dest, (sizeof(char)*MAXLEN_PASSWORD + sizeof(char)), stdin) == NULL) {
-		nonvisibleEnter(0);
-		printError("lpass: Unexpected end of file\n");
-	}
 
-	int len = strlen(dest);
-	if(len < 2) {
-		nonvisibleEnter(0);
-		printError("lpass: incorrect password\n");
+	if(n_symbols < MINLEN_PASSWORD || n_symbols > MAXLEN_PASSWORD) {
+		printError("lpass: you typed an incorrect number");
 	}
-	
-	if(dest[len-1] == '\n') {
-		dest[len-1] = '\0';
-	}
-
-	#if defined(DEBUG)
-		printf("%s", dest);
-	#endif
 
-	printf("\n"); // for new line
+	// generate password 
+	char gpass[MAXLEN_PASSWORD];
+	generatePassword(gpass, n_symbols, MAXLEN_PASSWORD);
 
-	return dest;
+	insertPass(path_to_password, gpass);
+	printf("Generated password: %s\n", gpass);
+	printf("Password added successfully for %s\n", path_to_password);
 }
 
-static void cmd_init(int argc, char *argv[])
+static void cmd_insert(int argc, char *argv[])
 {
-	// argv[2] = name of storage
-	// argv[3] = gpg key
-
-	if(argv[2] == NULL)
-		printError("Use: lpass init [storage name] [gpg key]\n");
-	else if(strcmp(argv[2], argv[3]) == 0 || argv[3] == NULL)
-		printError("Use: lpass init [storage name] [gpg key]\n");
-
-	char *main_path, *file_path;
-	main_path = (char *) malloc( sizeof(char) * (strlen(argv[2])+1) );
-	file_path = (char *) malloc( sizeof(char) * (strlen(argv[2])+1) );
-
-	if(splitPath(argv[2], main_path, file_path) == NULL) { // check correct input
-		printError("lpass: The path you specified is incorrect\n");
-	}
-
+	char *path_to_password = argv[2];
+	if(path_to_password == NULL)
+		printError("Use: lpass insert [path to password]\n");
 
-	// create main directory:
-	int len_passwordstore = strlen(gPath_rootdir) + strlen(file_path) + strlen(GPGKEY_FILE) + 1; // +1 for '\0'
-	char *path_passwordstore = (char *) malloc(sizeof(char) * len_passwordstore);
-
-	strcpy(path_passwordstore, gPath_rootdir);
-	strcat(path_passwordstore, file_path);
-
-	int pid = fork();
-	if(pid == -1) callError(100);
-	if(pid == 0) { /* new process */
-		execlp("mkdir", "mkdir", "-vp", path_passwordstore, NULL);
-		perror("mkdir");
-		exit(4);
-	}
-	wait(&pid);
+	if(checkFileExist(path_to_password) == 1)
+		printError("To change pass use: lpass change [path to password]\n");
+			
+	if(userEnterPassword(MINLEN_PASSWORD, MAXLEN_PASSWORD, path_to_password) == 1)
+		printf("Password added successfully for %s\n", path_to_password);
+	else
+		printf("Passwords do not match\n");
+}
 
-	// check .main-store
-	FILE *filestore;
-	filestore = fopen(path_passwordstore, "r");
-	if(filestore == NULL) {
-		// create .main-store
-		filestore = fopen(path_passwordstore, "w");
-		if(filestore == NULL) {
-			callError(121);
+static void cmd_showtree(char *path)
+{
+	if(opendir(path) != NULL) { // if it's directory
+		int pid;
+		pid = fork();
+		if(pid == -1) callError(101);
+		if(pid == 0) { /* new process */
+			execlp("tree", "tree", "-C", "--noreport", path, NULL);
+			perror("tree");
+			exit(4);
 		}
-		fputs(file_path, filestore);
+		wait(&pid);
 	}
-	fclose(filestore);
-
-	// create .gpg-key in store
-	strcat(path_passwordstore, GPGKEY_FILE);
-	FILE *filekey;
-	filekey = fopen(path_passwordstore, "w");	
-	if(filekey == NULL) {
-		callError(122);
+	else {
+		char password[MAXLEN_PASSWORD];
+		getPassword(path, password, MAXLEN_PASSWORD);
+		printf("%s\n", password);
 	}
-	fputs(argv[3], filekey);
-	fclose(filekey);
-
-	free(path_passwordstore);
-	free(main_path);
-	free(file_path);
-	printf("LockPassword initialized successfully\n");
 }
 
-static void cmd_change(int argc, char *argv[])
+static void cmd_help()
 {
-	// argv[2] = desired password storage
-	if(argv[2] == NULL)
-		printError("Use: lpass change [storage name]\n");
+
 }
 
-static unsigned long hash(char *str)
+static void cmd_version()
 {
-    unsigned long hash = 5381;
-    char c;
-
-    while( (c = *str++) )
-        hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
 
-    return hash;
 }
 
 int main(int argc, char *argv[])
@@ -327,150 +192,100 @@ int main(int argc, char *argv[])
 		printError("lpass: Please, use a terminal to run this program\n");
 	}
 
-	int len_rootdir = strlen(getenv("HOME")) + strlen(LOCKPASS_DIR) + 1; // +1 for '\0'
-	gPath_rootdir = (char *) malloc(sizeof(char) * len_rootdir);
+	/* init global path to root directory */
+	int len_rootdir = strlen(getenv("HOME")) + strlen(LOCKPASS_DIR) + strlen(STORAGEPASS_DIR) + 1; // +1 for '\0'
 
+	gPath_rootdir = (char *) malloc(sizeof(char) * len_rootdir);
 	strcpy(gPath_rootdir, getenv("HOME"));
 	strcat(gPath_rootdir, LOCKPASS_DIR);
+	strcat(gPath_rootdir, STORAGEPASS_DIR);
+	/* end init */
 
-	//int path_init = 0;
-	//if(chdir(gPath_rootdir) == 0) path_init = 1;
+	unsigned long ihash = WITHOUT_ARGUMENTS;
+	if(argv[1] != NULL)
+		ihash = hash(argv[1]);
 
-	if(argv[1] == NULL) {
-		printf("show tree\n");
+	if( (chdir(gPath_rootdir) != 0) && (ihash != HASH_INIT) ) {
+		printError("Before starting work, you must initialize LockPassword\nUse: lpass init [gpg key]\n");
 	}
-	else
+
+	switch(ihash)
 	{
-		switch( hash(argv[1]) )
-		{
-		case HASH_INIT:
+		case HASH_INIT: {
 			cmd_init(argc, argv);
 			break;
-		case HASH_HELP:
-			break;
-		case HASH_VERSION:
-			break;
-		case HASH_COPY:
-			break;
-		case HASH_CHANGE:
-			cmd_change(argc, argv);
+		}
+		case HASH_COPY: {
+			cmd_copy(argc, argv);
 			break;
-		case HASH_EDIT:
+		}
+		case HASH_EDIT: {
+			cmd_edit(argc, argv);
 			break;
+		}
 		case HASH_MOVE:
 			break;
-		case HASH_GENERATE:
+		case HASH_GENERATE: {
+			cmd_generate(argc, argv);
 			break;
-		case HASH_INSERT:
+		}
+		case HASH_INSERT: {
+			cmd_insert(argc, argv);
 			break;
+		}
 		case HASH_REMOVE:
-		case HASH_DELETE:
+		case HASH_DELETE: {
 			printf("borrr\n");
 			break;
-		default:
-			printf("please, use help\n");
+		}
+		case HASH_HELP: {
+			cmd_help();
 			break;
 		}
-	}
-
-	free(gPath_rootdir);
-	return 0;
-
-
-
-	#if defined(DEBUG)
-		char* short_options = "c:e:g:i:R:t";
-	#else
-		char* short_options = "c:e:g:i:R:";
-	#endif
-
-	struct option long_options[] = {
-		{"init", required_argument, NULL, 'I'},
-		{NULL, 0, NULL, 0}
-	};
-
-	int rootBuf = strlen(getenv("HOME")) + strlen(FULLNAMEFILE);
-	char *rootPath = (char *) malloc(sizeof(char) * rootBuf + sizeof(char)); // +1 for '\0'
-
-	int path_init = 0;
-	strcpy(rootPath, getenv("HOME"));
-	strcat(rootPath, TREENAMEFILE);
+		case HASH_VERSION: {
+			cmd_version();
+			break;
+		}
+		default:
+		{
+			int newlen_rootdir = len_rootdir - strlen(STORAGEPASS_DIR) - 1;
+			gPath_rootdir[newlen_rootdir-1] = '\0';
 
-	if(chdir(rootPath) == 0) path_init = 1;
+			if(chdir(gPath_rootdir) != 0)
+				callError(123);
 
-	int option_index = -1, result = -1;
-	result = getopt_long(argc, argv, short_options, long_options, &option_index);
-	if(!path_init) {
-		if(result != 'I') // if doesn't init
-		{ 
-			if(errno == ENOENT) { // file doesn't exist
-				printError("lpass: Before starting work, you must initialize LockPassword\n\
-					Use: lpass --init\n");
+			char *ptr;
+			if(ihash == WITHOUT_ARGUMENTS) {
+				ptr = malloc(sizeof(char) * (strlen(STORAGEPASS_DIR)+1) );
+				strcpy(ptr, STORAGEPASS_DIR);
 			}
-			callError(102);
-		}
-	}
-	else {
-		if(result == 'I') {
-			printError("lpass: You already initialized LockPassword\n");
-		}
-		else if(result != -1)
-		{
-			strcat(rootPath, ADDNAMETOFULL); // complements to full path
-			if(chdir(rootPath) != 0) {
-				callError(112);
+			else {
+				int buff_tree = strlen(STORAGEPASS_DIR) + strlen(argv[argc-1]) + 1;
+				ptr = malloc(sizeof(char) * buff_tree);
+				strcpy(ptr, STORAGEPASS_DIR);
+				strcat(ptr, argv[argc-1]);
 			}
+			cmd_showtree(ptr);
+
+			free(ptr);
+			break;
 		}
 	}
 
+	free(gPath_rootdir);
+	return EXIT_SUCCESS;
+
+	/*char rootPath = "";
+	int result = 0;
 	if(result != -1)
 	{
 		switch(result) {
-		case 'c': {
-			printf("Coming soon...\n");
-			break;
-		}
-		case 'e': {
-			char *passPath = optarg;
-
-			if(checkFileExist(passPath) == 0) {
-				printError("lpass: No such file exists\n");
-			}
-
-			/* ask user about change pass */
-			int buffSize = (strlen("Do you want edit password in '' (Y/N)?") + strlen(passPath)) * sizeof(char) + sizeof(char);
-			char *str = malloc(buffSize);
-			snprintf(str, buffSize, "Do you want edit password in '%s' (Y/N)?", passPath);
-
-			if(getAnswer(str) != 1) {
-				free(str);
-				return 0;
-			}
-			free(str);
-
-			/* enter password */
-			nonvisibleEnter(1); // change terminal work
-			char pass_one[MAXLEN_PASSWORD], pass_two[MAXLEN_PASSWORD];
-			typePass("Please type your new password: ", pass_one);
-			typePass("Please type your new password again: ", pass_two);
-			nonvisibleEnter(0);
-
-			if(strcmp(pass_one, pass_two) == 0) {
-				printf("Password correct\n");
-
-				insertPass(rootPath, passPath, pass_one);
-				printf("Password updated successfully for %s\n", passPath);
-			}
-			else printf("Passwords do not match\n");
-
-			break;
-		}
 		case 'g': {
 			char *passPath = argv[argc-1];
 			char *lenPass = optarg;
 
 			if(checkFileExist(passPath) == 1) {
-				/* ask user about change pass */
+				// ask user about change pass 
 				int buffSize = (strlen("Do you want generate new password and paste it in '' (Y/N)?") + strlen(passPath)) * sizeof(char) + sizeof(char);
 				char *str = malloc(buffSize);
 
@@ -492,9 +307,9 @@ int main(int argc, char *argv[])
 				printError("lpass: you typed an incorrect number");
 			}
 
-			/* generate password */
+			// generate password 
 			char gpass[MAXLEN_PASSWORD];
-			generatePassword(gpass, n_symbols);
+			generatePassword(gpass, n_symbols, MAXLEN_PASSWORD);
 
 			insertPass(rootPath, passPath, gpass);
 			printf("Generated password: %s\n", gpass);
@@ -502,29 +317,6 @@ int main(int argc, char *argv[])
 
 			break;
 		}
-		case 'i': {
-			if(checkFileExist(optarg) == 1) {
-				printf("lpass: To change pass use argument '-e'\n");
-				return 0;
-			}
-			
-			/* enter password */
-			nonvisibleEnter(1); // change terminal work
-			char pass_one[MAXLEN_PASSWORD], pass_two[MAXLEN_PASSWORD];
-			typePass("Please type your password: ", pass_one);
-			typePass("Please type your password again: ", pass_two);
-			nonvisibleEnter(0);
-
-			if(strcmp(pass_one, pass_two) == 0) {
-				printf("Password correct\n");
-
-				insertPass(rootPath, optarg, pass_one);
-				printf("Password added successfully for %s\n", optarg);
-			}
-			else printf("lpass: Passwords do not match\n");
-
-			break;
-		}
 		case 'R': {
 			if(checkFileExist(optarg) == 0) {
 				printError("lpass: No such file exists\n");
@@ -547,50 +339,5 @@ int main(int argc, char *argv[])
 			free(file_path);
 			break;
 		}
-		case 'I': {
-			// create direction:
-			int pid = fork();
-			if(pid == -1) callError(100);
-			if(pid == 0) { /* new process */
-				execlp("mkdir", "mkdir", "-vp", rootPath, NULL);
-				perror("mkdir");
-				exit(4);
-			}
-			wait(&pid);
-			printf("LockPassword initialized successfully\n");
-			break;
-		}
-
-		#if defined(DEBUG)
-		case 't':
-		{
-			// for check new features:
-			break;
-		}
-		#endif
-
-		default: break;
-
-		}
-	}
-	else
-	{
-		char *ptr;
-		if(strcmp(argv[argc-1], argv[0]) == 0) {
-			ptr = malloc(sizeof(char) * strlen(NAMEFILE) + sizeof(char));
-			strcpy(ptr, NAMEFILE);
-		}
-		else {
-			int buff_tree = strlen(NAMEFILE) + strlen(argv[argc-1]);
-			ptr = malloc(sizeof(char) * buff_tree + sizeof(char) + sizeof(char));
-			strcpy(ptr, NAMEFILE);
-			strcat(ptr, "/");
-			strcat(ptr, argv[argc-1]);
-		}
-		showTree(ptr);
-
-		free(ptr);
-	}
-
-	return 0;
+	}*/
 }
\ No newline at end of file