Subversion Repositories SvarDOS

Rev

Rev 1442 | Rev 1448 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1442 Rev 1444
Line 557... Line 557...
557 
  /* zero out the struct */
 557 
  /* zero out the struct */
558 
  bzero(db, sizeof(struct file));
 558 
  bzero(db, sizeof(struct file));
559 
 
 559 
 
560 
  if (fname == NULL) goto SKIPLOADING;
 560 
  if (fname == NULL) goto SKIPLOADING;
561 
 
 561 
 
562 
  memcpy(db->fname, fname, strlen(fname));
 562 
  mdr_dos_truename(db->fname, fname);
563 
 
 563 
 
564 
  if (_dos_open(fname, O_RDONLY, &fd) != 0) {
 564 
  if (_dos_open(fname, O_RDONLY, &fd) != 0) {
565 
    return(1);
 565 
    return(1);
566 
  }
 566 
  }
567 
 
 567 
 
Line 725... Line 725...
725 
    mdr_coutraw_puts(arg);
 725 
    mdr_coutraw_puts(arg);
726 
    err = loadfile(&(dbarr[count]), arg);
 726 
    err = loadfile(&(dbarr[count]), arg);
727 
    if (err) {
 727 
    if (err) {
728 
      if (err == 1) { /* file not found */
 728 
      if (err == 1) { /* file not found */
729 
        if ((count == 0) && (lastarg != 0)) { /* a 'file not found' is fine if only one file was given */
 729 
        if ((count == 0) && (lastarg != 0)) { /* a 'file not found' is fine if only one file was given */
730 
          memcpy(dbarr[count].fname, arg, strlen(arg) + 1);
 730 
          mdr_dos_truename(dbarr[count].fname, arg);
731 
          err = 0;
 731 
          err = 0;
732 
        } else {
 732 
        } else {
733 
          err = 11;
 733 
          err = 11;
734 
        }
 734 
        }
735 
      } else { /* general error */
 735 
      } else { /* general error */
Line 1102... Line 1102...
1102 
        case MENU_SAVE:
 1102 
        case MENU_SAVE:
1103 
          if ((saveflag != 0) || (db->fname[0] == 0)) { /* save as... */
 1103 
          if ((saveflag != 0) || (db->fname[0] == 0)) { /* save as... */
1104 
            ui_getstring(svarlang_str(0,6), fname, sizeof(fname));
 1104 
            ui_getstring(svarlang_str(0,6), fname, sizeof(fname));
1105 
            if (*fname == 0) break;
 1105 
            if (*fname == 0) break;
1106 
            saveflag = savefile(db, fname);
 1106 
            saveflag = savefile(db, fname);
1107 
            if (saveflag == 0) memcpy(db->fname, fname, sizeof(fname));
 1107 
            if (saveflag == 0) mdr_dos_truename(db->fname, fname);
1108 
          } else {
 1108 
          } else {
1109 
            saveflag = savefile(db, NULL);
 1109 
            saveflag = savefile(db, NULL);
1110 
          }
 1110 
          }
1111 
 
 1111 
 
1112 
          mdr_cout_cursor_hide();
 1112 
          mdr_cout_cursor_hide();