Subversion Repositories SvarDOS

Compare Revisions

Ignore whitespace Rev 356 → Rev 357

/svarcom/cmd/set.c
1,20 → 1,70
/*
* set [varname[=value]]
*
* value cannot contain any '=' character, but it can contain spaces
* varname can also contain spaces
*/
 
static int cmd_set(int argc, char const **argv, unsigned short env_seg) {
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);
char buff[256];
int i;
while (*env != 0) {
/* copy string to local buff for display */
for (i = 0;; i++) {
buff[i] = *env;
env++;
if (buff[i] == 0) break;
/* no arguments - display content */
if (argc == 1) {
while (*env != 0) {
/* copy string to local buff for display */
for (i = 0;; i++) {
buff[i] = *env;
env++;
if (buff[i] == 0) break;
}
puts(buff);
}
} else if ((argc == 2) && (imatch(argv[1], "/?"))) {
puts("TODO: help screen"); /* TODO */
} else { /* do not rely on argv, SET has its own rules... */
const char far *ptr;
char buff[256];
int i;
/* locate the first space */
for (ptr = 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 */
i = 0;
for (; *ptr != '='; ptr++) {
if (*ptr == '\r') goto syntax_err;
buff[i] = *ptr;
if ((buff[i] >= 'a') && (buff[i] <= 'z')) buff[i] -= ('a' - 'A');
i++;
}
 
/* if not an = sign, then error */
if (*ptr != '=') goto syntax_err;
 
/* add the eq sign to buff */
buff[i++] = '=';
ptr++;
 
/* copy value now, but make sure it contains no '=' sign */
while (*ptr != '\r') {
if (*ptr == '=') goto syntax_err;
buff[i++] = *ptr;
ptr++;
}
 
/* terminate buff */
buff[i] = 0;
 
/* TODO add it to environment */
puts(buff);
puts("TODO: ACTUALLY ADD TO ENV");
 
}
return(-1);
 
return(0);
syntax_err:
 
puts("Syntax error");
return(-1);
}
/svarcom/cmd.c
12,9 → 12,9
 
#include "cmd.h"
 
int cmd_process(int argc, const char **argv, unsigned short env_seg) {
int cmd_process(int argc, const char **argv, unsigned short env_seg, const char far *cmdline) {
 
if (imatch(argv[0], "set")) return(cmd_set(argc, argv, env_seg));
if (imatch(argv[0], "set")) return(cmd_set(argc, argv, env_seg, cmdline));
 
return(-2); /* command is not recognized as internal */
}
/svarcom/cmd.h
1,6 → 1,6
#ifndef CMD_H
#define CMD_H
 
int cmd_process(int argc, const char **argv, unsigned short env_seg);
int cmd_process(int argc, const char **argv, unsigned short env_seg, const char far *cmdline);
 
#endif
/svarcom/command.c
316,7 → 316,7
 
/* try running it as an internal command */
{
int ecode = cmd_process(argcount, argvlist, *rmod_envseg);
int ecode = cmd_process(argcount, argvlist, *rmod_envseg, cmdline);
if (ecode >= 0) *lastexitcode = ecode;
if (ecode >= -1) continue; /* command is internal but did not set an exit code */
}