github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-05-03 22:48:31 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes and compiler warnings. Unix readline support, pass 1

Browse Source 
Fix various compiler warnings.

Fix bug causing double free when a file isn't found.

Fix bug using uninitialized variable parsing null filename.

Fix bug causing crash when format 3 retrieval pointer encountered.

Add support for readline (command line editing and history on Unix)

Untangle NT I/O so it builds without the direct access SCSI API & works.

Report errors as text messages everywhere.

Add MSVC project files.

Implement most of dir/full

Partially implement XABITM

Add help to command tables.

Allow choice of VMS qualifiers or Unix options.
  mount /write // /dev/cdrom
or
  mount -write /dev/cdrom

Parse quoted strings as command parameters.
   Mount /write "/dev/cdrom"
   search [*...]*.txt "My words for you"

Resolve command, parameter & qualifier ambiguity from tables.

Consolidate the various makefiles into a common file with very small
platform-specific wrappers.  This simplifies maintenance.

Add diskio module to allow easy access to .iso images and simulator files.
Removes requirement for loop device or equivalent.  Builds as a separate
executable.

Writes to the ODS2 volumes are broken.
This commit is contained in:
Timothe Litt
2016-02-26 17:46:46 -05:00
parent 3b052a6aa6
commit 61c8001044
38 changed files with 3289 additions and 2269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
extracters/ods2/access.c
View File

@@ -24,7 +24,7 @@
#include "ssdef.h"
#include "access.h"
#include "phyio.h"
#include "compat.h"
#define DEBUGx
@@ -158,6 +158,9 @@ int wcb_compare(unsigned hashval,void *keyval,void *thiswcb)
{
register struct WCBKEY *wcbkey = (struct WCBKEY *) keyval;
register struct WCB *wcb = (struct WCB *) thiswcb;
UNUSED(hashval);
if (wcbkey->vbn < wcb->loblk) {
return -1; /* Search key is less than this window maps... */
} else {
@@ -215,6 +218,9 @@ struct HEAD *premap_indexf(struct FCB *fcb,unsigned *retsts)
void *wcb_create(unsigned hashval,void *keyval,unsigned *retsts)
{
register struct WCB *wcb = (struct WCB *) malloc(sizeof(struct WCB));
UNUSED(hashval);
if (wcb == NULL) {
*retsts = SS$_INSFMEM;
} else {
@@ -276,6 +282,10 @@ void *wcb_create(unsigned hashval,void *keyval,unsigned *retsts)
phylen = ((VMSWORD(*mp) & 037777) << 16) + VMSWORD(mp[1]) + 1;
phyblk = (VMSWORD(mp[3]) << 16) | VMSWORD(mp[2]);
mp += 4;
break;
default:
printf( "Unknown type %x\n", (VMSWORD(*mp)>>14) );
exit(1);
}
curvbn += phylen;
if (phylen != 0 && curvbn > wcb->loblk) {
@@ -368,16 +378,19 @@ unsigned getwindow(struct FCB * fcb,unsigned vbn,struct VCBDEV **devptr,
void *vioc_manager(struct CACHE * cacheobj,int flushonly)
{
register struct VIOC *vioc = (struct VIOC *) cacheobj;
UNUSED(flushonly);
if (vioc->modmask != 0) {
register struct FCB *fcb = vioc->fcb;
register int length = VIOC_CHUNKSIZE;
register unsigned int length = VIOC_CHUNKSIZE;
register unsigned curvbn = vioc->cache.hashval + 1;
register char *address = (char *) vioc->data;
register unsigned modmask = vioc->modmask;
printf("\nvioc_manager writing vbn %d\n",curvbn);
do {
register unsigned sts;
int wrtlen = 0;
unsigned int wrtlen = 0;
unsigned phyblk,phylen;
struct VCBDEV *vcbdev;
while (length > 0 && (1 & modmask) == 0) {
@@ -448,7 +461,7 @@ void *vioc_create(unsigned hashval,void *keyval,unsigned *retsts)
if (vioc == NULL) {
*retsts = SS$_INSFMEM;
} else {
register int length;
register unsigned int length;
register unsigned curvbn = hashval + 1;
register char *address;
register struct FCB *fcb = (struct FCB *) keyval;
@@ -499,7 +512,7 @@ unsigned accesschunk(struct FCB *fcb,unsigned vbn,struct VIOC **retvioc,
char **retbuff,unsigned *retblocks,unsigned wrtblks)
{
unsigned sts;
register int blocks;
register unsigned int blocks;
register struct VIOC *vioc;
#ifdef DEBUG
printf("Access chunk %8x %d (%x)\n",base,vbn,fcb->cache.hashval);
@@ -590,6 +603,10 @@ void *fcb_manager(struct CACHE *cacheobj,int flushonly)
void *fcb_create(unsigned filenum,void *keyval,unsigned *retsts)
{
register struct FCB *fcb = (struct FCB *) malloc(sizeof(struct FCB));
UNUSED(filenum);
UNUSED(keyval);
if (fcb == NULL) {
*retsts = SS$_INSFMEM;
} else {
@@ -718,9 +735,12 @@ unsigned dismount(struct VCB * vcb)
unsigned mount(unsigned flags,unsigned devices,char *devnam[],char *label[],struct VCB **retvcb)
{
register unsigned device,sts;
register unsigned device,sts = 0;
struct VCB *vcb;
struct VCBDEV *vcbdev;
UNUSED(label);
if (sizeof(struct HOME) != 512 || sizeof(struct HEAD) != 512) return SS$_NOTINSTALL;
vcb = (struct VCB *) malloc(sizeof(struct VCB) + (devices - 1) * sizeof(struct VCBDEV));
if (vcb == NULL) return SS$_INSFMEM;
@@ -733,7 +753,7 @@ unsigned mount(unsigned flags,unsigned devices,char *devnam[],char *label[],stru
sts = SS$_NOSUCHVOL;
vcbdev->dev = NULL;
if (strlen(devnam[device])) {
int hba;
unsigned int hba;
sts = device_lookup(strlen(devnam[device]),devnam[device],1,&vcbdev->dev);
if (!(sts & 1)) break;
for (hba = 1; hba <= HOME_LIMIT; hba++) {
@@ -789,8 +809,12 @@ unsigned mount(unsigned flags,unsigned devices,char *devnam[],char *label[],stru
vcbdev->clustersize = vcbdev->home.hm2$w_cluster;
vcbdev->max_cluster = (scb->scb$l_volsize + scb->scb$w_cluster - 1) / scb->scb$w_cluster;
deaccesschunk(vioc,0,0,0);
sts = update_freecount(vcbdev,&vcbdev->free_clusters);
printf("Freespace is %d\n",vcbdev->free_clusters);
sts = update_freecount(vcbdev,&vcbdev->free_clusters);
#ifdef DEBUG
printf( "%d of %d blocks are free on %12.12s\n",
vcbdev->free_clusters * vcbdev->clustersize, scb->scb$l_volsize,
vcbdev->home.hm2$t_volname );
#endif
}
}
}