From dfd0a38e53a3cb3566a01d2a1fead26dcdd510f7 Mon Sep 17 00:00:00 2001
From: crc <>
Date: Fri, 12 Apr 2024 12:39:30 +0000
Subject: [PATCH] start updating dev-files.c

FossilOrigin-Name: 05ea8a3ab0c47ef42a682f6ba267dbd1c1626778fe854eaa99902890b58cdba6
---
 vm/nga-c/dev-files.c | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/vm/nga-c/dev-files.c b/vm/nga-c/dev-files.c
index 2d28904..fbd8f17 100644
--- a/vm/nga-c/dev-files.c
+++ b/vm/nga-c/dev-files.c
@@ -54,38 +54,29 @@ CELL files_get_handle(NgaState *vm) {
   ---------------------------------------------------------------------*/
 
 V file_open(NgaState *vm) {
-  CELL slot, mode, name;
-  char *request;
+  CELL slot = files_get_handle(vm);
+  CELL mode = stack_pop(vm);
+  CELL name = stack_pop(vm);
   char *modes[] = {"rb", "w", "a", "rb+"};
-  slot = files_get_handle(vm);
-  mode = stack_pop(vm);
-  name = stack_pop(vm);
-  request = string_extract(vm, name);
-  if (slot > 0) {
-    vm->OpenFileHandles[slot] = fopen(request, modes[mode]);
-  }
-  if (vm->OpenFileHandles[slot] == NULL) {
-    vm->OpenFileHandles[slot] = 0;
-    slot = 0;
-  }
+  char *request = string_extract(vm, name);
+  FILE *file = (slot > 0) ? fopen(request, modes[mode]) : NULL;
+  vm->OpenFileHandles[slot] = (file != NULL) ? file : 0;
   stack_push(vm, slot);
 }
 
-
 /*---------------------------------------------------------------------
   `file_read()` reads a byte from a file. This takes a file pointer
   from the stack and pushes the character that was read to the stack.
   ---------------------------------------------------------------------*/
 
 V file_read(NgaState *vm) {
-  CELL c;
   CELL slot = stack_pop(vm);
-  if (slot <= 0 || slot > MAX_OPEN_FILES || vm->OpenFileHandles[slot] == 0) {
+  FILE *file = vm->OpenFileHandles[slot];
+  if (slot <= 0 || slot > MAX_OPEN_FILES || file == 0) {
     printf("\nERROR (nga/file_read): Invalid file handle\n");
     exit(1);
   }
-  c = fgetc(vm->OpenFileHandles[slot]);
-  stack_push(vm, feof(vm->OpenFileHandles[slot]) ? 0 : c);
+  stack_push(vm, feof(file) ? 0 : fgetc(file));
 }
 
 
@@ -96,17 +87,15 @@ V file_read(NgaState *vm) {
   ------------------------------------------------------------*/
 
 V file_write(NgaState *vm) {
-  CELL slot, c, r;
-  slot = stack_pop(vm);
-  if (slot <= 0 || slot > MAX_OPEN_FILES || vm->OpenFileHandles[slot] == 0) {
+  CELL slot = stack_pop(vm);
+  FILE *file = vm->OpenFileHandles[slot];
+  if (slot <= 0 || slot > MAX_OPEN_FILES || file == 0) {
     printf("\nERROR (nga/file_write): Invalid file handle\n");
     exit(1);
   }
-  c = stack_pop(vm);
-  r = fputc(c, vm->OpenFileHandles[slot]);
+  fputc(stack_pop(vm), file);
 }
 
-
 /*--------------------------------------------------------------
   `file_close()` closes a file. This takes a file handle from
   the stack and does not return anything on the stack.
@@ -114,11 +103,12 @@ V file_write(NgaState *vm) {
 
 V file_close(NgaState *vm) {
   CELL slot = stack_pop(vm);
-  if (slot <= 0 || slot > MAX_OPEN_FILES || vm->OpenFileHandles[slot] == 0) {
+  FILE *file = vm->OpenFileHandles[slot];
+  if (slot <= 0 || slot > MAX_OPEN_FILES || file == 0) {
     printf("\nERROR (nga/file_close): Invalid file handle\n");
     exit(1);
   }
-  fclose(vm->OpenFileHandles[slot]);
+  fclose(file);
   vm->OpenFileHandles[slot] = 0;
 }