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

   *rstaddr = 0x1234; /* 0x1234 = warm boot, 0 = cold boot */
   (*bootroutine)(); /* jump to the BIOS reboot routine at FFFF:0000 */
+}
+/* returns 1 if file exists, zero otherwise */
+static int fileexists(const char *fname) {
+  FILE *fd;
+  fd = fopen(fname, "rb");
+  if (fd == NULL) return(0);
+  fclose(fd);
+  return(1);
+}
 /* outputs a string to screen with taking care of word wrapping. returns amount of lines. */
 static unsigned char putstringwrap(unsigned char y, unsigned char x, unsigned char attr, const char *s) {
   unsigned char linew, lincount;
   linew = 80 - (x << 1);
     "Swedish",
     "Turkish",
     NULL
   };
+  /* do not ask for language on non-multilang setups */
+  if (!fileexists("INSTALL.LNG")) {
+    choice = 0;
+    goto SkipLangSelect;
+  }
   newscreen(1);
   msg = svarlang_strid(0x0100); /* "Welcome to SvarDOS" */
   x = 40 - (strlen(msg) >> 1);
   mdr_cout_str(4, x, msg, COLOR_BODY, 80);
   mdr_cout_char_rep(5, x, '=', COLOR_BODY, strlen(msg));
     mdr_cout_str(8, 40 - (strlen(msg) / 2), msg, COLOR_BODY, 80);
+  }
   choice = menuselect(11, 9, langlist, -1);
   if (choice < 0) return(MENUPREV);
+  SkipLangSelect:
   /* populate locales with default values */
   memset(locales, 0, sizeof(struct slocales));
   switch (choice) {
     case 1:
       strcpy(locales->lang, "BR");
   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);
-}
 /* tries to write an empty file to drive.
  * asks DOS to inhibit the int 24h handler for this job, so erros are
  * gracefully reported - unfortunately this does not work under FreeDOS because
  * the DOS-C kernel does not implement the required flag.
  * returns 0 on success (ie. "disk exists and is writeable"). */
     if (*pkgptr == 0xff) break; /* end of list: means all packages have been processed */
     /* is this package present on the floppy disk? */
     TRY_NEXTPKG:
     sprintf(buff, "%s.svp", pkgptr);
-    if (fileexists(buff) != 0) {
+    if (!fileexists(buff)) {
       while (*pkgptr != 0) pkgptr++;
       while (*pkgptr == 0) pkgptr++;
       /* end of list? ask for next floppy, there's nothing interesting left on this one */
       if (*pkgptr == 0xff) {
         putstringnls(12, 1, COLOR_BODY, 4, 1); /* "INSERT THE DISK THAT CONTAINS THE REQUIRED FILE AND PRESS ANY KEY" */
 /* 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.SVP", drv);
-  return(fileexists(fname));
+  return(!fileexists(fname));
+}
 #endif
 int main(int argc, char **argv) {
   action = selectlang(&locales); /* welcome to svardos, select your language */
   if (action != MENUNEXT) goto Quit;
   loadcp(&locales);
   svarlang_load("INSTALL.LNG", locales.lang); /* NLS support */
- SelectKeyb:
   action = selectkeyb(&locales);  /* what keyb layout should we use? */
   if (action == MENUQUIT) goto Quit;
-  if (action == MENUPREV) goto SelectLang;
+  if (action == MENUPREV) {
+    if (!fileexists("INSTALL.LNG")) goto Quit;
+    goto SelectLang;
+  }
  WelcomeScreen:
   action = welcomescreen(); /* what svardos is, ask whether to run live dos or install */
   if (action == MENUQUIT) goto Quit;
-  if (action == MENUPREV) {
+  if (action == MENUPREV) goto SelectLang;
-    if (locales.keyblen > 1) goto SelectKeyb; /* if there is a choice of more than 1 layout, ask for it */
-    goto SelectLang;
-  }
   targetdrv = preparedrive(sourcedrv); /* what drive should we install from? 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, buildstring) != 0) goto Quit;    /* install packages */

Subversion Repositories SvarDOS

(root)/install/trunk/install.c – Rev 1668 → 1669