From 2a7854ebacad6c6b7a19342729fb314ace647210 Mon Sep 17 00:00:00 2001
From: Nikola Petrov <nikolape7@gmail.com>
Date: Mon, 14 Aug 2023 14:15:12 +0200
Subject: [PATCH] define MAX_STRING SIZE

---
 Password_manager/include/func.h  |  5 +++--
 Password_manager/source/func.cpp |  5 ++---
 Password_manager/source/main.cpp | 14 +++++++-------
 Password_manager/source/win.cpp  |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Password_manager/include/func.h b/Password_manager/include/func.h
index 3cf863f..7b98705 100644
--- a/Password_manager/include/func.h
+++ b/Password_manager/include/func.h
@@ -2,11 +2,12 @@
 #include <fstream>
 #include "buffer.h"
 
+constexpr auto MAX_STRING_SIZE = 21;
 
 struct Pass
 {
-	char label[21];
-	char password[21];
+	char label[MAX_STRING_SIZE];
+	char password[MAX_STRING_SIZE];
 
 	Pass() = default;
 };
diff --git a/Password_manager/source/func.cpp b/Password_manager/source/func.cpp
index 9bfdb47..b226bcd 100644
--- a/Password_manager/source/func.cpp
+++ b/Password_manager/source/func.cpp
@@ -63,13 +63,13 @@ void print_usage()
 {
 	printf_s(" Usage:\n\n");
 	printf_s(" password_manager.exe [flags]\n\n");
-	printf_s(" Note: <label> max len 20 char\n\n");
+	printf_s(" Note: <label> max len %d char\n\n", MAX_STRING_SIZE);
 	printf_s(" Flags:\n\n");
 	printf_s(" -h         \t print this message\n");
 	printf_s(" <label>    \t get password of this label\n");
 	printf_s(" -g <label> \t generate or update password of this label\n");
 	printf_s(" -d <label> \t delete password of this label\n");
-	printf_s(" -i <label> \t input password for this label max 20 char\n");
+	printf_s(" -i <label> \t input password for this label max %d char\n", MAX_STRING_SIZE);
 	printf_s(" -l         \t list all labels\n");
 	printf_s(" -p         \t print all passwords\n");
 }
@@ -112,7 +112,6 @@ Args get_args(int argc, char** argv, char** label) {
 
 	if (!strcmp("-i", argv[1]))
 	{
-		printf_s("Input password for %s:\n", argv[2]);
 		return Args::Input;
 	}
 
diff --git a/Password_manager/source/main.cpp b/Password_manager/source/main.cpp
index d9d59f5..d1351d5 100644
--- a/Password_manager/source/main.cpp
+++ b/Password_manager/source/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
 		else 
 		{
 			generate_password(new_pass.password);
-			strcpy_s(new_pass.label, 20, label);
+			strcpy_s(new_pass.label, MAX_STRING_SIZE, label);
 			decrypted_buffer.add((uint8_t*) & new_pass, sizeof(Pass));
 			pass = &new_pass;
 		}
@@ -102,10 +102,9 @@ int main(int argc, char** argv)
 
 		return 0;
 		break;
-	case Args::Print_all_p: 
-
-		printf_s("input main password for confirmation:");
+	case Args::Print_all_p:
 
+		printf_s("input main password for confirmation:\n");
 		new_string = get_passwd();
 		if (new_string.empty())
 		{
@@ -129,6 +128,7 @@ int main(int argc, char** argv)
 	break;
 
 	case Args::Input:
+		printf_s("Input password for %s:\n", label);
 		new_string = get_passwd();
 		if (new_string.empty())
 		{
@@ -140,12 +140,12 @@ int main(int argc, char** argv)
 
 		if (pass != nullptr)
 		{
-			strcpy_s(pass->password, 20, new_string.c_str());
+			strcpy_s(pass->password, MAX_STRING_SIZE, new_string.c_str());
 		}
 		else
 		{
-			strcpy_s(new_pass.password, 20, new_string.c_str());
-			strcpy_s(new_pass.label, 20, label);
+			strcpy_s(new_pass.password, MAX_STRING_SIZE, new_string.c_str());
+			strcpy_s(new_pass.label, MAX_STRING_SIZE, label);
 			decrypted_buffer.add((uint8_t*)&new_pass, sizeof(Pass));
 			pass = &new_pass;
 		}
diff --git a/Password_manager/source/win.cpp b/Password_manager/source/win.cpp
index f34c628..428ca13 100644
--- a/Password_manager/source/win.cpp
+++ b/Password_manager/source/win.cpp
@@ -2,10 +2,11 @@
 #include <iostream>
 #include <string>
 #include "win.h"
+#include "func.h"
 
 bool put_data_on_clipboard(const char* text) {
 	size_t len = strlen(text);
-	if (strnlen_s(text, 20) == 0) {
+	if (strnlen_s(text, MAX_STRING_SIZE) == 0) {
 		printf_s("Text is empty\n");
 		return false;
 	}