return (ptr);
}
-void packed_to_token(long packed, char token[6])
+void packed_to_token(long packed, char token[TOKLEN+1])
{
// The advent->ascii mapping.
const char advent_to_ascii[] = {
// Replace trailing whitespace with \0.
for (int i = 4; i >= 0; --i) {
- if (token[i] == ' ' || token[i] == '\t')
+ if (token[i] == ' ' ||
+ token[i] == '\t')
token[i] = '\0';
else
break;
}
}
-long token_to_packed(const char token[6])
+long token_to_packed(const char token[TOKLEN+1])
{
const char ascii_to_advent[] = {
63, 63, 63, 63, 63, 63, 63, 63,
return (packed);
}
-void tokenize(char* raw, long tokens[4])
+void tokenize(char* raw, struct command_t *cmd)
{
- // set each token to 0
- for (int i = 0; i < 4; ++i)
- tokens[i] = 0;
+ memset(cmd, '\0', sizeof(struct command_t));
- // grab the first two words
- char* words[2];
- words[0] = (char*) xmalloc(strlen(raw) + 1);
- words[1] = (char*) xmalloc(strlen(raw) + 1);
- int word_count = sscanf(raw, "%s%s", words[0], words[1]);
+ /* FIXME: put a bound prefix on the %s to prevent buffer overflow */
+ int word_count = sscanf(raw, "%s%s", cmd->raw1, cmd->raw2);
// make space for substrings and zero it out
- char chunk_data[][6] = {
+ char chunk_data[][TOKLEN+1] = {
{"\0\0\0\0\0"},
{"\0\0\0\0\0"},
{"\0\0\0\0\0"},
};
// break the words into up to 4 5-char substrings
- sscanf(words[0], "%5s%5s", chunk_data[0], chunk_data[1]);
+ sscanf(cmd->raw1, "%5s%5s", chunk_data[0], chunk_data[1]);
if (word_count == 2)
- sscanf(words[1], "%5s%5s", chunk_data[2], chunk_data[3]);
- free(words[0]);
- free(words[1]);
+ sscanf(cmd->raw2, "%5s%5s", chunk_data[2], chunk_data[3]);
// uppercase all the substrings
for (int i = 0; i < 4; ++i)
chunk_data[i][j] = (char) toupper(chunk_data[i][j]);
// pack the substrings
- for (int i = 0; i < 4; ++i)
- tokens[i] = token_to_packed(chunk_data[i]);
+ cmd->wd1 = token_to_packed(chunk_data[0]);
+ cmd->wd1x = token_to_packed(chunk_data[1]);
+ cmd->wd2 = token_to_packed(chunk_data[2]);
+ cmd->wd2x = token_to_packed(chunk_data[3]);
}
/* Hide the fact that wods are corrently packed longs */
return;
if (blank == true)
- printf("\n");
+ printf("\n");
int msglen = strlen(msg);
}
// All-lowercase specifier.
- if (msg[i] == 'L' || msg[i] == 'C') {
+ if (msg[i] == 'L' ||
+ msg[i] == 'C') {
packed_to_token(arg, renderp); /* unpack directly to destination */
int len = strlen(renderp);
for (int j = 0; j < len; ++j) {
va_start(ap, blank);
switch (mode) {
case touch:
- vspeak(objects[msg].inventory, blank, ap);
+ vspeak(objects[msg].inventory, blank, ap);
break;
case look:
- vspeak(objects[msg].descriptions[skip], blank, ap);
+ vspeak(objects[msg].descriptions[skip], blank, ap);
break;
case hear:
- vspeak(objects[msg].sounds[skip], blank, ap);
+ vspeak(objects[msg].sounds[skip], blank, ap);
break;
case study:
- vspeak(objects[msg].texts[skip], blank, ap);
+ vspeak(objects[msg].texts[skip], blank, ap);
break;
case change:
- vspeak(objects[msg].changes[skip], blank, ap);
+ vspeak(objects[msg].changes[skip], blank, ap);
break;
}
va_end(ap);
free(firstword);
- if (yes == 0 || y == 0) {
+ if (yes == 0 ||
+ y == 0) {
outcome = true;
break;
- } else if (no == 0 || n == 0) {
+ } else if (no == 0 ||
+ n == 0) {
outcome = false;
break;
} else
free(firstword);
- if (yes == 0 || y == 0) {
+ if (yes == 0 ||
+ y == 0) {
speak(yes_response);
outcome = true;
break;
- } else if (no == 0 || n == 0) {
+ } else if (no == 0 ||
+ n == 0) {
speak(no_response);
outcome = false;
break;
{
for (int i = 0; i < NMOTIONS; ++i) {
for (int j = 0; j < motions[i].words.n; ++j) {
- if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
+ if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 ||
+ strchr(ignore, word[0]) == NULL ||
+ !settings.oldstyle))
return (i);
}
}
{
for (int i = 0; i < NACTIONS; ++i) {
for (int j = 0; j < actions[i].words.n; ++j) {
- if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
+ if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 ||
+ strchr(ignore, word[0]) == NULL ||
+ !settings.oldstyle))
return (i);
}
}
return range * get_next_lcg_value() / game.lcg_m;
}
-void make_zzword(char zzword[6])
+void make_zzword(char zzword[TOKLEN+1])
{
for (int i = 0; i < 5; ++i) {
zzword[i] = 'A' + randrange(26);