diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | i_validation.c | 291 | ||||
| -rw-r--r-- | i_validation.h | 11 | ||||
| -rw-r--r-- | input.c | 285 | ||||
| -rw-r--r-- | test/Makefile | 2 |
5 files changed, 305 insertions, 286 deletions
@@ -1,4 +1,4 @@ -To compile this program just type 'make release' or 'make'. +To compile this program just type 'make release' or 'make' And then to install it you will have to 'make install' as root. diff --git a/i_validation.c b/i_validation.c new file mode 100644 index 0000000..d31d654 --- /dev/null +++ b/i_validation.c @@ -0,0 +1,291 @@ +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include "7ed.h" +#include "input.h" +#include <stdint.h> + +// This will be the new input system for combining commands with line numbers +// Work in progress and far from finished. This is not included when compiling normally. + +int validate_L(char *smode_buf) { + + /* + Check for + (or -) + path 1: If there is a + then check if there is anything else after it. If not then return L+. (DONEish) + 1.1: If there is a anything that is not a number from 0-9 then return '?' (safety check) + 1.2: If there is a number after the + then check for another number until there is no more numbers. For example we return L+34 + 1.3: If there happens to be something that is not a number from 0-9 in 1.2 case then immediately return '?' (safety check) + + path 2: If there is a number from 1-9 immediately after the L then keep checking for numbers (between 0-9) until there is no more. (DONE) + A valid return would be something like L24 (DONE) + 2.1: If there is anything that is not a number from 1-9 then return '?' (DONE) + + + path 3: If there is nothing else after the L (in this case just an L) then just return an L (DONE) + */ + + char nums[] = "123456789"; + int L_num_flag = 2; + int plus_num_flag = _INVALID; //If true the if statement will validate if input is valid after the + + int num_flag = _INVALID; // If true the if statement will validate if input is valid after L + + if (smode_buf[1] == '+' || smode_buf[1] == '-') { + plus_num_flag = _ONE; + if (smode_buf[2] == '0') { + L_num_flag = _INVALID; // if 0 then its just invalid immediately + } + if (smode_buf[2] != '\n') { // If there is no return we set these flags to false. + plus_num_flag = _INVALID; // If there is a return then no flags are changed and thus we know that the input is only an L+ + L_num_flag = _INVALID; + } + + for (int i = 0 ; i < 9 ; i++) { // Check if theres a number after + + if (smode_buf[2] == nums[i]) { + plus_num_flag = _VALID; + break; + } + } + } + + + if (plus_num_flag == _VALID) { + int plus_valid_flag = _INVALID; + L_num_flag = _INVALID; // False + char nums_with_zero[] = "0123456789"; + // Check the rest with a loop. Start at 2 + for (int i = 2 ; i < SMODE_MAX_INPUT_SIZE ; i++) { + // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) + for (int j = 0 ; j < 10 ; j++) { + if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { + L_num_flag = _VALID; + plus_valid_flag = _VALID; + break; + } + break; + } + if(smode_buf[i+1] != nums_with_zero[j]) { + return _INVALID; + } + + } //inner nested loop + if (plus_valid_flag == _VALID) { + break; + } + + + }//outer nested loop + } + + if (smode_buf[1] == '0') { // [1] because there is no + at 1. Number starts immediately after L + L_num_flag = _INVALID; // if 0 then its just invalid immediately + } + + for (int i = 0 ; i < 9 ; i++) { // Check if it starts with a number + if (smode_buf[1] == nums[i]) { + num_flag = _VALID; + break; + } + } + + if (num_flag == 0) { // Start validating if there are numbers after L + int valid_flag = _INVALID; + L_num_flag = _INVALID; // False + int Kflag; + char nums_with_zero[] = "0123456789"; + // Check the rest with a loop. Start at 2 + for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { + // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) + for (int j = 0 ; j < 10 ; j++) { + if(smode_buf[i] == nums_with_zero[j]) {//check if there is a number, if there is then next check + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { // if there was a number then check if theres a newline + L_num_flag = _VALID; // if we had a newline then check the flags as valid and break out. + valid_flag = _VALID; // it will break out here and then an if statement check will also check it again so that it can break out of the outer loop + + break; + } + Kflag = _INVALID; + for (int k = 0 ; k < 10 ; k++) { + if (smode_buf[i+1] == nums_with_zero[k]) { // We checked for newline earlier but since we didnt fine one + Kflag = _VALID; // We check if theres a number. If theres a number then keep going + break; // If there is anything but a number then Return _INVALID + } + } + if (Kflag == _INVALID) { + return _INVALID; + } + + break; + } + } //inner nested loop + + if (valid_flag == _VALID) { + break; + } + + + }//outer nested loop + }// num_flag if-statement + if (L_num_flag == _VALID) { + return _VALID; + } + if (L_num_flag == _INVALID) { + return _INVALID; + } + + if (plus_num_flag == _ONE) { + return _VALID; + } + + if (smode_buf[1] == '\n') { + return _VALID; + } + + return _INVALID; + +} + +int validate_N(char *smode_buf) { + /* N will work very similarly to L. + When i mark as (DONE) i don't actually mean the full feature, i mean the input validation for that specific feature to be done. + + Just N will create a new line after the focus line (DONE) + N+ will do the same (DONE) + N+1 will do the same (DONE) + In short: N = N+ = N+1 (They will all create 1 line after the focus line) + + N+2 Will create 2 lines after focus line. (DONE) + N+10 Will create 10 lines after the focus line (DONE) + N10 Will create a line after line 10 (NOT DONE) + + N- will work a bit differently. Since N+, N+1, N work the same N wont be available for making lines in the opposite direction. + I am not even sure if i want '-' to be a valid input. Or how ill even do it. For now i will make all '-'/negatives ivalid. + + If focus is 1 and we say N-10 Then it will create 10 lines "before" 1 (out of scope for validate_N) + + */ + char nums_with_zero[] = "0123456789"; + char nums[] = "123456789"; + int N_num_flag = _INVALID; + int plus_num_flag = _INVALID; //If true the if statement will validate if input is valid after the + + int num_flag = _INVALID; // If true the if statement will validate if input is valid after L + if (smode_buf[1] == '+') { + plus_num_flag = _ONE; + if (smode_buf[2] == '0') { + return _INVALID; + } + + if (!((smode_buf[2] >= '0' && smode_buf[2] <= '9') || smode_buf[2] == '\n')) { + return _INVALID; + } + + for (int i = 0 ; i < 9 ; i++) { // Check if theres a number after + + if (smode_buf[2] == nums[i]) { + plus_num_flag = _VALID; + break; + } + } + } + + if (plus_num_flag == _VALID) { // Because there is a number after + or - then the flag is 0 and this code runs + int plus_valid_flag = _INVALID; + N_num_flag = _INVALID; // False + // Check the rest with a loop. Start at 2 + for (int i = 2 ; i < SMODE_MAX_INPUT_SIZE ; i++) { + // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) + for (int j = 0 ; j < 10 ; j++) { + + if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { + N_num_flag = _VALID; // valid + plus_valid_flag = _VALID; //valid + + break; + } + break; + } + if(smode_buf[i+1] != nums_with_zero[j]) { + return _INVALID; + } + + } //inner nested loop + if (plus_valid_flag == _VALID) { + break; + } + + + }//outer nested loop + } + + // We aren't checking for N_num_flag yet because i haven't gotten that far in the code + if (smode_buf[1] == '0') { // [1] because there is no + at 1. Number starts immediately after L + N_num_flag = _INVALID; // if 0 then its just invalid immediately + } + + for (int i = 0 ; i < 9 ; i++) { // Check if it starts with a number + if (smode_buf[1] == nums[i]) { + //printf("Its a number!\n"); + num_flag = _VALID; + break; + } + } + + if (num_flag == 0) { // Start validating if there are numbers after N + int valid_flag = _INVALID; + N_num_flag = _INVALID; // False + int Kflag = _INVALID; + // Check the rest with a loop. Start at 2 + for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { + // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) + for (int j = 0 ; j < 10 ; j++) { + + if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is + if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { + + N_num_flag = _VALID; + valid_flag = _VALID; + break; + } + Kflag = _INVALID; + for (int k = 0 ; k < 10 ; k++) { + if (smode_buf[i+1] == nums_with_zero[k]) { // We checked for newline earlier but since we didnt fine one + Kflag = _VALID; // We check if theres a number. If theres a number then keep going + break; // If there is anything but a number then Return _INVALID + } + } + if (Kflag == _INVALID) { + return _INVALID; + } + break; + } + + } //inner nested loop + if (valid_flag == _VALID) { + //printf("Validflag!\n"); + break; + } + + }//outer nested loop + } + + if (smode_buf[1] == '\n') { + return _VALID; // just return N + } + + if (plus_num_flag == _ONE) { + return _VALID; + } + + if (N_num_flag == _VALID) { + return _VALID; // actually return the valid string here + } + if (N_num_flag == _INVALID) { + return _INVALID; // invalid! return '?' + } + + return _INVALID; + +}
\ No newline at end of file diff --git a/i_validation.h b/i_validation.h new file mode 100644 index 0000000..a7a7fe4 --- /dev/null +++ b/i_validation.h @@ -0,0 +1,11 @@ +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include "7ed.h" +#include <stdint.h> + +int validate_L(char *smode_buf); + +int validate_N(char *smode_buf);
\ No newline at end of file @@ -5,292 +5,9 @@ #include <errno.h> #include "7ed.h" #include "input.h" +#include "i_validation.h" #include <stdint.h> - -// This will be the new input system for combining commands with line numbers -// Work in progress and far from finished. This is not included when compiling normally. - -int validate_L(char *smode_buf) { - - /* - Check for + (or -) - path 1: If there is a + then check if there is anything else after it. If not then return L+. (DONEish) - 1.1: If there is a anything that is not a number from 0-9 then return '?' (safety check) - 1.2: If there is a number after the + then check for another number until there is no more numbers. For example we return L+34 - 1.3: If there happens to be something that is not a number from 0-9 in 1.2 case then immediately return '?' (safety check) - - path 2: If there is a number from 1-9 immediately after the L then keep checking for numbers (between 0-9) until there is no more. (DONE) - A valid return would be something like L24 (DONE) - 2.1: If there is anything that is not a number from 1-9 then return '?' (DONE) - - - path 3: If there is nothing else after the L (in this case just an L) then just return an L (DONE) - */ - - char nums[] = "123456789"; - int L_num_flag = 2; - int plus_num_flag = _INVALID; //If true the if statement will validate if input is valid after the + - int num_flag = _INVALID; // If true the if statement will validate if input is valid after L - - if (smode_buf[1] == '+' || smode_buf[1] == '-') { - plus_num_flag = _ONE; - if (smode_buf[2] == '0') { - L_num_flag = _INVALID; // if 0 then its just invalid immediately - } - if (smode_buf[2] != '\n') { // If there is no return we set these flags to false. - plus_num_flag = _INVALID; // If there is a return then no flags are changed and thus we know that the input is only an L+ - L_num_flag = _INVALID; - } - - for (int i = 0 ; i < 9 ; i++) { // Check if theres a number after + - if (smode_buf[2] == nums[i]) { - plus_num_flag = _VALID; - break; - } - } - } - - - if (plus_num_flag == _VALID) { - int plus_valid_flag = _INVALID; - L_num_flag = _INVALID; // False - char nums_with_zero[] = "0123456789"; - // Check the rest with a loop. Start at 2 - for (int i = 2 ; i < SMODE_MAX_INPUT_SIZE ; i++) { - // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) - for (int j = 0 ; j < 10 ; j++) { - if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is - if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { - L_num_flag = _VALID; - plus_valid_flag = _VALID; - break; - } - break; - } - if(smode_buf[i+1] != nums_with_zero[j]) { - return _INVALID; - } - - } //inner nested loop - if (plus_valid_flag == _VALID) { - break; - } - - - }//outer nested loop - } - - if (smode_buf[1] == '0') { // [1] because there is no + at 1. Number starts immediately after L - L_num_flag = _INVALID; // if 0 then its just invalid immediately - } - - for (int i = 0 ; i < 9 ; i++) { // Check if it starts with a number - if (smode_buf[1] == nums[i]) { - num_flag = _VALID; - break; - } - } - - if (num_flag == 0) { // Start validating if there are numbers after L - int valid_flag = _INVALID; - L_num_flag = _INVALID; // False - int Kflag; - char nums_with_zero[] = "0123456789"; - // Check the rest with a loop. Start at 2 - for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { - // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) - for (int j = 0 ; j < 10 ; j++) { - if(smode_buf[i] == nums_with_zero[j]) {//check if there is a number, if there is then next check - if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { // if there was a number then check if theres a newline - L_num_flag = _VALID; // if we had a newline then check the flags as valid and break out. - valid_flag = _VALID; // it will break out here and then an if statement check will also check it again so that it can break out of the outer loop - - break; - } - Kflag = _INVALID; - for (int k = 0 ; k < 10 ; k++) { - if (smode_buf[i+1] == nums_with_zero[k]) { // We checked for newline earlier but since we didnt fine one - Kflag = _VALID; // We check if theres a number. If theres a number then keep going - break; // If there is anything but a number then Return _INVALID - } - } - if (Kflag == _INVALID) { - return _INVALID; - } - - break; - } - } //inner nested loop - - if (valid_flag == _VALID) { - break; - } - - - }//outer nested loop - }// num_flag if-statement - if (L_num_flag == _VALID) { - return _VALID; - } - if (L_num_flag == _INVALID) { - return _INVALID; - } - - if (plus_num_flag == _ONE) { - return _VALID; - } - - if (smode_buf[1] == '\n') { - return _VALID; - } - - return _INVALID; - -} - -int validate_N(char *smode_buf) { - /* N will work very similarly to L. - When i mark as (DONE) i don't actually mean the full feature, i mean the input validation for that specific feature to be done. - - Just N will create a new line after the focus line (DONE) - N+ will do the same (DONE) - N+1 will do the same (DONE) - In short: N = N+ = N+1 (They will all create 1 line after the focus line) - - N+2 Will create 2 lines after focus line. (DONE) - N+10 Will create 10 lines after the focus line (DONE) - N10 Will create a line after line 10 (NOT DONE) - - N- will work a bit differently. Since N+, N+1, N work the same N wont be available for making lines in the opposite direction. - I am not even sure if i want '-' to be a valid input. Or how ill even do it. For now i will make all '-'/negatives ivalid. - - If focus is 1 and we say N-10 Then it will create 10 lines "before" 1 (out of scope for validate_N) - - */ - char nums_with_zero[] = "0123456789"; - char nums[] = "123456789"; - int N_num_flag = _INVALID; - int plus_num_flag = _INVALID; //If true the if statement will validate if input is valid after the + - int num_flag = _INVALID; // If true the if statement will validate if input is valid after L - if (smode_buf[1] == '+') { - plus_num_flag = _ONE; - if (smode_buf[2] == '0') { - return _INVALID; - } - - if (!((smode_buf[2] >= '0' && smode_buf[2] <= '9') || smode_buf[2] == '\n')) { - return _INVALID; - } - - for (int i = 0 ; i < 9 ; i++) { // Check if theres a number after + - if (smode_buf[2] == nums[i]) { - plus_num_flag = _VALID; - break; - } - } - } - - if (plus_num_flag == _VALID) { // Because there is a number after + or - then the flag is 0 and this code runs - int plus_valid_flag = _INVALID; - N_num_flag = _INVALID; // False - // Check the rest with a loop. Start at 2 - for (int i = 2 ; i < SMODE_MAX_INPUT_SIZE ; i++) { - // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) - for (int j = 0 ; j < 10 ; j++) { - - if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is - if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { - N_num_flag = _VALID; // valid - plus_valid_flag = _VALID; //valid - - break; - } - break; - } - if(smode_buf[i+1] != nums_with_zero[j]) { - return _INVALID; - } - - } //inner nested loop - if (plus_valid_flag == _VALID) { - break; - } - - - }//outer nested loop - } - - // We aren't checking for N_num_flag yet because i haven't gotten that far in the code - if (smode_buf[1] == '0') { // [1] because there is no + at 1. Number starts immediately after L - N_num_flag = _INVALID; // if 0 then its just invalid immediately - } - - for (int i = 0 ; i < 9 ; i++) { // Check if it starts with a number - if (smode_buf[1] == nums[i]) { - //printf("Its a number!\n"); - num_flag = _VALID; - break; - } - } - - if (num_flag == 0) { // Start validating if there are numbers after N - int valid_flag = _INVALID; - N_num_flag = _INVALID; // False - int Kflag = _INVALID; - // Check the rest with a loop. Start at 2 - for (int i = 1 ; i < SMODE_MAX_INPUT_SIZE ; i++) { - // Nested loop to check every element in nums_with_zero on the current smode element (i)(outer loop) - for (int j = 0 ; j < 10 ; j++) { - - if(smode_buf[i] == nums_with_zero[j]) {//check if its not a number. It could be the null terminator so we check if it is - if (smode_buf[i+1] == '\n' || smode_buf[i+1] == '\0') { - - N_num_flag = _VALID; - valid_flag = _VALID; - break; - } - Kflag = _INVALID; - for (int k = 0 ; k < 10 ; k++) { - if (smode_buf[i+1] == nums_with_zero[k]) { // We checked for newline earlier but since we didnt fine one - Kflag = _VALID; // We check if theres a number. If theres a number then keep going - break; // If there is anything but a number then Return _INVALID - } - } - if (Kflag == _INVALID) { - return _INVALID; - } - break; - } - - } //inner nested loop - if (valid_flag == _VALID) { - //printf("Validflag!\n"); - break; - } - - }//outer nested loop - } - - if (smode_buf[1] == '\n') { - return _VALID; // just return N - } - - if (plus_num_flag == _ONE) { - return _VALID; - } - - if (N_num_flag == _VALID) { - return _VALID; // actually return the valid string here - } - if (N_num_flag == _INVALID) { - return _INVALID; // invalid! return '?' - } - - return _INVALID; - -} - int smode_input(char *single, char **multiple, uint64_t focus) { // This function is for input then calls the appropriate validator // char *single is for p, e, c, q, a diff --git a/test/Makefile b/test/Makefile index 0ba1132..252e0a1 100644 --- a/test/Makefile +++ b/test/Makefile @@ -11,4 +11,4 @@ clean: smode: echo "CC input.c ---> smode" - cd .. && gcc -Wfatal-errors -Wall -Werror -Wextra -g -fsanitize=address input.c -o test/smode + cd .. && gcc -Wfatal-errors -Wall -Werror -Wextra -g -fsanitize=address input.c i_validation.c -o test/smode |