From a3a6f2a6a649d94b73f2d2d380cbf4f2950298d5 Mon Sep 17 00:00:00 2001 From: sijanec Date: Tue, 9 Jun 2020 12:51:59 +0200 Subject: asdc --- src/bvr.h | 3 +++ src/bvrcommands.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/tape.c | 9 +++++++++ 3 files changed, 56 insertions(+) (limited to 'src') diff --git a/src/bvr.h b/src/bvr.h index 465c974..3f0b3fd 100644 --- a/src/bvr.h +++ b/src/bvr.h @@ -39,3 +39,6 @@ char BVR_CHARS_TO_BREAK_VALUE[3] = {CLOSING_COMMAND_TAG_CHAR_1, EOF, '\0'}; // 0 #define BVR_VALUE_CHUNK_SIZE 256 int bvr_compose_stream(FILE *, FILE *); int bvr_command_processor(FILE *, FILE *); + +#define BVR_BREAK_STRING_CHAR '"' +#define BVR_ESCAPE_CHAR '\\' diff --git a/src/bvrcommands.c b/src/bvrcommands.c index fbb476b..3e54ca7 100644 --- a/src/bvrcommands.c +++ b/src/bvrcommands.c @@ -74,6 +74,37 @@ char * bvr_commands_get_value(FILE * input, char * yeetus_chars) { } // we should not get here! } +char * bvr_commands_get_string(FILE * input) { + int value_size = BVR_VALUE_CHUNK_SIZE; + char * value = (char*) malloc(value_size); + char input_char = fgetc(input); + char previous_char = 'a'; // please don't make a an escape char + int i = 0; + while(1) { + // i == napisali smo že toliko znakov + if(i >= value_size) { // <-- todo: uncomment after done debugging + value = realloc(value, (value_size) * BVR_VALUE_CHUNK_SIZE); + if(value == NULL) { + fprintf(stderr, "[bvrcommands.c] bvr_commands_get_value: CRITICAL OUT-OF-MEMORY, FUCK!\n"); + } + value_size = value_size + BVR_VALUE_CHUNK_SIZE; + } + if(input_char == BVR_BREAK_STRING_CHAR) { + if(previous_char != BVR_ESCAPE_CHAR) { + value[i++] = '\0'; + return value; + } else { + i--; // da zamenjamo prejšnji ESCAPE_CHAR z BREAK_STRING charom + (value)[(i)++] = BVR_BREAK_STRING_CHAR; + } + } else { + (value)[(i)++] = input_char; + } + previous_char = input_char; + input_char = fgetc(input); + } + // we should not get here! +} int bvr_handle_substring(FILE * input, FILE * output) { // acts like https://www.php.net/manual/en/function.substr.php char chars_to_break_value[69] = ",; "; strlcat(chars_to_break_value, BVR_CHARS_TO_BREAK_VALUE, sizeof(chars_to_break_value)); @@ -217,6 +248,19 @@ int bvr_handle_move(FILE * input, FILE * output) { fflush(output); return return_value; +} +int bvr_handle_string(FILE * input, FILE * output) { + char * item = bvr_commands_get_string(input); + uuid_t binuuid; + uuid_generate_random(binuuid); + char uuid[37]; + uuid_unparse(binuuid, uuid); + int return_value = bvr_var_set(uuid, value); + free(item); + item = NULL; + fflush(output); + return return_value; + } int bvr_handle_info(FILE * input, FILE * output) { // fprintf(stderr, "[bvrcommands.c] bvr_handle_info: bvr bVerbose HTPCMS %d.%d.%d\n", BVR_VER_MAJOR, BVR_VER_MINOR, BVR_VER_PATCH); diff --git a/src/tape.c b/src/tape.c index eba1478..442ba53 100644 --- a/src/tape.c +++ b/src/tape.c @@ -29,6 +29,15 @@ int bvr_command_processor(FILE * page_source_file, FILE * temp_output_file) { case 'm': command_handler_output = bvr_handle_move(page_source_file, temp_output_file); break; + case 'f': + command_handler_output = bvr_handle_if(page_source_file, temp_output_file); + break; + case '=': + command_handler_output = bvr_handle_equals(page_source_file, temp_output_file); + break; + case '"': + command_handler_output = bvr_handle_string(page_source_file, temp_output_file); + break; case 'u': command_handler_output = bvr_handle_substring(page_source_file, temp_output_file); break; -- cgit v1.2.3