diff options
| author | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-09-29 20:09:19 +0000 |
| commit | d4e70391772e9b3fa25d96b93d50278ea1c125ef (patch) | |
| tree | 8397c40eb0fbcd1e79470ce8389a29cbebc02ca6 /usr.bin/doscmd/intff.c | |
| parent | 073b941095e3deeaae66ec3452643c4db25deb08 (diff) | |
| download | FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.zip FreeBSD-src-d4e70391772e9b3fa25d96b93d50278ea1c125ef.tar.gz | |
Unbreak doscmd after the sigset_t change:
doscmd heavily depends on struct sigcontext which luckily is mostly passed
between functions as usion regcontext_t. By redefining union regcontext_t in
terms of mcontext_t almost all bases are covered.
It also seems to me that doscmd was in a transitional state. The redundant
definitions made it difficult to get a clear overview and could easily cause
oversight. To make sure my changes were ok, I went as far as to complete the
transition. It was not exactly necessary, but I expect to have to come back
here some more ("whistle" if I'm wrong :-).
Diffstat (limited to 'usr.bin/doscmd/intff.c')
| -rw-r--r-- | usr.bin/doscmd/intff.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c index fd167af..800424c 100644 --- a/usr.bin/doscmd/intff.c +++ b/usr.bin/doscmd/intff.c @@ -273,7 +273,7 @@ int2f11_open(regcontext_t *REGS) ** get attributes/access mode off stack : low byte is attribute, high ** byte is (sometimes) used in conjunction with 'action' */ - attr = *(u_short *)N_GETPTR(R_SS, R_SP) & 0xff; + attr = *(u_short *)MAKEPTR(R_SS, R_SP) & 0xff; /* which style? */ switch(R_AL) { @@ -482,8 +482,8 @@ int2f11_fnqual(regcontext_t *REGS) savedrive = diskdrive; /* to get CWD for network drive */ diskdrive = n_drive; - fname = (char *)N_GETPTR(R_DS, R_SI); /* path pointers */ - tname = (char *)N_GETPTR(R_ES, R_DI); + fname = (char *)MAKEPTR(R_DS, R_SI); /* path pointers */ + tname = (char *)MAKEPTR(R_ES, R_DI); error = dos_makepath(fname, tname); if (error) @@ -610,7 +610,7 @@ int2f11_validate(regcontext_t *REGS) case 0x0c: /* in es:di */ case 0x1c: - r_cds = (CDS *)N_GETPTR(R_ES, R_DI); + r_cds = (CDS *)MAKEPTR(R_ES, R_DI); break; } @@ -628,7 +628,7 @@ int2f11_validate(regcontext_t *REGS) case 0x21: case 0x2d: case 0x2e: - r_sft = (SFT *)N_GETPTR(R_ES, R_DI); + r_sft = (SFT *)MAKEPTR(R_ES, R_DI); break; } @@ -796,8 +796,8 @@ intff(regcontext_t *REGS) debug(D_REDIR, "redirector duplicate install ignored\n"); return; } - lol = (LOL *)N_GETPTR(R_BX, R_DX); /* where DOS keeps its goodies */ - sda = (SDA *)N_GETPTR(R_DI, R_SI); + lol = (LOL *)MAKEPTR(R_BX, R_DX); /* where DOS keeps its goodies */ + sda = (SDA *)MAKEPTR(R_DI, R_SI); init_drives(); /* initialise dispatcher */ |
