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

 #include "mdr\keyb.h"
 #include "svarlang\svarlang.h"
+#define PVER "2023.0"
+#define PDATE "2023"
 /*****************************************************************************
  * global variables and definitions                                          *
  *****************************************************************************/
 /* preload the mono scheme (to be overloaded at runtime if color adapter present) */
   db->curline = 0;
+}
 static void ui_basic(const struct file *db, unsigned short slotnum) {
-  const char *s = svarlang_strid(0); /* HELP */
+  const char *s = svarlang_strid(0); /* ESC=MENU */
   unsigned short helpcol = screenw - strlen(s);
   /* slot number */
+  {
     char slot[4] = "#00";
   cursor_left(db);
   del(db);
+}
-/* a custom argv-parsing routine that looks directly inside the PSP, avoids the need
- * of argc and argv, saves some 330 bytes of binary size */
-static const char *parseargv(void) {
-  char *tail = (void *)0x81; /* THIS WORKS ONLY IN SMALL MEMORY MODEL */
-  unsigned short count = 0;
-  char *argv[2];
-  while (count < 2) {
-    /* jump to nearest arg */
-    while (*tail == ' ') {
-      *tail = 0;
-      tail++;
-    }
-    if (*tail == '\r') {
-      *tail = 0;
-      break;
-    }
-    argv[count++] = tail;
-    /* jump to next delimiter */
-    while ((*tail != ' ') && (*tail != '\r')) tail++;
-  }
-  /* check args now */
-  if (count == 0) return("");
-  if (count == 1) return(argv[0]);
-  return(NULL);
-}
 /* returns 0 on success, 1 on file not found, 2 on other error */
 static unsigned char loadfile(struct file *db, const char *fname) {
   char buff[512]; /* read one entire sector at a time (faster) */
   char *buffptr;
   unsigned int len, llen;
   _dos_close(fd);
   return(2);
+}
+/* a custom argv-parsing routine that looks directly inside the PSP, avoids the need
+ * of argc and argv, saves some 330 bytes of binary size
+ * returns non-zero on error */
+static int parseargv(struct file *dbarr) {
+  char *tail = (void *)0x81; /* THIS WORKS ONLY IN SMALL MEMORY MODEL */
+  unsigned short count = 0;
+  char *arg;
+  unsigned short lastarg = 0;
+  unsigned short err;
+  while (!lastarg) {
+    /* jump to nearest arg */
+    while (*tail == ' ') {
+      *tail = 0;
+      tail++;
+    }
+    if (*tail == '\r') {
+      *tail = 0;
+      break;
+    }
+    arg = tail;
+    /* jump to next delimiter */
+    while ((*tail != ' ') && (*tail != '\r')) tail++;
+    /* if \r then remember this is the last arg */
+    if (*tail == '\r') lastarg = 1;
+    *tail = 0;
+    tail++;
+    /* look at the arg now */
+    if (*arg == '/') {
+      mdr_coutraw_puts("Sved ver " PVER " Copyright (C) " PDATE " Mateusz Viste");
+      mdr_coutraw_puts("");
+      mdr_coutraw_puts(svarlang_str(1,0)); /* usage: sved file.txt */
+      return(-1);
+    }
+    /* looks to be a filename */
+    if (count == 10) {
+      mdr_coutraw_puts(svarlang_str(0,12));
+      return(-1); /* too many files */
+    }
+    /* try loading it */
+    mdr_coutraw_puts(arg);
+    err = loadfile(&(dbarr[count]), arg);
+    if (err) {
+      if (err == 1) { /* file not found */
+        err = 11;
+      } else { /* general error */
+        err = 10;
+      }
+      mdr_coutraw_puts(svarlang_str(0,err));
+      return(-1);
+    }
+    count++;
+  }
+  return(0);
+}
 static int savefile(const struct file *db, const char *newfname) {
   int fd;
   const struct line far *l;
   unsigned bytes;
   unsigned char eollen;
 /* main returns nothing, ie. sved always exits with a zero exit code
  * (this saves 20 bytes of executable footprint) */
 void main(void) {
   static struct file dbarr[10];
-  const char *fname;
   unsigned short curfile;
   struct file *db = dbarr; /* visible file is the first slot by default */
+  {
     char nlspath[128], lang[8];
     svarlang_autoload_pathlist("sved", mdr_dos_getenv(nlspath, "NLSPATH", sizeof(nlspath)), mdr_dos_getenv(lang, "LANG", sizeof(lang)));
+  }
-  fname = parseargv();
-  if ((fname == NULL) || (*fname == '/')) {
-    mdr_coutraw_puts(svarlang_str(1,0)); /* usage: sved file.txt */
-    return;
-  }
   /* preload all slots with empty files */
   for (curfile = 9;; curfile--) {
     loadfile(&(dbarr[curfile]), "");
     if (curfile == 0) break;
+  }
-  /* load file, if any given */
+  /* parse argv (and load files, if any passed on) */
-  if (*fname != 0) {
-    unsigned char err = loadfile(db, fname);
-    if (err == 1) {
-      mdr_coutraw_puts(svarlang_str(0,11)); /* file not found */
-      return;
-    } else if (err != 0) {
+  if (parseargv(dbarr) != 0) return;
-      mdr_coutraw_puts(svarlang_str(0,10)); /* ERROR */
-      return;
-    }
-  }
   if (mdr_cout_init(&screenw, &screenh)) {
     /* load color scheme if mdr_cout_init returns a color flag */
     SCHEME_TEXT = 0x17;
     SCHEME_MENU = 0x70;

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1559 – Rev 1355 → 1356