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

   /* fill status bar with background */
   mdr_cout_char_rep(screenh - 1, 0, ' ', scheme[COL_STATUSBAR1], screenw);
   /* filename */
+  if (db->fname[0] == 0) {
+    mdr_cout_str(screenh - 1, 0, svarlang_str(0, 1), scheme[COL_STATUSBAR1], screenw);
+  } else {
-  mdr_cout_str(screenh - 1, 0, db->fname, scheme[COL_STATUSBAR1], screenw);
+    mdr_cout_str(screenh - 1, 0, db->fname, scheme[COL_STATUSBAR1], screenw);
+  }
   /* eol type */
   if (db->lfonly) {
     mdr_cout_str(screenh - 1, helpcol - 3, "LF", scheme[COL_STATUSBAR1], 5);
   } else {
     /* jump to next delimiter */
     while ((*tail != ' ') && (*tail != '\r')) tail++;
+  }
   /* check args now */
-  if (count != 1) return(NULL);
+  if (count == 0) return("");
   return(argv[0]);
+}
   char buff[1024];
   unsigned int prevlen = 0, len, llen;
   int fd;
   struct file *db;
+  len = strlen(fname) + 1;
+  db = calloc(1, sizeof(struct file) + len);
+  if (db == NULL) return(NULL);
+  memcpy(db->fname, fname, len);
+  if (*fname == 0) goto SKIPLOADING;
   if (_dos_open(fname, O_RDONLY, &fd) != 0) {
     mdr_coutraw_puts("Failed to open file:");
     mdr_coutraw_puts(fname);
+    free(db);
     return(NULL);
+  }
-  len = strlen(fname) + 1;
-  db = calloc(1, sizeof(struct file) + len);
-  if (db == NULL) {
-    _dos_close(fd);
-    return(NULL);
-  }
-  memcpy(db->fname, fname, len);
   db->lfonly = 1;
   do {
     if (_dos_read(fd, buff + prevlen, sizeof(buff) - prevlen, &len) == 0) {
       len += prevlen;
     prevlen = len;
   } while (len > 0);
   _dos_close(fd);
+  SKIPLOADING:
   /* add an empty line at end if not present already, also rewind cursor to top of file */
   if (db != NULL) {
-    if (db->cursor->len != 0) line_add(db, "");
+    if ((db->cursor == NULL) || (db->cursor->len != 0)) line_add(db, "");
     db_rewind(db);
+  }
   return(db);
+}

Subversion Repositories SvarDOS

(root)/sved/trunk/sved.c @ 1560 – Rev 1320 → 1321