fix: using file descriptors instead of FILE*

we can directly write to a socket using dprintf, no need for a buffer
This commit is contained in:
2024-01-20 17:53:36 +01:00
parent b4560bd748
commit 8880fae4aa
11 changed files with 75 additions and 97 deletions

View File

@@ -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--]);
}
}

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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

View File

@@ -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;