From 8880fae4aac2c47b6fcb18a26450308915b435bd Mon Sep 17 00:00:00 2001 From: ALittlePatate Date: Sat, 20 Jan 2024 17:53:36 +0100 Subject: [PATCH] fix: using file descriptors instead of FILE* we can directly write to a socket using dprintf, no need for a buffer --- include/pasm.h | 2 +- src/api.c | 10 +++---- src/file_utils.c | 6 ++-- src/interpreter_states.c | 4 +-- src/interpreter_states.h | 2 +- src/pasm.c | 30 +++++++++---------- tests/Makefile | 3 +- tests/fmemopen.c | 43 --------------------------- tests/fmemopen.h | 6 ---- tests/interpreter.c | 2 +- tests/lib_use.c | 64 +++++++++++++++++++++++++++++----------- 11 files changed, 75 insertions(+), 97 deletions(-) delete mode 100644 tests/fmemopen.c delete mode 100644 tests/fmemopen.h diff --git a/include/pasm.h b/include/pasm.h index bc1d0fd..f5a51ea 100644 --- a/include/pasm.h +++ b/include/pasm.h @@ -2,4 +2,4 @@ #include #include -int pasm_run_script(const char *filename, char **file, size_t lines, FILE* _fstream); +int pasm_run_script(const char *filename, char **file, size_t lines, int _fstream); diff --git a/src/api.c b/src/api.c index 89edf88..a6a0750 100644 --- a/src/api.c +++ b/src/api.c @@ -11,18 +11,18 @@ void api_put() { int mode = state->STACK[state->STACK_IDX--]; // 1 for char, 2 for num if (mode != 1 && mode != 2) return; - FILE *f = fstream; - if (f == stderr) - f = stdout; + int f = fstream; + if (f == fileno(stderr)) + f = fileno(stdout); if (mode == 1) { char c = state->STACK[state->STACK_IDX--]; if (c == '\0') c = ' '; - fprintf(f, "%c", c); //using printf and not write because of the buffer + dprintf(f, "%c", c); //using printf and not write because of the buffer } else { - fprintf(f, "%d", state->STACK[state->STACK_IDX--]); + dprintf(f, "%d", state->STACK[state->STACK_IDX--]); } } diff --git a/src/file_utils.c b/src/file_utils.c index 576cc8d..204ec5f 100644 --- a/src/file_utils.c +++ b/src/file_utils.c @@ -10,7 +10,7 @@ size_t line_count = 0; int read_script(const char *filename, char ***buf, size_t *lines) { FILE *script = fopen(filename, "r"); if (script == NULL) { - fprintf(stderr, "Could not open %s.\n", filename); + dprintf(fstream, "Could not open %s.\n", filename); return 1; } @@ -23,14 +23,14 @@ int read_script(const char *filename, char ***buf, size_t *lines) { char *line_copy = strdup(line); char **temp = realloc(*buf, (line_count + 1) * sizeof(char*)); if (temp == NULL) { - fprintf(stderr, "Error allocating memory.\n"); + dprintf(fstream, "Error allocating memory.\n"); return 1; } *buf = temp; (*buf)[line_count++] = line_copy; } if (line_count == 0) { - fprintf(stderr, "%s is an empty file.\n", filename); + dprintf(fstream, "%s is an empty file.\n", filename); return 1; } diff --git a/src/interpreter_states.c b/src/interpreter_states.c index 256e975..0ca2c63 100644 --- a/src/interpreter_states.c +++ b/src/interpreter_states.c @@ -83,12 +83,12 @@ LABEL_ERR add_label(char *label, int line) { char *line_copy = strdup(label); if (line_copy == NULL) { - fprintf(fstream, "Error allocating memory.\n"); + dprintf(fstream, "Error allocating memory.\n"); return LABEL_ERROR; } char **temp = realloc(state->labels, (state->num_labels + 1) * sizeof(char*)); if (temp == NULL) { - fprintf(fstream, "Error allocating memory.\n"); + dprintf(fstream, "Error allocating memory.\n"); return LABEL_ERROR; } state->labels = temp; diff --git a/src/interpreter_states.h b/src/interpreter_states.h index d8aa291..2d1ae0d 100644 --- a/src/interpreter_states.h +++ b/src/interpreter_states.h @@ -5,7 +5,7 @@ #define MAX_ARG_SIZE 25 #define STACK_SIZE 50 -extern FILE *fstream; +extern int fstream; typedef enum cmp_return_codes { CMP_ERROR = -1, //unused diff --git a/src/pasm.c b/src/pasm.c index 45f7630..632cc48 100644 --- a/src/pasm.c +++ b/src/pasm.c @@ -5,18 +5,18 @@ #include "interpreter_states.h" #include "instructions.h" -FILE *fstream = NULL; +int fstream = 0; void show_error(size_t line, char *line_) { #ifdef _WIN32 - int wrote = fprintf(fstream, "%llu| ", line + 1); + int wrote = dprintf(fstream, "%llu| ", line + 1); #else - int wrote = fprintf(fstream, "%ld| ", line + 1); + int wrote = dprintf(fstream, "%ld| ", line + 1); #endif - fprintf(fstream, "%s\n", line_); - fprintf(fstream, "%*s\n", wrote + 1, "^"); - fprintf(fstream, "%*s\n", wrote + 1, "|"); + dprintf(fstream, "%s\n", line_); + dprintf(fstream, "%*s\n", wrote + 1, "^"); + dprintf(fstream, "%*s\n", wrote + 1, "|"); for (int i = 0; i < wrote; i++) - fprintf(fstream, " "); + dprintf(fstream, " "); } void show_states() { @@ -39,13 +39,13 @@ int check_errors(char *line) { switch ((int)state->last_check_args_code) { case WRONG_NUMBER : - fprintf(fstream, "wrong number of arguments on line %d\n", state->curr_line + 1); + dprintf(fstream, "wrong number of arguments on line %d\n", state->curr_line + 1); break; case ARG1_WRONG : - fprintf(fstream, "arg1 is invalid on line %d\n", state->curr_line + 1); + dprintf(fstream, "arg1 is invalid on line %d\n", state->curr_line + 1); break; case ARG2_WRONG : - fprintf(fstream, "arg2 is invalid on line %d\n", state->curr_line + 1); + dprintf(fstream, "arg2 is invalid on line %d\n", state->curr_line + 1); break; } return 1; @@ -53,26 +53,26 @@ int check_errors(char *line) { if (state->last_jmp_code) { show_error(state->curr_line, line); - fprintf(fstream, "%s is not a valid label/api\n", state->args->arg1); + dprintf(fstream, "%s is not a valid label/api\n", state->args->arg1); return 1; } if (state->last_stack_code != STACK_OK) { show_error(state->curr_line, line); - fprintf(fstream, "stack %s on line %d\n", + dprintf(fstream, "stack %s on line %d\n", state->last_stack_code == OVERFLOW ? "overflow" : "underflow", state->curr_line + 1); return 1; } return 0; } -int pasm_run_script(const char *filename, char **file, size_t lines, FILE *_fstream) { +int pasm_run_script(const char *filename, char **file, size_t lines, int _fstream) { fstream = _fstream; if (filename && read_script(filename, &file, &lines) == 1) return 1; if (init_state() == 1) { - fprintf(fstream, "Failed to initialize the interpreter.\n"); + dprintf(fstream, "Failed to initialize the interpreter.\n"); free_script(file); return 1; } @@ -88,7 +88,7 @@ int pasm_run_script(const char *filename, char **file, size_t lines, FILE *_fstr if (com == NULL || com->fptr == NULL) { if (file[state->curr_line][strlen(line) - 1] != ':') { show_error(state->curr_line, file[state->curr_line]); - fprintf(fstream, "%s \"%s\"\n", "unknown expression", strtok(file[state->curr_line], " ")); + dprintf(fstream, "%s \"%s\"\n", "unknown expression", strtok(file[state->curr_line], " ")); set_exit_state(-1); free(line); break; diff --git a/tests/Makefile b/tests/Makefile index 64db2dd..9ac741a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,4 @@ -SRC = lib_use.c \ - fmemopen.c +SRC = lib_use.c OBJ = $(SRC:.c=.o) NAME = lib_use CC = gcc diff --git a/tests/fmemopen.c b/tests/fmemopen.c deleted file mode 100644 index a46fe09..0000000 --- a/tests/fmemopen.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "fmemopen.h" - -typedef int make_iso_compilers_happy; //... -#ifdef _WIN32 -#include -#include -#include -#include -#include -/* https://github.com/Arryboom/fmemopen_windows */ - -FILE *fmemopen(void *buf, size_t len, __attribute__((unused)) const char *type) -{ - int fd; - FILE *fp; - char tp[MAX_PATH - 13]; - char fn[MAX_PATH + 1]; - int * pfd = &fd; - int retner = -1; - char tfname[] = "MemTF_"; - if (!GetTempPathA(sizeof(tp), tp)) - return NULL; - if (!GetTempFileNameA(tp, tfname, 0, fn)) - return NULL; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wimplicit-function-declaration" //msys not happy - retner = _sopen_s(pfd, fn, _O_CREAT | _O_SHORT_LIVED | _O_TEMPORARY | _O_RDWR | _O_BINARY | _O_NOINHERIT, _SH_DENYRW, _S_IREAD | _S_IWRITE); -#pragma GCC diagnostic pop - if (retner != 0) - return NULL; - if (fd == -1) - return NULL; - fp = _fdopen(fd, "wb+"); - if (!fp) { - _close(fd); - return NULL; - } - /*File descriptors passed into _fdopen are owned by the returned FILE * stream.If _fdopen is successful, do not call _close on the file descriptor.Calling fclose on the returned FILE * also closes the file descriptor.*/ - fwrite(buf, len, 1, fp); - rewind(fp); - return fp; -} -#endif diff --git a/tests/fmemopen.h b/tests/fmemopen.h deleted file mode 100644 index 7a6b6ac..0000000 --- a/tests/fmemopen.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#ifdef _WIN32 -#include -FILE *fmemopen(void *buf, size_t len, const char *type); -#endif diff --git a/tests/interpreter.c b/tests/interpreter.c index 3d95cd5..0d1ad0c 100644 --- a/tests/interpreter.c +++ b/tests/interpreter.c @@ -8,5 +8,5 @@ int main(int argc, char **argv) { fprintf(stderr, "Usage : %s filename\n", argv[0]); return 1; } - return pasm_run_script(argv[1], 0, 0, stderr); + return pasm_run_script(argv[1], 0, 0, 1); } diff --git a/tests/lib_use.c b/tests/lib_use.c index 64aaef9..f19b088 100644 --- a/tests/lib_use.c +++ b/tests/lib_use.c @@ -1,24 +1,52 @@ #include "../include/pasm.h" -#include "fmemopen.h" #include +#include +#include +#include +#include -int main(void) { - char output[1024] = {0}; - FILE *memfile = fmemopen(output, sizeof(output), "w+"); - - if (memfile != NULL) { - pasm_run_script("../examples/test.pasm", 0, 0, memfile); -#ifdef _WIN32 - fseek(memfile, 0, SEEK_SET); - fread(output, sizeof(char), sizeof(output), memfile); - printf("%s", output); - fclose(memfile); -#else - fclose(memfile); - printf("%s", output); -#endif - } else { - printf("null\n"); +#define SERVER_IP "192.168.1.16" +#define SERVER_PORT 1337 +#define BUFFER_SIZE 1024 + +int main() { + int clientSocket; + struct sockaddr_in serverAddr; + char buffer[BUFFER_SIZE]; + + if ((clientSocket = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + fprintf(stderr, "Socket creation failed"); + return 1; } + + serverAddr.sin_family = AF_INET; + serverAddr.sin_port = htons(SERVER_PORT); + if (inet_pton(AF_INET, SERVER_IP, &serverAddr.sin_addr) <= 0) { + fprintf(stderr, "Invalid address/ Address not supported"); + return 1; + } + + if (connect(clientSocket, (struct sockaddr*)&serverAddr, sizeof(serverAddr)) == -1) { + fprintf(stderr, "Connection failed"); + return 1; + } + + while (1) { + // Receive data from the server + int bytesRead = recv(clientSocket, buffer, BUFFER_SIZE - 1, 0); + if (bytesRead == -1) { + fprintf(stderr, "Receive failed"); + close(clientSocket); + return 1; + } + + buffer[bytesRead] = '\0'; // Null-terminate the received data + if (bytesRead > 0 && buffer[bytesRead - 1] == '\n') + buffer[bytesRead - 1] = '\0'; //deletes \n + printf("script path: %s\n", buffer); + pasm_run_script(buffer, 0, 0, clientSocket); //considering buffer is the path of a valid .pasm script + } + + close(clientSocket); return 0; }