Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 363 → Rev 367

/svarcom/cmd/cd.c
10,14 → 10,14
* Type CD without parameters to display the current drive and directory.
*/
 
static int cmd_cd(int argc, char const **argv) {
static int cmd_cd(const struct cmd_funcparam *p) {
/* two arguments max */
if (argc > 2) {
if (p->argc > 1) {
puts("Too many parameters");
}
 
/* no argument? display current drive and dir ("CWD") */
if (argc == 1) {
if (p->argc == 0) {
char buff[64];
char *buffptr = buff;
_asm {
40,21 → 40,22
xor dl, dl /* select drive (0 = current drive) */
mov si, buffptr /* 64-byte buffer for ASCIZ pathname */
int 0x21
pop si
pop dx
pop ax
pop dx
pop si
}
puts(buff);
}
 
/* argument can be either a drive (D:) or a path */
if (argc == 2) {
if (p->argc == 1) {
const char *arg = p->argv[0];
unsigned short err = 0;
/* drive (CD B:) */
if ((argv[1][0] != '\\') && (argv[1][1] == ':') && (argv[1][2] == 0)) {
if ((arg[0] != '\\') && (arg[1] == ':') && (arg[2] == 0)) {
char buff[64];
char *buffptr = buff;
unsigned char drive = argv[1][0];
unsigned short err = 0;
unsigned char drive = arg[0];
if (drive >= 'a') {
drive -= 'a';
} else {
76,19 → 77,13
pop ax
pop si
}
if (err != 0) {
if (err != 0) puts(doserr(err));
} else {
printf("%c:\\%s\r\n", drive + 'A' - 1, buff);
}
if (err == 0) printf("%c:\\%s\r\n", drive + 'A' - 1, buff);
} else { /* path */
char const *dir = argv[1];
unsigned short err = 0;
_asm {
push dx
push ax
mov ah, 0x3B /* CHDIR (set current directory) */
mov dx, dir
mov dx, arg
int 0x21
jnc DONE
mov [err], ax
96,8 → 91,8
pop ax
pop dx
}
if (err != 0) puts(doserr(err));
}
if (err != 0) puts(doserr(err));
}
 
return(-1);
/svarcom/cmd/exit.c
0,0 → 1,18
/*
* exit
*
* Quits the COMMAND.COM program (command interpreter)
*
*/
 
static int cmd_exit(const struct cmd_funcparam *p) {
if ((p->argc == 1) && (imatch(p->argv[0], "/?"))) {
puts("EXIT");
puts("");
puts("Quits the COMMAND.COM program (command interpreter)");
puts("");
} else {
exit(0);
}
return(-1);
}
/svarcom/cmd/set.c
7,13 → 7,12
 
#include "env.h"
 
 
static int cmd_set(int argc, char const **argv, unsigned short env_seg, const char far *cmdline) {
char far *env = MK_FP(env_seg, 0);
static int cmd_set(const struct cmd_funcparam *p) {
char far *env = MK_FP(p->env_seg, 0);
char buff[256];
int i;
/* no arguments - display content */
if (argc == 1) {
if (p->argc == 0) {
while (*env != 0) {
/* copy string to local buff for display */
for (i = 0;; i++) {
23,7 → 22,7
}
puts(buff);
}
} else if ((argc == 2) && (imatch(argv[1], "/?"))) {
} else if ((p->argc == 1) && (imatch(p->argv[0], "/?"))) {
puts("TODO: help screen"); /* TODO */
} else { /* set variable (do not rely on argv, SET has its own rules...) */
const char far *ptr;
30,7 → 29,7
char buff[256];
unsigned short i;
/* locate the first space */
for (ptr = cmdline; *ptr != ' '; ptr++);
for (ptr = p->cmdline; *ptr != ' '; ptr++);
/* now locate the first non-space: that's where the variable name begins */
for (; *ptr == ' '; ptr++);
/* copy variable to buff and switch it upercase */
52,7 → 51,7
buff[i] = 0;
 
/* commit variable to environment */
i = env_setvar(env_seg, buff);
i = env_setvar(p->env_seg, buff);
if (i == ENV_INVSYNT) goto syntax_err;
if (i == ENV_NOTENOM) puts("Not enough available space within the environment block");
}