src/irc_line.c
author Tero Marttila <terom@fixme.fi>
Thu, 28 May 2009 01:17:36 +0300
branchnew-lib-errors
changeset 219 cefec18b8268
parent 190 69fd25c8484c
permissions -rw-r--r--
some of the lib/transport stuff compiles
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     1
#include "irc_line.h"
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
     2
#include "log.h"
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     3
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     4
#include <string.h>
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     5
#include <assert.h>
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     6
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
     7
err_t irc_line_parse (struct irc_line *line, struct irc_nm *nm, char *data)
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     8
{
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
     9
    int i;
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    10
    err_t err;
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    11
190
69fd25c8484c add tests for irc_cmd/irc_line, and fix handling of missing-prefix to set source to NULL in irc_line
Tero Marttila <terom@fixme.fi>
parents: 123
diff changeset
    12
    // line would start with a prefix
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    13
    if (data && *data == ':') {
190
69fd25c8484c add tests for irc_cmd/irc_line, and fix handling of missing-prefix to set source to NULL in irc_line
Tero Marttila <terom@fixme.fi>
parents: 123
diff changeset
    14
        // consume the prefix as token
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    15
        char *prefix = strsep(&data, " ") + 1;
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    16
        
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    17
        // parse as a nickmask
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    18
        if ((err = irc_nm_parse_buf(nm, prefix))) {
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    19
            line->source = NULL;
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    20
            log_warn("invalid prefix: '%s': %s", prefix, error_name(err));
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    21
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    22
        } else {
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    23
            // valid, store
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    24
            line->source = nm;
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
    25
        }
190
69fd25c8484c add tests for irc_cmd/irc_line, and fix handling of missing-prefix to set source to NULL in irc_line
Tero Marttila <terom@fixme.fi>
parents: 123
diff changeset
    26
    } else {
69fd25c8484c add tests for irc_cmd/irc_line, and fix handling of missing-prefix to set source to NULL in irc_line
Tero Marttila <terom@fixme.fi>
parents: 123
diff changeset
    27
        // no prefix
69fd25c8484c add tests for irc_cmd/irc_line, and fix handling of missing-prefix to set source to NULL in irc_line
Tero Marttila <terom@fixme.fi>
parents: 123
diff changeset
    28
        line->source = NULL;
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    29
    }
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    30
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    31
    // command
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    32
    line->command = strsep(&data, " ");
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    33
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    34
    // args
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    35
    for (i = 0; i < IRC_ARG_MAX; i++) {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    36
        // trailing?
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    37
        if (data && *data == ':') {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    38
            // consume the rest of the line
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    39
            line->args[i] = data + 1;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    40
            data = NULL;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    41
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    42
        } else {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    43
            // either NULL or a normal token
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    44
            line->args[i] = strsep(&data, " ");
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    45
        }
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    46
    }
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    47
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    48
    // parse errors? What are those?
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    49
    return SUCCESS;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    50
}
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    51
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    52
/*
123
dc80e4599fb8 comment fix :)
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    53
 * Flags for output_token
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    54
 */
123
dc80e4599fb8 comment fix :)
Tero Marttila <terom@fixme.fi>
parents: 75
diff changeset
    55
enum output_token_flag {
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    56
    /* No space before token */
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    57
    TOK_NOSPACE     = 0x01,
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    58
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    59
    /* Prefix with :, may contain spaces, last token */
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    60
    TOK_TRAILING    = 0x02,
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    61
};
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    62
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    63
static err_t output_token (char *buf, size_t *offset, const char *token, int flags)
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    64
{
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    65
    size_t token_len = strlen(token), len;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    66
    char *dest = buf + *offset;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    67
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    68
    // overall length
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    69
    len = token_len + (flags & TOK_NOSPACE ? 0 : 1) + (flags & TOK_TRAILING ? 1 : 0);
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    70
    
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    71
    // check overflow
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 17
diff changeset
    72
    if (*offset + len + 1 > IRC_LINE_MAX)
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    73
        return ERR_LINE_TOO_LONG;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    74
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    75
    // check invalid tokens
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    76
    if (strpbrk(token, (flags & TOK_TRAILING) ? IRC_TOKEN_TRAILING_INVALID : IRC_TOKEN_INVALID))
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    77
        return ERR_LINE_INVALID_TOKEN;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    78
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    79
    // delimit with space?
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    80
    if (!(flags & TOK_NOSPACE))
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    81
        *dest++ = ' ';
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    82
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    83
    // prefix trailing?
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    84
    if (flags & TOK_TRAILING)
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    85
        *dest++= ':';
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    86
    
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    87
    // copy to buffer
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    88
    memcpy(dest, token, token_len);
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    89
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    90
    // update offset
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    91
    *offset += len;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    92
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    93
    // ok
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    94
    return 0;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    95
}
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    96
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    97
err_t irc_line_build (const struct irc_line *line, char *buf)
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    98
{
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
    99
    size_t off = 0;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   100
    int i;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   101
    err_t err;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   102
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   103
    // XXX: no need for prefix on client
75
ff6272398d2e change irc_line.prefix into a
Tero Marttila <terom@fixme.fi>
parents: 23
diff changeset
   104
    assert(line->source == NULL);
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   105
    
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   106
    // command
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   107
    if ((err = output_token(buf, &off, line->command, TOK_NOSPACE)))
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   108
        return err;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   109
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   110
    // args
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   111
    for (i = 0; i < IRC_ARG_MAX; i++) {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   112
        // skip unused args at end
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   113
        if (line->args[i] == NULL)
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   114
            break;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   115
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   116
        // if last and contains a space, format as a trailing param
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   117
        if ((i < IRC_ARG_MAX - 1) && line->args[i + 1] == NULL && strchr(line->args[i], ' ')) {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   118
            // output using TOK_TRAILING
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   119
            if ((err = output_token(buf, &off, line->args[i], TOK_TRAILING)))
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   120
                return err;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   121
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   122
       } else {
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   123
            // output as normal token
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   124
            if ((err = output_token(buf, &off, line->args[i], 0)))
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   125
                return err;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   126
       }
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   127
    }
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   128
23
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 17
diff changeset
   129
    // terminate, output_token reserved the space for this
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 17
diff changeset
   130
    buf[off] = '\0';
542c73d07d3c add a simple irc_log module (with evsql code) that joins a channel and log_info's PRIVMSGs
Tero Marttila <terom@fixme.fi>
parents: 17
diff changeset
   131
17
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   132
    // done
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   133
    return SUCCESS;
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   134
}
5001564ac5fc irc_line implementation
Tero Marttila <terom@fixme.fi>
parents:
diff changeset
   135