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

  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include <dos.h>      /* _dos_open(), _dos_read(), _dos_close(), ... */
-#include <fcntl.h>    /* O_RDONLY, O_WRONLY */
+#include <i86.h> /* MK_FP() */
-#include <string.h>
+#include "libc.h"
-#include <strings.h>
 #include "mdr\bios.h"
 #include "mdr\cout.h"
 #include "mdr\dos.h"
  * functions                                                                 *
  *****************************************************************************/
 static struct line far *line_calloc(unsigned short siz) {
   struct line far *res;
-  unsigned int seg;
+  unsigned short seg;
-  if (_dos_allocmem((sizeof(struct line) + siz + 15) / 16, &seg) != 0) return(NULL);
+  seg = mdr_dos_allocmem((sizeof(struct line) + siz + 15) / 16);
+  if (seg == 0) return(NULL);
   res = MK_FP(seg, 0);
   res->len = 0;
   res->next = NULL;
   res->prev = NULL;
   _dos_freemem(FP_SEG(ptr));
+}
 static int curline_resize(struct file *db, unsigned short newsiz) {
-  unsigned int maxavail;
+  unsigned short maxavail;
   struct line far *newptr;
   /* try resizing the block (much faster) */
-  if (_dos_setblock((sizeof(struct line) + newsiz + 15) / 16, FP_SEG(db->cursor), &maxavail) == 0) return(0);
+  if (mdr_dos_resizeblock((sizeof(struct line) + newsiz + 15) / 16, FP_SEG(db->cursor), &maxavail) == 0) return(0);
   /* create a new block and copy data over */
   newptr = line_calloc(newsiz);
   if (newptr == NULL) return(-1);
   _fmemmove(newptr, db->cursor, sizeof(struct line) + db->cursor->len);
 /* saves db file, resets db->modflag on success and overwrites the filename
  * field if saveas is not NULL */
 static int savefile(struct file *db, const char *saveas) {
   int fd = 0;
   const struct line far *l;
-  unsigned int bytes;
+  unsigned short bytes;
   unsigned char eollen = 2;
   const unsigned char *eolbuf = "\r\n";
   int errflag = 0;
   /* if filename not overloaded then use the fname in db */
+  }
   while (l) {
     /* do not write the last empty line, it is only useful for edition */
     if (l->len != 0) {
-      errflag |= _dos_write(fd, l->payload, l->len, &bytes);
+      errflag |= mdr_dos_write(fd, l->payload, l->len, &bytes);
     } else if (l->next == NULL) {
       break;
+    }
-    errflag |= _dos_write(fd, eolbuf, eollen, &bytes);
+    errflag |= mdr_dos_write(fd, eolbuf, eollen, &bytes);
     l = l->next;
+  }
-  errflag |= _dos_close(fd);
+  errflag |= mdr_dos_fclose(fd);
   /* did it all work? */
   if (errflag == 0) {
     db->modflag = 0;
     if (saveas != db->fname) mdr_dos_truename(db->fname, saveas);
 #define LOADFILE_FILENOTFOUND 2
 /* returns 0 on success, 1 on file not found, 2 on other error */
 static unsigned char loadfile(struct file *db, const char *fname) {
   char *buffptr;
-  unsigned int len, llen;
+  unsigned short len, llen;
-  int fd;
+  unsigned short fd;
   unsigned char eolfound;
   unsigned char err = 0;
   /* free the entire linked list of lines */
   db_rewind(db);
   if (fname == NULL) goto SKIPLOADING;
   /* make the filename canonical (DOS 3+ only, on earlier versions it just copies the filename) */
   mdr_dos_truename(db->fname, fname);
-  err = _dos_open(fname, O_RDONLY, &fd);
+  err = mdr_dos_fopen(fname, &fd);
   if (err != 0) goto SKIPLOADING;
   db->lfonly = 1;
   for (eolfound = 0;;) {
     unsigned short consumedbytes;
-    if ((_dos_read(fd, buff, sizeof(buff), &len) != 0) || (len == 0)) break;
+    if ((mdr_dos_read(fd, buff, sizeof(buff), &len) != 0) || (len == 0)) break;
     buffptr = buff;
     FINDLINE:
     /* look for nearest \n (also expand tabs) */
       goto FINDLINE;
+    }
+  }
-  _dos_close(fd);
+  mdr_dos_fclose(fd);
   SKIPLOADING:
   /* rewind cursor to top of file because it has been used by line_add() */
   db_rewind(db);
   return(err);
   IOERR:
-  _dos_close(fd);
+  mdr_dos_fclose(fd);
   return(1);
+}
 /* a custom argv-parsing routine that looks directly inside the PSP, avoids the need
   static struct file dbarr[10];
   struct file *db = dbarr; /* visible file is the first slot by default */
   static struct line far *clipboard;
   static unsigned char original_breakflag;
+  mdr_coutraw_puts("glob_monomode:");
+  mdr_coutraw_char('0' + glob_monomode);
+  mdr_coutraw_crlf();
+  mdr_coutraw_puts("original_breakflag:");
+  mdr_coutraw_char('0' + original_breakflag);
+  mdr_coutraw_crlf();
   { /* load NLS resource */
     unsigned short i = 0;
     const char far *selfptr;
     char lang[8];
     selfptr = mdr_dos_selfexe();
     SCHEME_STBAR2 = 0x78;
     SCHEME_STBAR3 = 0x3f;
     SCHEME_SCROLL = 0x70;
     SCHEME_MSG = 0x6f;
     SCHEME_ERR = 0x4f;
+  } else {
+    // FIXME
+    mdr_coutraw_char('0' + glob_monomode);
+    _asm int 0x20
+  }
   screenlastrow = screenh - 1;
   screenlastcol = screenw - 1;
   /* instruct DOS to stop detecting CTRL+C because user needs it for

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1559 – Rev 1555 → 1556