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

   return((int)res);
+}
 /* returns 0 if disk is empty, non-zero otherwise */
-static int diskempty(int drv) {
+static int diskempty(char drv) {
   unsigned int rc;
   int res;
   char buff[8];
   struct find_t fileinfo;
-  snprintf(buff, sizeof(buff), "%c:\\*.*", 'A' + drv - 1);
+  snprintf(buff, sizeof(buff), "%c:\\*.*", drv);
   rc = _dos_findfirst(buff, _A_NORMAL | _A_SUBDIR | _A_HIDDEN | _A_SYSTEM, &fileinfo);
   if (rc == 0) {
     res = 1; /* call successfull means disk is not empty */
   } else {
     res = 0;
   return(0);
+}
-static int preparedrive(void) {
+/* displays a list of drives and asks user to choose one for installation
-  int selecteddrive;
+ * returns a word with DOS drive value in lowest 8 bits (A=1, B=2, etc) and
-  char cselecteddrive;
+ * the BIOS drive id in highest 8 bits (1, 2...) */
-  int choice;
+static int selectdrive(void) {
   char buff[512];
-  int driveid = 1; /* fdisk runs on first drive (unless USB boot) */
   struct drivelist drives[4];
+  char drvlist[4][32]; /* C: [2048 MB] */
+  int i, drvlistlen = 0;
+  const char *menulist[16];
+  unsigned char driveid = 1; /* fdisk runs on first drive (unless USB boot) */
   /* read MBR of first HDD */
-  {
-    int i;
-    i = get_drives_list(buff, drives);
+  i = get_drives_list(buff, drives);
-    if (i) {
+  if (i) {
-      printf("get_drives_list() error = %d", i);
+    printf("get_drives_list() error = %d", i);
-    }
+    /* TODO build a proper menu with an explanation about drive not partitioned */
+  }
-  for (;;) {
-    char drvlist[4][40]; /* C: [2048 MB] */
-    int i, drvlistlen = 0;
-    /* build a menu with all drives */
+  /* build a menu with all drives */
-    for (i = 0; i < 4; i++) {
+  for (i = 0; i < 4; i++) {
-      if (drives[i].hd == 0) continue;
+    if (drives[i].hd == 0) continue;
-      snprintf(drvlist[drvlistlen], sizeof(drvlist[0]), "%c: [%u MiB, hd%c%u, act=%u]", '@' + drives[i].dosid, drives[i].tot_size, 'a' + (drives[i].hd & 127), i, drives[i].active);
+    snprintf(drvlist[drvlistlen], sizeof(drvlist[0]), "%c: [%u MiB, hd%c%u, act=%u]", '@' + drives[i].dosid, drives[i].tot_size, 'a' + (drives[i].hd & 127), i, drives[i].active);
-      drvlistlen++;
+    drvlistlen++;
-    }
+  }
-    /* if no drive found - disk not partitioned? */
+  /* if no drive found - disk not partitioned? */
-    if (drvlistlen == 0) {
+  if (drvlistlen == 0) {
-      const char *list[4];
+    const char *list[4];
-      newscreen(0);
+    newscreen(0);
-      list[0] = svarlang_str(0, 3); /* Create a partition automatically */
+    list[0] = svarlang_str(0, 3); /* Create a partition automatically */
-      list[1] = svarlang_str(0, 4); /* Run the FDISK tool */
+    list[1] = svarlang_str(0, 4); /* Run the FDISK tool */
-      list[2] = svarlang_str(0, 2); /* Quit to DOS */
+    list[2] = svarlang_str(0, 2); /* Quit to DOS */
-      list[3] = NULL;
+    list[3] = NULL;
-      snprintf(buff, sizeof(buff), svarlang_strid(0x0300), SVARDOS_DISK_REQ); /* "ERROR: No drive could be found. Note, that SvarDOS requires at least %d MiB of available disk space */
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0300), SVARDOS_DISK_REQ); /* "ERROR: No drive could be found. Note, that SvarDOS requires at least %d MiB of available disk space */
-      switch (menuselect(6 + putstringwrap(4, 1, COLOR_BODY, buff), 3, list, -1)) {
+    switch (menuselect(6 + putstringwrap(4, 1, COLOR_BODY, buff), 3, list, -1)) {
-        case 0:
+      case 0:
-          sprintf(buff, "FDISK /PRI:MAX %d", driveid);
+        sprintf(buff, "FDISK /PRI:MAX %u", driveid);
-          exec(buff);
+        exec(buff);
-          break;
+        break;
-        case 1:
+      case 1:
-          mdr_cout_cls(0x07);
+        mdr_cout_cls(0x07);
-          mdr_cout_locate(0, 0);
+        mdr_cout_locate(0, 0);
-          sprintf(buff, "FDISK %d", driveid);
+        sprintf(buff, "FDISK %u", driveid);
-          exec(buff);
+        exec(buff);
-          break;
+        break;
-        case 2:
+      case 2:
-          return(MENUQUIT);
+        return(MENUQUIT);
-        default:
+      default:
-          return(-1);
+        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) */
-      sprintf(buff, "FDISK /LOADIPL %d", driveid);
-      exec(buff); /* writes BOOT.MBR into actual MBR */
-      newscreen(2);
-      putstringnls(10, 10, COLOR_BODY, 3, 1); /* "Your computer will reboot now." */
-      putstringnls(12, 10, COLOR_BODY, 0, 5); /* "Press any key..." */
-      mdr_dos_getkey();
-      reboot();
-      return(MENUQUIT);
+    }
+    /* write a temporary MBR which only skips the drive (in case BIOS would
+     * try to boot off the not-yet-ready C: disk) */
+    sprintf(buff, "FDISK /LOADIPL %u", driveid);
+    exec(buff); /* writes BOOT.MBR into actual MBR */
+    newscreen(2);
+    putstringnls(10, 10, COLOR_BODY, 3, 1); /* "Your computer will reboot now." */
+    putstringnls(12, 10, COLOR_BODY, 0, 5); /* "Press any key..." */
+    mdr_dos_getkey();
+    reboot();
+    return(MENUQUIT);
+  }
-    /* select the drive from list */
+  /* select the drive from list */
-    {
-      const char *list[16];
-      int i;
-      for (i = 0; i < drvlistlen; i++) list[i] = drvlist[i];
+  for (i = 0; i < drvlistlen; i++) menulist[i] = drvlist[i];
-      list[i++] = svarlang_str(0, 2); /* Quit to DOS */
+  menulist[i++] = svarlang_str(0, 2); /* Quit to DOS */
-      list[i] = NULL;
+  menulist[i] = NULL;
-      newscreen(0);
+  newscreen(0);
-      i = menuselect(6 /*ypos*/, i /*height*/, list, -1);
-      if (i < 0) {
-        return(MENUPREV);
-      } else if (i < drvlistlen) {
-        selecteddrive = list[i][0] - '@';
-      } else {
-        return(MENUQUIT);
-      }
+  i = menuselect(6 /*ypos*/, i /*height*/, menulist, -1);
+  if (i < 0) {
+    return(MENUPREV);
+  } else if (i < drvlistlen) {
-      cselecteddrive = '@' + selecteddrive;
+    return((driveid << 8) | (menulist[i][0] - '@'));
-    }
+  }
-    /* if not formatted, propose to format it right away (try to create a directory) */
-    if (test_drive_write(cselecteddrive) != 0) {
-      const char *list[3];
-      newscreen(0);
+  return(MENUQUIT);
-      snprintf(buff, sizeof(buff), svarlang_str(3, 3), cselecteddrive); /* "ERROR: Drive %c: seems to be unformated. Do you wish to format it?") */
-      mdr_cout_str(7, 1, buff, COLOR_BODY, 80);
-      snprintf(buff, sizeof(buff), svarlang_strid(0x0007), cselecteddrive); /* "Format drive %c:" */
-      list[0] = buff;
-      list[1] = svarlang_strid(0x0002); /* "Quit to DOS" */
-      list[2] = NULL;
+}
-      choice = menuselect(12, 2, list, -1);
-      if (choice < 0) return(MENUPREV);
-      if (choice == 1) return(MENUQUIT);
-      mdr_cout_cls(0x07);
-      mdr_cout_locate(0, 0);
-      snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
-      exec(buff);
-      continue;
-    }
-    /* check total disk space */
-    {
-      int ds = disksize(selecteddrive);
-      if (ds < SVARDOS_DISK_REQ) {
-        int y = 9;
-        newscreen(2);
-        snprintf(buff, sizeof(buff), svarlang_strid(0x0304), cselecteddrive, SVARDOS_DISK_REQ); /* "ERROR: Drive %c: is not big enough! SvarDOS requires a disk of at least %d MiB." */
-        y += putstringwrap(y, 1, COLOR_BODY, buff);
-        putstringnls(++y, 1, COLOR_BODY, 0, 5); /* "Press any key..." */
-        mdr_dos_getkey();
-        return(MENUQUIT);
-      }
-    }
+static int preparedrive(int hd_drv) {
+  unsigned char selecteddrive;
+  unsigned char driveid;
+  char cselecteddrive;
+  int choice;
+  char buff[512];
+  /* decode hd and drive id from hd_drv */
+  selecteddrive = hd_drv & 0xff;
+  driveid = hd_drv >> 8;
+  cselecteddrive = '@' + selecteddrive;
+  TRY_AGAIN:
+  /* if not formatted, propose to format it right away (try to create a directory) */
+  if (test_drive_write(cselecteddrive) != 0) {
-    /* is the disk empty? */
+    const char *list[3];
     newscreen(0);
+    snprintf(buff, sizeof(buff), svarlang_str(3, 3), cselecteddrive); /* "ERROR: Drive %c: seems to be unformated. Do you wish to format it?") */
+    mdr_cout_str(7, 1, buff, COLOR_BODY, 80);
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0007), cselecteddrive); /* "Format drive %c:" */
+    list[0] = buff;
+    list[1] = svarlang_strid(0x0002); /* "Quit to DOS" */
+    list[2] = NULL;
+    choice = menuselect(12, 2, list, -1);
+    if (choice < 0) return(MENUPREV);
+    if (choice == 1) return(MENUQUIT);
+    mdr_cout_cls(0x07);
+    mdr_cout_locate(0, 0);
+    snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
+    exec(buff);
+    goto TRY_AGAIN;
+  }
+  /* check total disk space */
+  if (disksize(selecteddrive) < SVARDOS_DISK_REQ) {
+    int y = 9;
+    newscreen(2);
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0304), cselecteddrive, SVARDOS_DISK_REQ); /* "ERROR: Drive %c: is not big enough! SvarDOS requires a disk of at least %d MiB." */
+    y += putstringwrap(y, 1, COLOR_BODY, buff);
+    putstringnls(++y, 1, COLOR_BODY, 0, 5); /* "Press any key..." */
+    mdr_dos_getkey();
+    return(MENUPREV);
+  }
+  /* is the disk empty? */
+  newscreen(0);
-    if (diskempty(selecteddrive) != 0) {
+  if (diskempty(cselecteddrive) != 0) {
-      const char *list[3];
+    const char *list[3];
-      int y = 6;
+    int y = 6;
-      snprintf(buff, sizeof(buff), svarlang_strid(0x0305), cselecteddrive); /* "ERROR: Drive %c: not empty" */
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0305), cselecteddrive); /* "ERROR: Drive %c: not empty" */
-      y += putstringwrap(y, 1, COLOR_BODY, buff);
+    y += putstringwrap(y, 1, COLOR_BODY, buff);
-      snprintf(buff, sizeof(buff), svarlang_strid(0x0007), cselecteddrive); /* "Format drive %c:" */
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0007), cselecteddrive); /* "Format drive %c:" */
-      list[0] = buff;
+    list[0] = buff;
-      list[1] = svarlang_strid(0x0002); /* "Quit to DOS" */
+    list[1] = svarlang_strid(0x0002); /* "Quit to DOS" */
-      list[2] = NULL;
+    list[2] = NULL;
-      choice = menuselect(++y, 2, list, -1);
+    choice = menuselect(++y, 2, list, -1);
-      if (choice < 0) return(MENUPREV);
+    if (choice < 0) return(MENUPREV);
-      if (choice == 1) return(MENUQUIT);
+    if (choice == 1) return(MENUQUIT);
-      mdr_cout_cls(0x07);
+    mdr_cout_cls(0x07);
-      mdr_cout_locate(0, 0);
+    mdr_cout_locate(0, 0);
-      snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
+    snprintf(buff, sizeof(buff), "FORMAT %c: /Q /U /Z:seriously /V:SVARDOS", cselecteddrive);
-      exec(buff);
+    exec(buff);
-      continue;
+    goto TRY_AGAIN;
-    } else {
+  } else {
-      /* final confirmation */
+    /* final confirmation */
-      const char *list[3];
+    const char *list[3];
-      list[0] = svarlang_strid(0x0001); /* Install SvarDOS */
+    list[0] = svarlang_strid(0x0001); /* Install SvarDOS */
-      list[1] = svarlang_strid(0x0002); /* Quit to DOS */
+    list[1] = svarlang_strid(0x0002); /* Quit to DOS */
-      list[2] = NULL;
+    list[2] = NULL;
-      snprintf(buff, sizeof(buff), svarlang_strid(0x0306), cselecteddrive); /* "The installation of SvarDOS to %c: is about to begin." */
+    snprintf(buff, sizeof(buff), svarlang_strid(0x0306), cselecteddrive); /* "The installation of SvarDOS to %c: is about to begin." */
-      mdr_cout_str(7, 40 - (strlen(buff) / 2), buff, COLOR_BODY, 80);
+    mdr_cout_str(7, 40 - (strlen(buff) / 2), buff, COLOR_BODY, 80);
-      choice = menuselect(10, 2, list, -1);
+    choice = menuselect(10, 2, list, -1);
-      if (choice < 0) return(MENUPREV);
+    if (choice < 0) return(MENUPREV);
-      if (choice == 1) return(MENUQUIT);
+    if (choice == 1) return(MENUQUIT);
-      snprintf(buff, sizeof(buff), "SYS %c: > NUL", cselecteddrive);
+    snprintf(buff, sizeof(buff), "SYS %c: > NUL", cselecteddrive);
-      exec(buff);
+    exec(buff);
-      sprintf(buff, "FDISK /MBR %d", driveid);
+    sprintf(buff, "FDISK /MBR %d", driveid);
-      exec(buff);
+    exec(buff);
-      snprintf(buff, sizeof(buff), "%c:\\TEMP", cselecteddrive);
+    snprintf(buff, sizeof(buff), "%c:\\SVARDOS", cselecteddrive);
-      mkdir(buff);
+    mkdir(buff);
+    snprintf(buff + 3, sizeof(buff), "TEMP");
-      return(cselecteddrive);
+    mkdir(buff);
-    }
+    return(0);
+  }
+}
 /* generates locales-related configurations and writes them to file (this
               "#gateway = 192.168.0.1\r\n");
   fclose(fd);
+}
-static int copypackages(char targetdrv, const struct slocales *locales) {
+static int copypackages(char drvletter, const struct slocales *locales) {
   char pkglist[512];
   int i, pkglistlen;
   size_t pkglistflen;
   char buff[1024]; /* must be *at least* 1 sector big for efficient file copying */
   FILE *fd = NULL;
   char *pkgptr;
   newscreen(3);
   /* load pkg list */
   fd = fopen("install.lst", "rb");
   if (fd == NULL) {
     mdr_cout_str(10, 30, "ERROR: INSTALL.LST NOT FOUND", COLOR_BODY, 80);
     mdr_dos_getkey();
         break;
+    }
+  }
   /* copy pkg.exe, install.com and install.lng to the new drive, along with all packages */
