Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 415 → Rev 416

/svarcom/trunk/cmd/cd.c
11,36 → 11,6
*/
 
 
/* display current path drive d (A=1, B=2, etc)
* returns 0 on success, doserr otherwise */
static unsigned short cmd_cd_curpathfordrv(char *buff, unsigned char d) {
unsigned short r = 0;
 
buff[0] = d + 'A' - 1;
buff[1] = ':';
buff[2] = '\\';
 
_asm {
push si
push ax
push dx
mov ah, 0x47 /* get current directory */
mov dl, [d] /* A: = 1, B: = 2, etc */
mov si, buff /* append cur dir to buffer */
add si, 3 /* skip the present drive:\ prefix */
int 0x21
jnc DONE
mov [r], ax /* copy result from ax */
DONE:
pop dx
pop ax
pop si
}
 
return(r);
}
 
 
static int cmd_cd(struct cmd_funcparam *p) {
char *buffptr = p->BUFFER;
 
68,21 → 38,8
 
/* no argument? display current drive and dir ("CWD") */
if (p->argc == 0) {
unsigned char drv = 0;
 
_asm {
push ax
push dx
push si
mov ah, 0x19 /* get current default drive */
int 0x21 /* al = drive (00h = A:, 01h = B:, etc) */
inc al /* convert to 1=A, 2=B, etc */
mov [drv], al
}
 
cmd_cd_curpathfordrv(buffptr, drv);
curpathfordrv(buffptr, 0);
outputnl(buffptr);
 
return(-1);
}
 
99,7 → 56,7
drive -= ('A' - 1);
}
 
err = cmd_cd_curpathfordrv(buffptr, drive);
err = curpathfordrv(buffptr, drive);
if (err == 0) outputnl(buffptr);
} else { /* path */
_asm {
/svarcom/trunk/helpers.c
360,3 → 360,42
}
return(len);
}
 
 
/* get current path drive d (A=1, B=2, etc - 0 is "current drive")
* returns 0 on success, doserr otherwise */
unsigned short curpathfordrv(char *buff, unsigned char d) {
unsigned short r = 0;
 
_asm {
/* is d == 0? then I need to resolve current drive */
cmp byte ptr [d], 0
jne GETCWD
/* resolve cur drive */
mov ah, 0x19 /* get current default drive */
int 0x21 /* al = drive (00h = A:, 01h = B:, etc) */
inc al /* convert to 1=A, 2=B, etc */
mov [d], al
 
GETCWD:
/* prepend buff with drive:\ */
mov si, buff
mov dl, [d]
mov [si], dl
add byte ptr [si], 'A' - 1
inc si
mov [si], ':'
inc si
mov [si], '\\'
inc si
 
mov ah, 0x47 /* get current directory of drv DL into DS:SI */
int 0x21
jnc DONE
mov [r], ax /* copy result from ax */
 
DONE:
}
 
return(r);
}
/svarcom/trunk/helpers.h
85,4 → 85,8
* returns the (possibly updated) length of path */
unsigned short path_appendbkslash_if_dir(char *path);
 
/* get current path drive d (A=1, B=2, etc - 0 is "current drive")
* returns 0 on success, doserr otherwise */
unsigned short curpathfordrv(char *buff, unsigned char d);
 
#endif