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

  * IN THE SOFTWARE.
  */
 #include <dos.h>      /* _dos_open(), _dos_read(), _dos_close(), ... */
 #include <fcntl.h>    /* O_RDONLY, O_WRONLY */
-#include <stdlib.h>
 #include <string.h>
 #include "mdr\bios.h"
 #include "mdr\cout.h"
 #include "mdr\dos.h"
   return(argv[0]);
+}
+/* returns 0 on success, 1 on file not found, 2 on other error */
-static struct file *loadfile(const char *fname) {
+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;
   int fd;
   unsigned char eolfound;
-  static struct file db[1];
   bzero(db, sizeof(db));
   memcpy(db->fname, fname, strlen(fname));
   if (*fname == 0) goto SKIPLOADING;
   if (_dos_open(fname, O_RDONLY, &fd) != 0) {
-    mdr_coutraw_puts("Failed to open file:");
-    mdr_coutraw_puts(fname);
-    return(NULL);
+    return(1);
+  }
   db->lfonly = 1;
   /* start by adding an empty line */
     /* consumedbytes is the amount of bytes processed from buffptr,
      * llen is the length of line's payload (without its line terminator) */
     /* append content, if line is non-empty */
     if ((llen > 0) && (line_append(db, buffptr, llen) != 0)) {
-      mdr_coutraw_puts("out of memory");
       goto IOERR;
+    }
     /* add a new line if necessary */
     if (eolfound) {
       if (line_add(db, NULL, 0) != 0) {
-      /* TODO ERROR HANDLING */
-        mdr_coutraw_puts("out of memory");
         goto IOERR;
+      }
       eolfound = 0;
+    }
   /* add an empty line at end if not present already, also rewind cursor to top of file */
   if ((db->cursor == NULL) || (db->cursor->len != 0)) line_add(db, NULL, 0);
   db_rewind(db);
-  return(db);
+  return(0);
   IOERR:
   _dos_close(fd);
-  return(NULL);
+  return(2);
+}
 static int savefile(const struct file *db, const char *newfname) {
   int fd;
+  }
+}
 int main(void) {
+  static struct file dbarr[1];
   const char *fname;
-  struct file *db;
+  struct file *db = dbarr;
+  {
     char nlspath[128], lang[8];
     svarlang_autoload_pathlist("sved", mdr_dos_getenv(nlspath, "NLSPATH", sizeof(nlspath)), mdr_dos_getenv(lang, "LANG", sizeof(lang)));
+  }
     mdr_coutraw_puts(svarlang_str(1,0)); /* usage: sved file.txt */
     return(0);
+  }
   /* load file */
+  {
-  db = loadfile(fname);
+    unsigned char err = loadfile(db, fname);
+    if (err == 1) {
+      mdr_coutraw_puts(svarlang_str(0,11)); /* file not found */
+      return(1);
+    } else if (err != 0) {
+      mdr_coutraw_puts(svarlang_str(0,10)); /* ERROR */
-  if (db == NULL) return(1);
+      return(1);
+    }
+  }
   if (mdr_cout_init(&screenw, &screenh)) {
     /* load color scheme if mdr_cout_init returns a color flag */
     SCHEME_TEXT = 0x17;
     SCHEME_STBAR1 = 0x70;
       if (db->modflag != 0) ui_msg(svarlang_str(0,4), svarlang_str(0,8), SCHEME_MSG);
       /* ask for filename */
       ui_getstring(svarlang_str(0,7), fname, sizeof(fname));
       if (fname[0] != 0) {
+        unsigned char err;
         clear_file(db);
-        db = loadfile(fname);
+        err = loadfile(db, fname);
+        if (err != 0) {
+          if (err == 1) {
+            ui_msg(svarlang_str(0,11), NULL, SCHEME_ERR); /* file not found */
+          } else {
+            ui_msg(svarlang_str(0,10), NULL, SCHEME_ERR);  /* ERROR */
+          }
+          mdr_bios_tickswait(44); /* 3s */
+          clear_file(db);
+        }
+      }
       uidirty.from = 0;
       uidirty.to = 0xff;
       uidirty.statusbar = 1;

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1560 – Rev 1345 → 1346