diff options
author | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-03-20 12:31:35 +0800 |
---|---|---|
committer | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-03-20 12:31:35 +0800 |
commit | 2a012343be33784d36272df3489afaa581175cac (patch) | |
tree | 08b7554cd6f11942e15f52c12037e715f51816e2 /innbbsd/inndchannel.c | |
parent | 4470099ad8bdacec874b7c65b40bb9fb71d3efe0 (diff) | |
download | pttbbs-2a012343be33784d36272df3489afaa581175cac.tar pttbbs-2a012343be33784d36272df3489afaa581175cac.tar.gz pttbbs-2a012343be33784d36272df3489afaa581175cac.tar.bz2 pttbbs-2a012343be33784d36272df3489afaa581175cac.tar.lz pttbbs-2a012343be33784d36272df3489afaa581175cac.tar.xz pttbbs-2a012343be33784d36272df3489afaa581175cac.tar.zst pttbbs-2a012343be33784d36272df3489afaa581175cac.zip |
make gcc-3.4 happy
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2666 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'innbbsd/inndchannel.c')
-rw-r--r-- | innbbsd/inndchannel.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/innbbsd/inndchannel.c b/innbbsd/inndchannel.c index ddbb7aac..8a920ce4 100644 --- a/innbbsd/inndchannel.c +++ b/innbbsd/inndchannel.c @@ -339,46 +339,6 @@ inndchannel(port, path) } } -int -channelreader(client) - ClientType *client; -{ - int len; - char *ptr; - buffer_t *in = &client->in; - - if (in->left < ReadSize + 3) { - int need = in->used + in->left + ReadSize + 3; - need += need / 5; - in->data = (char *)myrealloc(in->data, need); - in->left = need - in->used; - verboselog("channelreader realloc %d\n", need); - } - len = read(client->fd, in->data + in->used, ReadSize); - - if (len <= 0) - return len; - - in->data[len + in->used] = '\0'; - in->lastread = len; -#ifdef DEBUG - printf("after read lastread %d\n", in->lastread); - printf("len %d client %d\n", len, strlen(in->data + in->used)); -#endif - - REMOTEHOSTNAME = client->hostname; - REMOTEUSERNAME = client->username; - if (client->mode == 0) { - if ((ptr = (char *)strchr(in->data, '\n')) != NULL) { - if (in->data[0] != '\r') - commandparse(client); - } - } else { - commandparse(client); - } - return len; -} - void commandparse(client) ClientType *client; @@ -492,6 +452,46 @@ commandparse(client) } } +int +channelreader(client) + ClientType *client; +{ + int len; + char *ptr; + buffer_t *in = &client->in; + + if (in->left < ReadSize + 3) { + int need = in->used + in->left + ReadSize + 3; + need += need / 5; + in->data = (char *)myrealloc(in->data, need); + in->left = need - in->used; + verboselog("channelreader realloc %d\n", need); + } + len = read(client->fd, in->data + in->used, ReadSize); + + if (len <= 0) + return len; + + in->data[len + in->used] = '\0'; + in->lastread = len; +#ifdef DEBUG + printf("after read lastread %d\n", in->lastread); + printf("len %d client %d\n", len, strlen(in->data + in->used)); +#endif + + REMOTEHOSTNAME = client->hostname; + REMOTEUSERNAME = client->username; + if (client->mode == 0) { + if ((ptr = (char *)strchr(in->data, '\n')) != NULL) { + if (in->data[0] != '\r') + commandparse(client); + } + } else { + commandparse(client); + } + return len; +} + void do_command() { |