Uses installed directory on upgrade.

Fixes #15
fr3nd · Feb 14, 2021 · 17482dd · 17482dd
1 parent b1f6609
commit 17482dd
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/src/hub.c b/src/hub.c
@@ -1445,8 +1445,53 @@ void uninstall(char *package) {
 }
 
 void upgrade(char *package) {
+  int fp;
+  int n, m;
+  int bytes_read;
+  char buffer[MAX_PATH_SIZE];
+  char current_file[MAX_PATH_SIZE];
+
+  // Get installed directory so upgrade is installed in the same one
+  strcpy(buffer, configpath);
+  strcat(buffer, "\\IDB\\");
+  strcat(buffer, package);
+  fp = open(buffer, O_RDONLY);
+
+  if (fp < 0) {
+    n = (fp >> 0) & 0xff;
+    if (n == 0xD7) {
+      die("Package %s is not installed.", package);
+    } else {
+      printf("Error reading configuration %s: 0x%X\r\n", buffer, n);
+      explain(buffer, n);
+      die("%s", buffer);
+    }
+  }
+
+  current_file[0] = '\0';
+  m = 0;
+  while(1) {
+    bytes_read = read(buffer, MAX_PATH_SIZE, fp);
+
+    for (n=0; n<bytes_read ;n++) {
+      if (buffer[n] != '\n' && buffer[n] != '\r') {
+        current_file[m] = buffer[n];
+        m++;
+      } else if (buffer[n] == '\n') {
+        current_file[m] = '\0';
+        m = 0;
+      }
+    }
+
+    if (bytes_read < MAX_PATH_SIZE) {
+      break;
+    }
+  }
+  close(fp);
+
+  printf("- Installation dir: %s\r\n", current_file);
   uninstall(package);
-  install(package, "");
+  install(package, current_file);
 }
 
 void configure(void) {

diff --git a/src/include/globals.h b/src/include/globals.h
@@ -9,7 +9,7 @@
 
 #include "asm.h"
 
-#define MSXHUB_VERSION "1.0.5"
+#define MSXHUB_VERSION "1.0.6"
 
 /* DOS errors */
 #define NOFIL   0xD7