-  snprintf(buff, sizeof(buff), "%c:\\TEMP\\PKG.EXE", targetdrv);
+  snprintf(buff, sizeof(buff), "%c:\\TEMP\\PKG.EXE", drvletter);
   fcopy(buff, buff + 8, buff, sizeof(buff));
-  snprintf(buff, sizeof(buff), "%c:\\TEMP\\INSTALL.COM", targetdrv);
+  snprintf(buff, sizeof(buff), "%c:\\TEMP\\INSTALL.COM", drvletter);
   fcopy(buff, buff + 8, buff, sizeof(buff));
-  snprintf(buff, sizeof(buff), "%c:\\TEMP\\INSTALL.LNG", targetdrv);
+  snprintf(buff, sizeof(buff), "%c:\\TEMP\\INSTALL.LNG", drvletter);
   fcopy(buff, buff + 8, buff, sizeof(buff));
   /* copy packages */
   for (i = 0;; i++) {
     RETRY_ENTIRE_LIST:
     snprintf(buff, sizeof(buff), svarlang_strid(0x0400), i+1, pkglistlen, pkgptr); /* "Installing package %d/%d: %s" */
     strcat(buff, "       ");
     mdr_cout_str(10, 1, buff, COLOR_BODY, 40);
     /* proceed with package copy */
-    sprintf(buff, "%c:\\TEMP\\%s.svp", targetdrv, pkgptr);
+    sprintf(buff, "%c:\\TEMP\\%s.svp", drvletter, pkgptr);
     if (fcopy(buff, buff + 8, buff, sizeof(buff)) != 0) {
       mdr_cout_str(10, 30, "READ ERROR", COLOR_BODY, 80);
       mdr_dos_getkey();
       return(-1);
+    }
       pkgptr++;
+    }
+  }
   /* open the post-install autoexec.bat and prepare initial instructions */
