mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.5 kick-off

Browse Source
This commit is contained in:
robijn
2001-12-30 00:15:25 +00:00
parent c28d25b795
commit 71056ec551
88 changed files with 6638 additions and 5469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/parse.c
+53 -49
View File
@@ -6,7 +6,6 @@
* COPYING file distributed with this package.
*
* Copyright (c) 1999, William Ferrell, Scott Scriven
* 2001, Joris Robijn
*
*
* Handles input commands from clients, by splitting strings into tokens
@@ -28,22 +27,23 @@
#include "client_functions.h"
#include "parse.h"
// This is a big function... TOO big. How to trim....
// TODO: Simplify... simplify...
/* This is a big function... TOO big. How to trim....
* TODO: Simplify... simplify...
*/
#define MAX_ARGUMENTS 256
int
parse_all_client_messages ()
{
int i; // int j, len;
//int newtoken, inquote;
int i; /* int j, len;*/
/*int newtoken, inquote;*/
client *c;
char *str, *p, *q, *s;
// char *tok;
/* char *tok;*/
int argc;
char *argv[MAX_ARGUMENTS];
//char delimiters[] = " ";
/*char delimiters[] = " ";*/
char leftquote[] = "\"'`([{";
char rightquote[] = "\"'`)]}";
char errmsg[256];
@@ -60,114 +60,118 @@ parse_all_client_messages ()
#define LINE_TERM_CHAR '\0'
#define COMMENT_CHAR '#'
//debug("parse: Rewinding list...");
/*debug("parse: Rewinding list...");*/
LL_Rewind (clients);
do {
// Get the next client...
//debug("parse: Getting client...");
/* Get the next client...*/
/*debug("parse: Getting client...");*/
c = LL_Get (clients);
if (c) {
// And parse all its messages...
//debug(RPT_DEBUG, "parse: Getting messages...");
/* And parse all its messages...*/
/*debug(RPT_DEBUG, "parse: Getting messages...");*/
for (str = client_get_message (c); str; str = client_get_message (c)) {
debug (RPT_DEBUG, "parse: ...%s", str);
// Now, split up the string...
/* Now, split up the string...*/
argc = 0;
i = 0;
q = p = str;
if (*p == COMMENT_CHAR) {
continue; // found a comment line - skip it...
continue; /* found a comment line - skip it...*/
}
debug (RPT_DEBUG, "starting string scan...");
do {
// bypass initial white space...
/* bypass initial white space...*/
while ((*p == SEPARATOR_CHAR) && (*p)) {
p++;
q++;
}
// If (*p) is null here, we reached the end of
// an empty parameter... so one of two things
// is true:
//
// 1. There is nothing but white space on this line (odd..)
// 2. This is trailing white space (odd... but allowable)
/* If (*p) is null here, we reached the end of
* an empty parameter... so one of two things
* is true:
*
* 1. There is nothing but white space on this line (odd..)
* 2. This is trailing white space (odd... but allowable)
*/
if (*p == LINE_TERM_CHAR) {
break;
// if there are no arguments, argc == 0 and will fail
// appropriately...
//
// if this is trailing white space, ignore the argc++ at the
// end and claim this as the end...
/* if there are no arguments, argc == 0 and will fail
* appropriately...
*
* if this is trailing white space, ignore the argc++ at the
* end and claim this as the end...
*/
}
// Handle quoted strings...
/* Handle quoted strings...*/
if ((s = strchr(leftquote, *p)) != NULL) {
quoteindex = s - leftquote;
//debug(RPT_DEBUG, "found <%c> at index [%d] = <%c>", *p, quoteindex, leftquote[quoteindex]);
q = ++p; // past open quote...
/*debug(RPT_DEBUG, "found <%c> at index [%d] = <%c>", *p, quoteindex, leftquote[quoteindex]);*/
q = ++p; /* past open quote...*/
while ((rightquote[quoteindex] != *p) && (*p != LINE_TERM_CHAR)) {
p++;
}
if (*p == LINE_TERM_CHAR) {
// We just sucked up the rest of the command line: ERROR!!
/* We just sucked up the rest of the command line: ERROR!!*/
snprintf (errmsg, sizeof(errmsg), "huh? unterminated string! missing ending %c\n",
rightquote[quoteindex]);
sock_send_string (c->sock, errmsg);
continue;
} else {
*p = LINE_TERM_CHAR; // terminate string
p++; // bypass to next character
// Note that next character could be a EndOfLine (null)
// if the string was last on the line, or it could be
// something else... is it a blank?
*p = LINE_TERM_CHAR; /* terminate string*/
p++; /* bypass to next character*/
/* Note that next character could be a EndOfLine (null)
* if the string was last on the line, or it could be
* something else... is it a blank?
*/
if (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR) {
sock_send_string (c->sock, "huh? improperly terminated string! (missing whitespace)\n");
continue;
}
}
// Otherwise, normal string...
/* Otherwise, normal string...*/
} else {
while (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR)
p++;
}
// Not end of line?
/* Not end of line?*/
if (*p) {
*p = LINE_TERM_CHAR;
//debug(RPT_DEBUG, "found new token: %s", q);
/*debug(RPT_DEBUG, "found new token: %s", q);*/
argv[i++] = q;
q = ++p;
} else {
//debug(RPT_DEBUG, "found new token: %s", q);
/*debug(RPT_DEBUG, "found new token: %s", q);*/
argv[i++] = q;
}
// At the end of this statement,
// *p will be '\0' if end of input reached;
// otherwise, it is the first character of the
// next part of the string.
/* At the end of this statement,
* *p will be '\0' if end of input reached;
* otherwise, it is the first character of the
* next part of the string.
*/
argc++;
} while (*p);
//debug(RPT_DEBUG, "exiting string scan...");
/*debug(RPT_DEBUG, "exiting string scan...");*/
argv[argc] = NULL;
if (argc < 1)
continue;
// Now find and call the appropriate function...
/* Now find and call the appropriate function...*/
invalid = 1;
for (i = 0; commands[i].keyword; i++) {
if (0 == strcmp (argv[0], commands[i].keyword)) {
invalid = commands[i].function (c, argc, argv);
break; // found our function - don't continue on...
break; /* found our function - don't continue on...*/
}
}
@@ -176,9 +180,9 @@ parse_all_client_messages ()
sock_send_string (c->sock, errmsg);
}
free (str); // fixed memory leak?
} // end for(str...)
} // end if (c)
free (str); /* fixed memory leak?*/
} /* end for(str...)*/
} /* end if (c)*/
} while (LL_Next (clients) == 0);
return 0;