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

 #include "mdr\dos.h"
 #include "svarlang\svarlang.h"
-#define PVER "2023.0"
+#define PVER "2023.1"
 #define PDATE "2023"
 /*****************************************************************************
  * global variables and definitions                                          *
  *****************************************************************************/
   char buff[512]; /* read one entire sector at a time (faster) */
   char *buffptr;
   unsigned int len, llen;
   int fd;
   unsigned char eolfound;
+  int err = 0;
   /* free the entire linked list of lines */
   db_rewind(db);
   while (db->cursor) {
     struct line far *victim;
+  }
   /* zero out the struct */
   bzero(db, sizeof(struct file));
+  /* start by adding an empty line */
+  if (line_add(db, NULL, 0) != 0) return(2);
   if (fname == NULL) goto SKIPLOADING;
   mdr_dos_truename(db->fname, fname);
   if (_dos_open(fname, O_RDONLY, &fd) != 0) {
-    return(1);
+    err = 1;
+    goto SKIPLOADING;
+  }
   db->lfonly = 1;
-  /* start by adding an empty line */
-  if (line_add(db, NULL, 0) != 0) {
-    /* TODO ERROR HANDLING */
-  }
   for (eolfound = 0;;) {
     unsigned short consumedbytes;
     if ((_dos_read(fd, buff, sizeof(buff), &len) != 0) || (len == 0)) break;
     buffptr = buff;
   _dos_close(fd);
   SKIPLOADING:
-  /* 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);
+  /* rewind cursor to top of file because it has been used by line_add() */
   db_rewind(db);
-  return(0);
+  return(err);
   IOERR:
   _dos_close(fd);
   return(2);
+}
     mdr_coutraw_puts(arg);
     err = loadfile(&(dbarr[count]), arg);
     if (err) {
       if (err == 1) { /* file not found */
         if ((count == 0) && (lastarg != 0)) { /* a 'file not found' is fine if only one file was given */
-          mdr_dos_truename(dbarr[count].fname, arg);
           err = 0;
         } else {
           err = 11;
+        }
       } else { /* general error */

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c – Rev 1444 → 1448