-  snprintf(buff, sizeof(buff), "%c:\\TEMP\\POSTINST.BAT", targetdrv);
+  snprintf(buff, sizeof(buff), "%c:\\TEMP\\POSTINST.BAT", drvletter);
   fd = fopen(buff, "wb");
   if (fd == NULL) return(-1);
   fputs(
     "@ECHO OFF\r\n"
     "INSTALL\r\n"  /* installer will run in 2nd stage (generating pkg.cfg and stuff) */
   fprintf(fd, "\r\n"
               "ECHO.\r\n");
   fclose(fd);
   /* prepare a dummy autoexec.bat that will call temp\postinst.bat */
-  snprintf(buff, sizeof(buff), "%c:\\autoexec.bat", targetdrv);
+  snprintf(buff, sizeof(buff), "%c:\\autoexec.bat", drvletter);
   fd = fopen(buff, "wb");
   if (fd == NULL) return(-1);
   fprintf(fd, "@ECHO OFF\r\n"
               "SET DOSDIR=\\SVARDOS\r\n"
               "PATH %%DOSDIR%%\r\n");
   if (action == MENUPREV) {
     if (locales == NULL) goto QUIT;
     goto SelectLang;
+  }
+ SelDriveScreen:
-  targetdrv = preparedrive(); /* what drive should we install to? check avail. space */
+  targetdrv = selectdrive();
   if (targetdrv == MENUQUIT) goto QUIT;
   if (targetdrv == MENUPREV) goto WelcomeScreen;
+  action = preparedrive(targetdrv); /* what drive should we install to? check avail. space */
+  if (action == MENUQUIT) goto QUIT;
+  if (action == MENUPREV) goto SelDriveScreen;
+  targetdrv = (targetdrv & 0xff) + '@'; /* convert the hd+drv into a DOS letter */
+  /* copy packages to dst drive */
-  if (copypackages(targetdrv, locales) != 0) goto QUIT;    /* copy packages to dst drive */
+  if (copypackages(targetdrv, locales) != 0) goto QUIT;
   finalreboot(); /* remove the install medium and reboot */
   goto QUIT;
  GENCONF: /* second stage of the installation (run from the destination disk) */

Subversion Repositories SvarDOS

(root)/install/trunk/install.c – Rev 1940 → 1942