Big changes in code of clients, screens and widgets.
- Moved and altered code to create, destroy and manipulate clients, screens and widgets in an OO-like manner. - Moved command execution code to a commands directory, splitting commands to what subject they are concerned. - Menus are temporary disabled while working on new menu structure.
This commit is contained in:
robijn
+104
-109
@@ -24,7 +24,7 @@
|
||||
#include "shared/sockets.h"
|
||||
#include "shared/report.h"
|
||||
#include "clients.h"
|
||||
#include "client_functions.h"
|
||||
#include "commands/command_list.h"
|
||||
#include "parse.h"
|
||||
|
||||
/* This is a big function... TOO big. How to trim....
|
||||
@@ -38,7 +38,7 @@ parse_all_client_messages ()
|
||||
{
|
||||
int i; /* int j, len;*/
|
||||
/*int newtoken, inquote;*/
|
||||
client *c;
|
||||
Client * c;
|
||||
char *str, *p, *q, *s;
|
||||
/* char *tok;*/
|
||||
int argc;
|
||||
@@ -60,130 +60,125 @@ parse_all_client_messages ()
|
||||
#define LINE_TERM_CHAR '\0'
|
||||
#define COMMENT_CHAR '#'
|
||||
|
||||
/*debug("parse: Rewinding list...");*/
|
||||
LL_Rewind (clients);
|
||||
do {
|
||||
/* 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...");*/
|
||||
for (str = client_get_message (c); str; str = client_get_message (c)) {
|
||||
debug (RPT_DEBUG, "parse: ...%s", str);
|
||||
/* Now, split up the string...*/
|
||||
argc = 0;
|
||||
i = 0;
|
||||
q = p = str;
|
||||
for( c=clients_getfirst(); c; c=clients_getnext()) {
|
||||
|
||||
if (*p == COMMENT_CHAR) {
|
||||
continue; /* found a comment line - skip it...*/
|
||||
/* 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...*/
|
||||
argc = 0;
|
||||
i = 0;
|
||||
q = p = str;
|
||||
|
||||
if (*p == COMMENT_CHAR) {
|
||||
continue; /* found a comment line - skip it...*/
|
||||
}
|
||||
|
||||
debug (RPT_DEBUG, "starting string scan...");
|
||||
|
||||
do {
|
||||
/* bypass initial white space...*/
|
||||
while ((*p == SEPARATOR_CHAR) && (*p)) {
|
||||
p++;
|
||||
q++;
|
||||
}
|
||||
|
||||
debug (RPT_DEBUG, "starting string scan...");
|
||||
/* 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)
|
||||
*/
|
||||
|
||||
do {
|
||||
/* 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:
|
||||
if (*p == LINE_TERM_CHAR) {
|
||||
break;
|
||||
/* if there are no arguments, argc == 0 and will fail
|
||||
* appropriately...
|
||||
*
|
||||
* 1. There is nothing but white space on this line (odd..)
|
||||
* 2. This is trailing white space (odd... but allowable)
|
||||
* if this is trailing white space, ignore the argc++ at the
|
||||
* end and claim this as the end...
|
||||
*/
|
||||
}
|
||||
|
||||
/* 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...*/
|
||||
while ((rightquote[quoteindex] != *p) && (*p != LINE_TERM_CHAR)) {
|
||||
p++;
|
||||
}
|
||||
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...
|
||||
/* 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?
|
||||
*/
|
||||
}
|
||||
|
||||
/* 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...*/
|
||||
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!!*/
|
||||
snprintf (errmsg, sizeof(errmsg), "huh? unterminated string! missing ending %c\n",
|
||||
rightquote[quoteindex]);
|
||||
sock_send_string (c->sock, errmsg);
|
||||
if (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR) {
|
||||
sock_send_string (c->sock, "huh? improperly terminated string! (missing whitespace)\n");
|
||||
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?
|
||||
*/
|
||||
if (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR) {
|
||||
sock_send_string (c->sock, "huh? improperly terminated string! (missing whitespace)\n");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
/* Otherwise, normal string...*/
|
||||
} else {
|
||||
while (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR)
|
||||
p++;
|
||||
}
|
||||
|
||||
/* Not end of line?*/
|
||||
if (*p) {
|
||||
*p = LINE_TERM_CHAR;
|
||||
/*debug(RPT_DEBUG, "found new token: %s", q);*/
|
||||
argv[i++] = q;
|
||||
q = ++p;
|
||||
} else {
|
||||
/*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.
|
||||
*/
|
||||
|
||||
|
||||
argc++;
|
||||
} while (*p);
|
||||
|
||||
/*debug(RPT_DEBUG, "exiting string scan...");*/
|
||||
|
||||
argv[argc] = NULL;
|
||||
if (argc < 1)
|
||||
continue;
|
||||
|
||||
/* 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...*/
|
||||
}
|
||||
/* Otherwise, normal string...*/
|
||||
} else {
|
||||
while (*p != SEPARATOR_CHAR && *p != LINE_TERM_CHAR)
|
||||
p++;
|
||||
}
|
||||
|
||||
if (invalid) {
|
||||
snprintf (errmsg, sizeof(errmsg), "huh? Invalid command \"%s\"\n", argv[0]);
|
||||
sock_send_string (c->sock, errmsg);
|
||||
/* Not end of line?*/
|
||||
if (*p) {
|
||||
*p = LINE_TERM_CHAR;
|
||||
/*debug(RPT_DEBUG, "found new token: %s", q);*/
|
||||
argv[i++] = q;
|
||||
q = ++p;
|
||||
} else {
|
||||
/*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.
|
||||
*/
|
||||
|
||||
free (str); /* fixed memory leak?*/
|
||||
} /* end for(str...)*/
|
||||
} /* end if (c)*/
|
||||
} while (LL_Next (clients) == 0);
|
||||
|
||||
argc++;
|
||||
} while (*p);
|
||||
|
||||
/*debug(RPT_DEBUG, "exiting string scan...");*/
|
||||
|
||||
argv[argc] = NULL;
|
||||
if (argc < 1)
|
||||
continue;
|
||||
|
||||
/* 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...*/
|
||||
}
|
||||
}
|
||||
|
||||
if (invalid) {
|
||||
snprintf (errmsg, sizeof(errmsg), "huh? Invalid command \"%.40s\"\n", argv[0]);
|
||||
sock_send_string (c->sock, errmsg);
|
||||
}
|
||||
|
||||
free (str); /* fixed memory leak?*/
|
||||
} /* end for(str...)*/
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user