2005-11-25 Bryan Worth <bryan@theworths.org>

        * TODO: checked off MESSAGE

        *src/ttt-client.c: (_ttt_client_execute_message): Implement MESSAGE
        *(_execute_request): changed arg_required to behave as a minimum
        instead of an absolute number to allow optional arguments such as
        multi-word messages

diff --git a/ChangeLog b/ChangeLog
index df44897953e563538ef1fdeeec4b2012a8ac724a..e08c526481507abe22650fa45fa8a04e541f9e43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-25  Bryan Worth <bryan@theworths.org>
+       * TODO: checked off MESSAGE
+
+       *src/ttt-client.c: (_ttt_client_execute_message): Implement MESSAGE
+       *(_execute_request): changed arg_required to behave as a minimum
+        instead of an absolute number to allow optional arguments such as 
+        multi-word messages
+
 2005-11-25  Richard D. Worth  <richard@theworths.org>
 
        * TODO: checked off WHO, QUIT, ERROR SYNTAX

diff --git a/TODO b/TODO
index 0e94c69ece02171d158e5fd70d4b1af86d2e8522..a795a03f31d049f1ab0c102279efe19562379efb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@ S C
 ✓   1.1 HELO
     1.2. Global commands
 ✓   1.2.1. WHO
-    1.2.2. MESSAGE
+✓   1.2.2. MESSAGE
     1.2.3. HELP
 ✓   1.2.4. QUIT
     1.2.5. VERSION

diff --git a/src/ttt-client.c b/src/ttt-client.c
index 24738649e2f52990dd3631e48e1eee9183c28d40..53cc4ff3556ce728669a8833919a85c19d197a01 100644 (file)
--- a/src/ttt-client.c
+++ b/src/ttt-client.c
@@ -62,6 +62,13 @@ _ttt_client_execute_quit (ttt_client_t *client,
                          char         **args,
                          int          num_args);
 
+static ttt_error_t
+_ttt_client_execute_message (ttt_client_t *client,
+                            char         **args,
+                            int          num_args);
+
+
+
 typedef struct _ttt_command_description {
     const char         *command;
     int                args_required;
@@ -69,10 +76,12 @@ typedef struct _ttt_command_description {
 } ttt_command_description_t;
 
 ttt_command_description_t command_descriptions[] = {
-    {"HELO", 1, _ttt_client_execute_helo},
-    {"WHO",  0, _ttt_client_execute_who },
-    {"QUIT", 0, _ttt_client_execute_quit}
+    {"HELO",    1, _ttt_client_execute_helo},
+    {"WHO",     0, _ttt_client_execute_who },
+    {"QUIT",    0, _ttt_client_execute_quit},
+    {"MESSAGE", 1, _ttt_client_execute_message}
 };
+
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
 static ttt_error_t
@@ -110,7 +119,7 @@ _ttt_client_execute_who (ttt_client_t *client,
                         char         **args,
                         int          num_args)
 {
-    const char *response;
+    char *response;
 
     assert (num_args == 0);
 
@@ -124,15 +133,42 @@ _ttt_client_execute_who (ttt_client_t *client,
 }
 
 static ttt_error_t
-_ttt_client_execute_quit (ttt_client_t  *client,
-                         char          **args,
-                         int             num_args)
+_ttt_client_execute_quit (ttt_client_t *client,
+                         char         **args,
+                         int          num_args)
 {
     assert (num_args == 0);
 
     return TTT_ERROR_QUIT_REQUESTED;
 }
 
+static ttt_error_t
+_ttt_client_execute_message (ttt_client_t  *client,
+                            char          **args,
+                            int           num_args)
+{
+    char *response;
+    int i;
+
+    assert (num_args > 0);
+
+    xasprintf(&response, "MESSAGE\n");
+    ttt_client_send (client, response);
+    
+    xasprintf(&response, "NOTICE MESSAGE %s", client->name);
+    for (i=0; i<num_args; i++){
+       xasprintf(&response, "%s %s",response,args[i]);
+
+    }
+    xasprintf(&response, "%s\n",response);
+    ttt_server_broadcast (client->server,response);
+
+    free (response);
+    return TTT_ERROR_NONE;
+
+
+}
+
 static void
 _free_request (ttt_client_t *client);
 
@@ -249,7 +285,7 @@ _execute_request (ttt_client_t *client)
     for (i=0; i < ARRAY_SIZE(command_descriptions); i++) {
        desc = &command_descriptions[i];
        if (strcmp(command, desc->command) == 0) {
-           if (num_args != desc->args_required)
+           if (num_args < desc->args_required)
                return TTT_ERROR_SYNTAX;
            return (desc->execute) (client, &client->request_strings[1], num_args);
            }