WebSVN – SvarDOS – Diff – /install/trunk/install.c

 #include <string.h>  /* memcpy() */
 #include <unistd.h>
 #include "kitten\kitten.h"
-#include "cdrom.h"
 #include "input.h"
 #include "video.h"
 /* keyboard layouts and locales */
 #include "keylay.h"
   if (r.h.al < drv - 'A') return(-1);
   return(0);
+}
 #endif
+/* get the DOS "current drive" (0=A:, 1=B:, etc) */
+static int get_cur_drive(void) {
+  union REGS r;
+  r.h.ah = 0x19; /* DOS 1+ GET CURRENT DEFAULT DRIVE */
+  int86(0x21, &r, &r);
+  return(r.h.al);
+}
 /* returns 0 if file exists, non-zero otherwise */
 static int fileexists(const char *fname) {
   FILE *fd;
   fd = fopen(fname, "rb");
   if (fd == NULL) return(-1);
   fclose(fd);
   return(0);
+}
-static int preparedrive(void) {
+static int preparedrive(char sourcedrv) {
   int driveremovable;
-  int selecteddrive = 3; /* hardcoded to 'C:' for now */
+  int selecteddrive = 3; /* default to 'C:' */
   int cselecteddrive;
   int ds;
   int choice;
   char buff[1024];
+  if (selecteddrive == get_cur_drive()) selecteddrive = 4; /* use D: if install is run from C: (typically because it was booted from USB?) */
   cselecteddrive = 'A' + selecteddrive - 1;
   for (;;) {
     driveremovable = isdriveremovable(selecteddrive);
     if (driveremovable < 0) {
       char *list[] = { "Create a partition automatically", "Run the FDISK partitioning tool", "Quit to DOS", NULL};
       list[2] = kittengets(0, 2, list[2]);
       snprintf(buff, sizeof(buff), kittengets(3, 0, "ERROR: Drive %c: could not be found. Perhaps your hard disk needs to be partitioned first. Please create at least one partition on your hard disk, so SvarDOS can be installed on it. Note, that SvarDOS requires at least %d MiB of available disk space.\n\nYou can use the FDISK partitioning tool for creating the required partition manually, or you can let the installer partitioning your disk automatically. You can also abort the installation to use any other partition manager of your choice."), cselecteddrive, SVARDOS_DISK_REQ);
       putstringwrap(4, 1, COLOR_BODY[mono], buff);
       switch (menuselect(14, -1, 5, list, -1)) {
         case 0:
-          system("FDISK /AUTO");
+          system("FDISK /AUTO"); /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
           break;
         case 1:
           video_clear(0x0700, 0, 0);
           video_movecursor(0, 0);
-          system("FDISK");
+          system("FDISK");  /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
           break;
         case 2:
           return(MENUQUIT);
         default:
           return(-1);
+      }
       /* write a temporary MBR which only skips the drive (in case BIOS would
        * try to boot off the not-yet-ready C: disk) */
-      system("FDISK /AMBR"); /* writes BOOT.MBR into actual MBR */
+      system("FDISK /AMBR"); /* writes BOOT.MBR into actual MBR */  /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
       newscreen(2);
       putstringnls(10, 10, COLOR_BODY[mono], 3, 1, "Your computer will reboot now.");
       putstringnls(12, 10, COLOR_BODY[mono], 0, 5, "Press any key...");
       input_getkey();
       reboot();
       snprintf(buff, sizeof(buff), kittengets(3, 6, "The installation of SvarDOS to %c: is about to begin."), cselecteddrive);
       video_putstring(7, -1, COLOR_BODY[mono], buff, -1);
       choice = menuselect(10, -1, 4, list, -1);
       if (choice < 0) return(MENUPREV);
       if (choice == 1) return(MENUQUIT);
-      snprintf(buff, sizeof(buff), "SYS A: %c: > NUL", cselecteddrive);
+      snprintf(buff, sizeof(buff), "SYS %c: %c: > NUL", sourcedrv, cselecteddrive);
       system(buff);
-      system("FDISK /MBR");
+      system("FDISK /MBR"); /* TODO DRIVE SHOULD BE SPECIFIED FOR MULTI-DRIVE SYSTEMS ! */
       snprintf(buff, sizeof(buff), "%c:\\TEMP", cselecteddrive);
       mkdir(buff);
       return(cselecteddrive);
+    }
+  }
 static void loadcp(const struct slocales *locales) {
   char buff[64];
   if (locales->codepage == 437) return;
   video_movecursor(1, 0);
   if (locales->egafile == 1) {
-    snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) A:\\EGA.CPX) > NUL", locales->codepage);
+    snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA.CPX) > NUL", locales->codepage);
   } else {
-    snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) A:\\EGA%d.CPX) > NUL", locales->codepage, locales->egafile);
+    snprintf(buff, sizeof(buff), "MODE CON CP PREP=((%u) EGA%d.CPX) > NUL", locales->codepage, locales->egafile);
+  }
   system(buff);
   snprintf(buff, sizeof(buff), "MODE CON CP SEL=%u > NUL", locales->codepage);
   system(buff);
   /* below I re-init the video controller - apparently this is required if
   int86(0x10, &r, &r);
+  }
+}
+#ifdef DEADCODE
 /* checks that drive drv contains SvarDOS packages
  * returns 0 if found, non-zero otherwise */
 static int checkinstsrc(char drv) {
   char fname[16];
   snprintf(fname, sizeof(fname), "%c:\\ATTRIB.ZIP", drv);
   return(fileexists(fname));
+}
+#endif
 int main(void) {
   struct slocales locales;
   int targetdrv;
   int sourcedrv;
   int action;
-  /* am I running in install-from-floppy mode? */
-  if (checkinstsrc('A') == 0) {
-    sourcedrv = 'A';
-  } else { /* otherwise find where the cdrom drive is */
-    sourcedrv = cdrom_findfirst();
+  sourcedrv = get_cur_drive() + 'A';
-    if (sourcedrv < 0) {
-      printf("ERROR: CD-ROM DRIVE NOT FOUND\r\n");
-      return(1);
-    }
-    sourcedrv += 'A'; /* convert the source drive 'id' (A=0) to an actual drive letter */
-    if (checkinstsrc(sourcedrv) != 0) {
-      printf("ERROR: SVARDOS INSTALLATION CD NOT FOUND IN THE DRIVE.\r\n");
-      return(1);
-    }
-  }
   /* init screen and detect mono status */
   mono = video_init();
   kittenopen("INSTALL"); /* load initial NLS support */
  WelcomeScreen:
   action = welcomescreen(); /* what svardos is, ask whether to run live dos or install */
   if (action == MENUQUIT) goto Quit;
   if (action == MENUPREV) goto SelectLang;
-  targetdrv = preparedrive(); /* what drive should we install to? check avail. space */
+  targetdrv = preparedrive(sourcedrv); /* what drive should we install to? check avail. space */
   if (targetdrv == MENUQUIT) goto Quit;
   if (targetdrv == MENUPREV) goto WelcomeScreen;
   bootfilesgen(targetdrv, &locales); /* generate boot files and other configurations */
   if (installpackages(targetdrv, sourcedrv, &locales) != 0) goto Quit;    /* install packages */
   /*localcfg();*/ /* show local params (currency, etc), and propose to change them (based on localcfg) */

Subversion Repositories SvarDOS

(root)/install/trunk/install.c @ 1125 – Rev 303 → 310