Compare commits
No commits in common. "master" and "0.8" have entirely different histories.
|
|
@ -1,21 +0,0 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[{*.c,*.h}]
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
|
||||
[*.md]
|
||||
trim_trailing_whitespace = false
|
||||
indent_style = tab
|
||||
|
||||
[Makefile]
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
7
.hgtags
Normal file
7
.hgtags
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
de32c537aaf66554894712563ffba8d9bc4c2714 0.1
|
||||
56350a01f27753cfbdbb3dbc25f2a53dd4c2ac45 0.2
|
||||
d77f00af559258679a0fad5d264685d663e6975a 0.3
|
||||
a3549fb4c72ff0edb816c8c29be7ff289db5b003 0.4
|
||||
70d49a37b35695f2f771bddaf309f05ea60af8bc 0.5
|
||||
d7923d9e717c1c6f1ed3b17ec90bfdd7e7bfcca0 0.6
|
||||
643a6e8b8634b70d2459637fcfff6eca776fc919 0.7
|
||||
7
LICENSE
7
LICENSE
|
|
@ -1,10 +1,7 @@
|
|||
MIT/X Consortium License
|
||||
|
||||
© 2022 Alexander Popov <iiiypuk@fastmail.fm>
|
||||
© 2005-2017 Anselm R Garbe <anselm@garbe.us>
|
||||
© 2008-2009 Jeroen Schot <schot@a-eskwadraat.nl>
|
||||
© 2007-2009 Kris Maglione <maglione.k@gmail.com>
|
||||
© 2005 Nico Golde <nico at ngolde dot de>
|
||||
(C)opyright MMV-MMVI Anselm R. Garbe <garbeam@gmail.com>
|
||||
(C)opyright MMV Nico Golde <nico at ngolde dot de>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
|
|
|
|||
84
Makefile
84
Makefile
|
|
@ -1,59 +1,57 @@
|
|||
.POSIX:
|
||||
# sic - simple irc client
|
||||
# (C)opyright MMVI Anselm R. Garbe
|
||||
|
||||
NAME = sic
|
||||
VERSION = 1.3
|
||||
include config.mk
|
||||
|
||||
# paths
|
||||
PREFIX = /usr/local
|
||||
MANPREFIX = ${PREFIX}/share/man
|
||||
|
||||
# use system flags.
|
||||
SIC_CFLAGS = ${CFLAGS}
|
||||
SIC_LDFLAGS = ${LDFLAGS}
|
||||
SIC_CPPFLAGS = ${LDFLAGS} -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
||||
|
||||
BIN = sic
|
||||
SRC = ${BIN:=.c}
|
||||
SRC = sic.c
|
||||
OBJ = ${SRC:.c=.o}
|
||||
MAN1 = ${BIN:=.1}
|
||||
|
||||
all: ${BIN}
|
||||
all: options sic
|
||||
|
||||
${BIN}: ${@:=.o}
|
||||
|
||||
${OBJ}: config.h strlcpy.c util.c
|
||||
|
||||
.o:
|
||||
${CC} -o $@ $< ${SIC_LDFLAGS}
|
||||
options:
|
||||
@echo sic build options:
|
||||
@echo "CFLAGS = ${CFLAGS}"
|
||||
@echo "LDFLAGS = ${LDFLAGS}"
|
||||
@echo "CC = ${CC}"
|
||||
@echo "LD = ${LD}"
|
||||
|
||||
.c.o:
|
||||
${CC} -c ${SIC_CFLAGS} ${SIC_CPPFLAGS} -o $@ -c $<
|
||||
@echo CC $<
|
||||
@${CC} -c ${CFLAGS} $<
|
||||
|
||||
config.h:
|
||||
cp config.def.h $@
|
||||
${OBJ}: config.mk
|
||||
|
||||
sic: ${OBJ}
|
||||
@echo LD $@
|
||||
@${LD} -o $@ ${OBJ} ${LDFLAGS}
|
||||
@strip $@
|
||||
|
||||
clean:
|
||||
rm -f ${BIN} ${OBJ} "${NAME}-${VERSION}.tar.gz"
|
||||
@echo cleaning
|
||||
@rm -f sic ${OBJ} sic-${VERSION}.tar.gz
|
||||
|
||||
dist:
|
||||
mkdir -p "${NAME}-${VERSION}"
|
||||
cp -fR LICENSE Makefile README arg.h config.def.h \
|
||||
${MAN1} ${SRC} util.c strlcpy.c "${NAME}-${VERSION}"
|
||||
tar -cf - "${NAME}-${VERSION}" | \
|
||||
gzip -c > "${NAME}-${VERSION}.tar.gz"
|
||||
rm -rf "${NAME}-${VERSION}"
|
||||
dist: clean
|
||||
@echo creating dist tarball
|
||||
@mkdir -p sic-${VERSION}
|
||||
@cp -R LICENSE Makefile README config.mk sic.1 ${SRC} sic-${VERSION}
|
||||
@tar -cf sic-${VERSION}.tar sic-${VERSION}
|
||||
@gzip sic-${VERSION}.tar
|
||||
@rm -rf sic-${VERSION}
|
||||
|
||||
install: all
|
||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
|
||||
chmod 755 "${DESTDIR}${PREFIX}/bin/${BIN}"
|
||||
mkdir -p "${DESTDIR}${MANPREFIX}/man1"
|
||||
sed "s/VERSION/${VERSION}/g" < ${MAN1} > "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
|
||||
chmod 644 "${DESTDIR}${MANPREFIX}/man1/${MAN1}"
|
||||
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
|
||||
@mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
@cp -f sic ${DESTDIR}${PREFIX}/bin
|
||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/sic
|
||||
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
|
||||
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
@sed 's/VERSION/${VERSION}/g' < sic.1 > ${DESTDIR}${MANPREFIX}/man1/sic.1
|
||||
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/sic.1
|
||||
|
||||
uninstall:
|
||||
rm -f \
|
||||
"${DESTDIR}${PREFIX}/bin/${BIN}"\
|
||||
"${DESTDIR}${MANPREFIX}/man1/${MAN1}"
|
||||
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
|
||||
@rm -f ${DESTDIR}${PREFIX}/bin/sic
|
||||
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
|
||||
@rm -f ${DESTDIR}${MANPREFIX}/man1/sic.1
|
||||
|
||||
.PHONY: all clean dist install uninstall
|
||||
.PHONY: all options clean dist install uninstall
|
||||
|
|
|
|||
22
README
Normal file
22
README
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
sic - simple irc client
|
||||
=======================
|
||||
sic is an extremly fast, small and simple irc client. It reads commands from
|
||||
standard input and prints all server output to standard output. It multiplexes
|
||||
also all channel traffic into one output, that you don't have to switch
|
||||
different channel buffers, that's actually a feature.
|
||||
|
||||
|
||||
Installation
|
||||
------------
|
||||
Edit config.mk to match your local setup. sic is installed into
|
||||
/usr/local by default.
|
||||
|
||||
Afterwards enter the following command to build and install sic
|
||||
(if necessary as root):
|
||||
|
||||
$ make clean install
|
||||
|
||||
|
||||
Running sic
|
||||
-----------
|
||||
Simply invoke the 'sic' command with the required arguments.
|
||||
23
README.md
23
README.md
|
|
@ -1,23 +0,0 @@
|
|||
sic - simple irc client
|
||||
=======================
|
||||
sic is an extremely fast, small and simple irc client. It reads commands from
|
||||
standard input and prints all server output to standard output. It multiplexes
|
||||
also all channel traffic into one output so that you don't have to switch
|
||||
different channel buffers: that's actually a feature.
|
||||
|
||||
|
||||
Installation
|
||||
------------
|
||||
Edit the Makefile or override the flags to match your local setup. sic is
|
||||
installed into /usr/local by default.
|
||||
|
||||
Afterwards enter the following command to build and install sic
|
||||
(if necessary as root):
|
||||
|
||||
$ make
|
||||
# make install
|
||||
|
||||
|
||||
Running sic
|
||||
-----------
|
||||
Simply invoke the `sic` command with the required arguments.
|
||||
63
arg.h
63
arg.h
|
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
* Copy me if you can.
|
||||
* by 20h
|
||||
*/
|
||||
|
||||
#ifndef ARG_H__
|
||||
#define ARG_H__
|
||||
|
||||
extern char *argv0;
|
||||
|
||||
/* use main(int argc, char *argv[]) */
|
||||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
||||
argv[0] && argv[0][1]\
|
||||
&& argv[0][0] == '-';\
|
||||
argc--, argv++) {\
|
||||
char argc_;\
|
||||
char **argv_;\
|
||||
int brk_;\
|
||||
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
||||
argv++;\
|
||||
argc--;\
|
||||
break;\
|
||||
}\
|
||||
for (brk_ = 0, argv[0]++, argv_ = argv;\
|
||||
argv[0][0] && !brk_;\
|
||||
argv[0]++) {\
|
||||
if (argv_ != argv)\
|
||||
break;\
|
||||
argc_ = argv[0][0];\
|
||||
switch (argc_)
|
||||
|
||||
/* Handles obsolete -NUM syntax */
|
||||
#define ARGNUM case '0':\
|
||||
case '1':\
|
||||
case '2':\
|
||||
case '3':\
|
||||
case '4':\
|
||||
case '5':\
|
||||
case '6':\
|
||||
case '7':\
|
||||
case '8':\
|
||||
case '9'
|
||||
|
||||
#define ARGEND }\
|
||||
}
|
||||
|
||||
#define ARGC() argc_
|
||||
|
||||
#define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base)))
|
||||
|
||||
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
||||
((x), abort(), (char *)0) :\
|
||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
||||
(&argv[0][1]) :\
|
||||
(argc--, argv++, argv[0])))
|
||||
|
||||
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
||||
(char *)0 :\
|
||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
||||
(&argv[0][1]) :\
|
||||
(argc--, argv++, argv[0])))
|
||||
|
||||
#endif
|
||||
14
config.def.h
14
config.def.h
|
|
@ -1,14 +0,0 @@
|
|||
/* Host used when "-h" is not given */
|
||||
#define DEFAULT_HOST "iiiypuk.me"
|
||||
|
||||
/* Port used when "-p" is not given */
|
||||
#define DEFAULT_PORT "6667"
|
||||
|
||||
/* Timestamp format; see strftime(3). */
|
||||
#define TIMESTAMP_FORMAT "%Y-%m-%d %R"
|
||||
|
||||
/* Command prefix character. In most IRC clients this is '/'. */
|
||||
#define COMMAND_PREFIX_CHARACTER ':'
|
||||
|
||||
/* Parting message used when none is specified with ":l ..." command. */
|
||||
#define DEFAULT_PARTING_MESSAGE "sic - 250 LOC are too much!"
|
||||
22
config.mk
Normal file
22
config.mk
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# sic version
|
||||
VERSION = 0.8
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
# paths
|
||||
PREFIX = /usr/local
|
||||
MANPREFIX = ${PREFIX}/share/man
|
||||
|
||||
# includes and libs
|
||||
INCS = -I. -I/usr/include
|
||||
LIBS = -L/usr/lib -lc
|
||||
|
||||
# flags
|
||||
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
|
||||
LDFLAGS = ${LIBS}
|
||||
#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
|
||||
#LDFLAGS = -g ${LIBS}
|
||||
|
||||
# compiler and linker
|
||||
CC = cc
|
||||
LD = ${CC}
|
||||
61
sic.1
61
sic.1
|
|
@ -3,52 +3,53 @@
|
|||
sic \- simple irc client
|
||||
.SH SYNOPSIS
|
||||
.B sic
|
||||
.RB [ \-h
|
||||
.IR host ]
|
||||
.RB [ \-p
|
||||
.IR port ]
|
||||
.RB [ \-n
|
||||
.IR nick ]
|
||||
.RB [ \-k
|
||||
.IR pass ]
|
||||
.RB [ \-s " <server>"]
|
||||
.RB [ \-p " <port>"]
|
||||
.RB [ \-n " <nick>"]
|
||||
.RB [ \-k " <keyword>"]
|
||||
.RB [ \-f " <fullname>"]
|
||||
.RB [ \-v ]
|
||||
.SH DESCRIPTION
|
||||
.B sic
|
||||
is an extremely fast, small and simple irc client. It reads commands from
|
||||
standard input and prints all server output to standard output. It also
|
||||
multiplexes all channel traffic into one output. That way you don't have to
|
||||
switch different channel buffers. So that's actually a feature.
|
||||
is an extremly fast, small and simple irc client. It reads commands from
|
||||
standard input and prints all server output to standard output. It multiplexes
|
||||
also all channel traffic into one output, that you don't have to switch
|
||||
different channel buffers, that's actually a feature.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.BI \-h " host"
|
||||
Overrides the default host (irc.oftc.net)
|
||||
.B \-s <server>
|
||||
Overrides the default server (irc.oftc.net)
|
||||
.TP
|
||||
.BI \-p " port"
|
||||
.B \-p <port>
|
||||
Overrides the default port (6667)
|
||||
.TP
|
||||
.BI \-n " nick"
|
||||
.B \-n <nickname>
|
||||
Override the default nick ($USER)
|
||||
.TP
|
||||
.BI \-k " pass"
|
||||
Specifies the PASS connection password
|
||||
.B \-k <keyword>
|
||||
Specifies the keyword to authenticate your nick on the server
|
||||
.TP
|
||||
.B \-v
|
||||
Prints version information to stderr, then exits
|
||||
.B \-f <fullname>
|
||||
Specify the real name (default is $USER)
|
||||
.TP
|
||||
.BI \-v
|
||||
Prints version information to standard output, then exits.
|
||||
.SH COMMANDS
|
||||
.TP
|
||||
.BI :j " #channel"
|
||||
.B /j #channel
|
||||
Join a channel
|
||||
.TP
|
||||
.BI :l " #channel"
|
||||
.B /l #channel
|
||||
Leave a channel
|
||||
.TP
|
||||
.BI :m " #channel/user message"
|
||||
Send a message to channel or user
|
||||
.B /m #channel/user msg
|
||||
Write a message to #channel/user
|
||||
.TP
|
||||
.BI :s " #channel/user"
|
||||
Set default channel or user
|
||||
.B /s #channel/user
|
||||
Set default channel/user
|
||||
.TP
|
||||
.BI : command
|
||||
Any line beginning with
|
||||
.B :
|
||||
is sent as a command
|
||||
.B /t topic
|
||||
Set the channel topic
|
||||
.TP
|
||||
Everything which is not a command will simply be posted into the channel or to
|
||||
the server.
|
||||
|
|
|
|||
429
sic.c
429
sic.c
|
|
@ -1,222 +1,327 @@
|
|||
/* See LICENSE file for license details. */
|
||||
#include <sys/select.h>
|
||||
|
||||
#include <ctype.h>
|
||||
/* (C)opyright MMV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
||||
* (C)opyright MMV-MMVI Nico Golde <nico at ngolde dot de>
|
||||
* See LICENSE file for license details.
|
||||
*/
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
#include <netdb.h>
|
||||
#include <netinet/in.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "arg.h"
|
||||
#include "config.h"
|
||||
#define PINGTIMEOUT 300
|
||||
#define MAXMSG 4096
|
||||
|
||||
char *argv0;
|
||||
static char *host = DEFAULT_HOST;
|
||||
static char *port = DEFAULT_PORT;
|
||||
static char *password;
|
||||
static char nick[32];
|
||||
static char bufin[4096];
|
||||
static char bufout[4096];
|
||||
enum { Tnick, Tuser, Tcmd, Tchan, Targ, Ttext, Tlast };
|
||||
|
||||
static char *server = "irc.oftc.net";
|
||||
static unsigned short port = 6667;
|
||||
static char *nick = NULL;
|
||||
static char *fullname = NULL;
|
||||
static char *password = NULL;
|
||||
|
||||
static char bufin[MAXMSG], bufout[MAXMSG];
|
||||
static char channel[256];
|
||||
static int srv;
|
||||
static time_t trespond;
|
||||
static FILE *srv;
|
||||
|
||||
#undef strlcpy
|
||||
#include "strlcpy.c"
|
||||
#include "util.c"
|
||||
static int
|
||||
getline(int fd, unsigned int len, char *buf) {
|
||||
unsigned int i = 0;
|
||||
char c;
|
||||
|
||||
static void
|
||||
pout(char *channel, char *fmt, ...) {
|
||||
static char timestr[80];
|
||||
time_t t;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(bufout, sizeof bufout, fmt, ap);
|
||||
va_end(ap);
|
||||
t = time(NULL);
|
||||
strftime(timestr, sizeof timestr, TIMESTAMP_FORMAT, localtime(&t));
|
||||
fprintf(stdout, "%-12s: %s %s\n", channel, timestr, bufout);
|
||||
do {
|
||||
if(read(fd, &c, sizeof(char)) != sizeof(char))
|
||||
return -1;
|
||||
buf[i++] = c;
|
||||
}
|
||||
while(c != '\n' && i < len);
|
||||
buf[i - 1] = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
sout(char *fmt, ...) {
|
||||
va_list ap;
|
||||
pout(char *channel, char *msg) {
|
||||
static char timestr[18];
|
||||
time_t t = time(0);
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(bufout, sizeof bufout, fmt, ap);
|
||||
va_end(ap);
|
||||
fprintf(srv, "%s\r\n", bufout);
|
||||
strftime(timestr, sizeof timestr, "%F %R", localtime(&t));
|
||||
fprintf(stdout, "%-8.8s: %s %s\n", channel, timestr, msg);
|
||||
}
|
||||
|
||||
static void
|
||||
privmsg(char *channel, char *msg) {
|
||||
if(channel[0] == '\0') {
|
||||
pout("", "No channel to send to");
|
||||
return;
|
||||
}
|
||||
pout(channel, "<%s> %s", nick, msg);
|
||||
sout("PRIVMSG %s :%s", channel, msg);
|
||||
snprintf(bufout, sizeof bufout, "<%s> %s", nick, msg);
|
||||
pout(channel, bufout);
|
||||
snprintf(bufout, sizeof bufout, "PRIVMSG %s :%s\r\n", channel, msg);
|
||||
write(srv, bufout, strlen(bufout));
|
||||
}
|
||||
|
||||
static void
|
||||
parsein(char *s) {
|
||||
char c, *p;
|
||||
parsein(char *msg) {
|
||||
char *p;
|
||||
|
||||
if(s[0] == '\0')
|
||||
if(msg[0] == 0)
|
||||
return;
|
||||
skip(s, '\n');
|
||||
if(s[0] != COMMAND_PREFIX_CHARACTER) {
|
||||
privmsg(channel, s);
|
||||
if(msg[0] != '/') {
|
||||
privmsg(channel, msg);
|
||||
return;
|
||||
}
|
||||
c = *++s;
|
||||
if(c != '\0' && isspace((unsigned char)s[1])) {
|
||||
p = s + 2;
|
||||
switch(c) {
|
||||
case 'j':
|
||||
sout("JOIN %s", p);
|
||||
if(channel[0] == '\0')
|
||||
strlcpy(channel, p, sizeof channel);
|
||||
return;
|
||||
case 'l':
|
||||
s = eat(p, isspace, 1);
|
||||
p = eat(s, isspace, 0);
|
||||
if(!*s)
|
||||
s = channel;
|
||||
if(*p)
|
||||
*p++ = '\0';
|
||||
if(!*p)
|
||||
p = DEFAULT_PARTING_MESSAGE;
|
||||
sout("PART %s :%s", s, p);
|
||||
return;
|
||||
case 'm':
|
||||
s = eat(p, isspace, 1);
|
||||
p = eat(s, isspace, 0);
|
||||
if(*p)
|
||||
*p++ = '\0';
|
||||
privmsg(s, p);
|
||||
return;
|
||||
case 's':
|
||||
strlcpy(channel, p, sizeof channel);
|
||||
if(!strncmp(msg + 1, "j ", 2) && (msg[3] == '#'))
|
||||
snprintf(bufout, sizeof bufout, "JOIN %s\r\n", &msg[3]);
|
||||
else if(!strncmp(msg + 1, "l ", 2))
|
||||
snprintf(bufout, sizeof bufout, "PART %s :sic\r\n", &msg[3]);
|
||||
else if(!strncmp(msg + 1, "m ", 2)) {
|
||||
if((p = strchr(&msg[3], ' ')))
|
||||
*(p++) = 0;
|
||||
privmsg(&msg[3], p);
|
||||
return;
|
||||
}
|
||||
else if(!strncmp(msg + 1, "s ", 2)) {
|
||||
strncpy(channel, &msg[3], sizeof channel);
|
||||
return;
|
||||
}
|
||||
else if(!strncmp(msg + 1, "t ", 2)) {
|
||||
if((p = strchr(&msg[3], ' ')))
|
||||
*(p++) = 0;
|
||||
snprintf(bufout, sizeof bufout, "TOPIC %s :%s\r\n", &msg[3], p);
|
||||
}
|
||||
else
|
||||
snprintf(bufout, sizeof bufout, "%s\r\n", &msg[1]);
|
||||
write(srv, bufout, strlen(bufout));
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
tokenize(char **result, unsigned int reslen, char *str, char delim) {
|
||||
char *p, *n;
|
||||
unsigned int i = 0;
|
||||
|
||||
if(!str)
|
||||
return 0;
|
||||
for(n = str; *n == delim; n++);
|
||||
p = n;
|
||||
for(i = 0; *n != 0;) {
|
||||
if(i == reslen)
|
||||
return i;
|
||||
if(*n == delim) {
|
||||
*n = 0;
|
||||
if(strlen(p))
|
||||
result[i++] = p;
|
||||
p = ++n;
|
||||
} else
|
||||
n++;
|
||||
}
|
||||
if((i < reslen) && (p < n) && strlen(p))
|
||||
result[i++] = p;
|
||||
return i; /* number of tokens */
|
||||
}
|
||||
|
||||
static void
|
||||
parsesrv(char *msg) {
|
||||
char *argv[Tlast], *cmd, *p;
|
||||
int i;
|
||||
|
||||
if(!msg || !(*msg))
|
||||
return;
|
||||
|
||||
for(i = 0; i < Tlast; i++)
|
||||
argv[i] = NULL;
|
||||
|
||||
/* <bufout> ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
|
||||
* <prefix> ::= <servername> | <nick> [ '!' <user> ] [ '@' <server> ]
|
||||
* <command> ::= <letter> { <letter> } | <number> <number> <number>
|
||||
* <SPACE> ::= ' ' { ' ' }
|
||||
* <params> ::= <SPACE> [ ':' <trailing> | <middle> <params> ]
|
||||
* <middle> ::= <Any *non-empty* sequence of octets not including SPACE
|
||||
* or NUL or CR or LF, the first of which may not be ':'>
|
||||
* <trailing> ::= <Any, possibly *empty*, sequence of octets not including NUL or CR or LF>
|
||||
* <crlf> ::= CR LF
|
||||
*/
|
||||
if(msg[0] == ':') { /* check prefix */
|
||||
if (!(p = strchr(msg, ' ')))
|
||||
return;
|
||||
*p = 0;
|
||||
for(++p; *p == ' '; p++);
|
||||
cmd = p;
|
||||
argv[Tnick] = &msg[1];
|
||||
if((p = strchr(msg, '!'))) {
|
||||
*p = 0;
|
||||
argv[Tuser] = ++p;
|
||||
}
|
||||
} else
|
||||
cmd = msg;
|
||||
/* remove CRLFs */
|
||||
for(p = cmd; p && *p != 0; p++)
|
||||
if(*p == '\r' || *p == '\n')
|
||||
*p = 0;
|
||||
if((p = strchr(cmd, ':'))) {
|
||||
*p = 0;
|
||||
argv[Ttext] = ++p;
|
||||
}
|
||||
sout("%s", s);
|
||||
}
|
||||
|
||||
static void
|
||||
parsesrv(char *cmd) {
|
||||
char *usr, *par, *txt;
|
||||
|
||||
usr = host;
|
||||
if(!cmd || !*cmd)
|
||||
tokenize(&argv[Tcmd], Tlast - Tcmd, cmd, ' ');
|
||||
if(!argv[Tcmd] || !strncmp("PONG", argv[Tcmd], 5))
|
||||
return;
|
||||
if(cmd[0] == ':') {
|
||||
usr = cmd + 1;
|
||||
cmd = skip(usr, ' ');
|
||||
if(cmd[0] == '\0')
|
||||
return;
|
||||
skip(usr, '!');
|
||||
}
|
||||
skip(cmd, '\r');
|
||||
par = skip(cmd, ' ');
|
||||
txt = skip(par, ':');
|
||||
trim(par);
|
||||
if(!strcmp("PONG", cmd))
|
||||
else if(!strncmp("PING", argv[Tcmd], 5)) {
|
||||
snprintf(bufout, sizeof bufout, "PONG %s\r\n", argv[Ttext]);
|
||||
write(srv, bufout, strlen(bufout));
|
||||
return;
|
||||
if(!strcmp("PRIVMSG", cmd))
|
||||
pout(par, "<%s> %s", usr, txt);
|
||||
else if(!strcmp("PING", cmd))
|
||||
sout("PONG %s", txt);
|
||||
else {
|
||||
pout(usr, ">< %s (%s): %s", cmd, par, txt);
|
||||
if(!strcmp("NICK", cmd) && !strcmp(usr, nick))
|
||||
strlcpy(nick, txt, sizeof nick);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
usage(void) {
|
||||
eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n", argv0);
|
||||
else if(!argv[Tnick] || !argv[Tuser]) { /* server command */
|
||||
snprintf(bufout, sizeof bufout, "%s", argv[Ttext] ? argv[Ttext] : "");
|
||||
pout(server, bufout);
|
||||
return;
|
||||
}
|
||||
else if(!strncmp("ERROR", argv[Tcmd], 6))
|
||||
snprintf(bufout, sizeof bufout, "-!- error %s",
|
||||
argv[Ttext] ? argv[Ttext] : "unknown");
|
||||
else if(!strncmp("JOIN", argv[Tcmd], 5)) {
|
||||
if(argv[Ttext]!=NULL){
|
||||
p = strchr(argv[Ttext], ' ');
|
||||
if(p)
|
||||
*p = 0;
|
||||
}
|
||||
argv[Tchan] = argv[Ttext];
|
||||
snprintf(bufout, sizeof bufout, "-!- %s(%s) has joined %s",
|
||||
argv[Tnick], argv[Tuser], argv[Ttext]);
|
||||
}
|
||||
else if(!strncmp("PART", argv[Tcmd], 5)) {
|
||||
snprintf(bufout, sizeof bufout, "-!- %s(%s) has left %s",
|
||||
argv[Tnick], argv[Tuser], argv[Tchan]);
|
||||
}
|
||||
else if(!strncmp("MODE", argv[Tcmd], 5))
|
||||
snprintf(bufout, sizeof bufout, "-!- %s changed mode/%s -> %s %s",
|
||||
argv[Tnick], argv[Tcmd + 1] ? argv[Tcmd + 1] : "",
|
||||
argv[Tcmd + 2] ? argv[Tcmd + 2] : "",
|
||||
argv[Tcmd + 3] ? argv[Tcmd + 3] : "");
|
||||
else if(!strncmp("QUIT", argv[Tcmd], 5))
|
||||
snprintf(bufout, sizeof bufout, "-!- %s(%s) has quit \"%s\"",
|
||||
argv[Tnick], argv[Tuser],
|
||||
argv[Ttext] ? argv[Ttext] : "");
|
||||
else if(!strncmp("NICK", argv[Tcmd], 5))
|
||||
snprintf(bufout, sizeof bufout, "-!- %s changed nick to %s",
|
||||
argv[Tnick], argv[Ttext]);
|
||||
else if(!strncmp("TOPIC", argv[Tcmd], 6))
|
||||
snprintf(bufout, sizeof bufout, "-!- %s changed topic to \"%s\"",
|
||||
argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
|
||||
else if(!strncmp("KICK", argv[Tcmd], 5))
|
||||
snprintf(bufout, sizeof bufout, "-!- %s kicked %s (\"%s\")",
|
||||
argv[Tnick], argv[Targ],
|
||||
argv[Ttext] ? argv[Ttext] : "");
|
||||
else if(!strncmp("NOTICE", argv[Tcmd], 7))
|
||||
snprintf(bufout, sizeof bufout, "-!- \"%s\")",
|
||||
argv[Ttext] ? argv[Ttext] : "");
|
||||
else if(!strncmp("PRIVMSG", argv[Tcmd], 8))
|
||||
snprintf(bufout, sizeof bufout, "<%s> %s",
|
||||
argv[Tnick], argv[Ttext] ? argv[Ttext] : "");
|
||||
if(!argv[Tchan] || !strncmp(argv[Tchan], nick, strlen(nick)))
|
||||
pout(argv[Tnick], bufout);
|
||||
else
|
||||
pout(argv[Tchan], bufout);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
int i;
|
||||
struct timeval tv;
|
||||
const char *user = getenv("USER");
|
||||
int n;
|
||||
struct hostent *hp;
|
||||
static struct sockaddr_in addr; /* initially filled with 0's */
|
||||
char ping[256];
|
||||
fd_set rd;
|
||||
|
||||
strlcpy(nick, user ? user : "unknown", sizeof nick);
|
||||
ARGBEGIN {
|
||||
case 'h':
|
||||
host = EARGF(usage());
|
||||
break;
|
||||
case 'p':
|
||||
port = EARGF(usage());
|
||||
break;
|
||||
case 'n':
|
||||
strlcpy(nick, EARGF(usage()), sizeof nick);
|
||||
break;
|
||||
case 'k':
|
||||
password = EARGF(usage());
|
||||
break;
|
||||
case 'v':
|
||||
eprint("sic-"VERSION", © 2005-2017 Anselm R Garbe, Jeroen Schot, Kris Maglione, Nico Golde\n");
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
} ARGEND;
|
||||
nick = fullname = getenv("USER");
|
||||
for(i = 1; i < argc; i++)
|
||||
if(!strncmp(argv[i], "-s", 3)) {
|
||||
if(++i < argc) server = argv[i];
|
||||
}
|
||||
else if(!strncmp(argv[i], "-p", 3)) {
|
||||
if(++i < argc) port = (unsigned short)atoi(argv[i]);
|
||||
}
|
||||
else if(!strncmp(argv[i], "-n", 3)) {
|
||||
if(++i < argc) nick = argv[i];
|
||||
}
|
||||
else if(!strncmp(argv[i], "-k", 3)) {
|
||||
if(++i < argc) password = argv[i];
|
||||
}
|
||||
else if(!strncmp(argv[i], "-f", 3)) {
|
||||
if(++i < argc) fullname = argv[i];
|
||||
}
|
||||
else if(!strncmp(argv[i], "-v", 3)) {
|
||||
fputs("sic-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
else {
|
||||
fputs("usage: sic [-s server] [-p port] [-n nick]"
|
||||
" [-k keyword] [-f fullname] [-v]\n", stderr);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/* init */
|
||||
srv = fdopen(dial(host, port), "r+");
|
||||
if (!srv)
|
||||
eprint("fdopen:");
|
||||
if((srv = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
|
||||
fprintf(stderr, "sic: cannot connect server '%s'\n", server);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
if (NULL == (hp = gethostbyname(server))) {
|
||||
fprintf(stderr, "sic: cannot resolve hostname '%s'\n", server);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
memcpy(&addr.sin_addr, hp->h_addr, hp->h_length);
|
||||
if(connect(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_in))) {
|
||||
close(srv);
|
||||
fprintf(stderr, "sic: cannot connect server '%s'\n", server);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
/* login */
|
||||
if(password)
|
||||
sout("PASS %s", password);
|
||||
sout("NICK %s", nick);
|
||||
sout("USER %s localhost %s :%s", nick, host, nick);
|
||||
fflush(srv);
|
||||
setbuf(stdout, NULL);
|
||||
setbuf(srv, NULL);
|
||||
setbuf(stdin, NULL);
|
||||
#ifdef __OpenBSD__
|
||||
if (pledge("stdio", NULL) == -1)
|
||||
eprint("error: pledge:");
|
||||
#endif
|
||||
snprintf(bufout, sizeof bufout,
|
||||
"PASS %s\r\nNICK %s\r\nUSER %s localhost %s :%s\r\n",
|
||||
password, nick, nick, server, fullname);
|
||||
else
|
||||
snprintf(bufout, sizeof bufout, "NICK %s\r\nUSER %s localhost %s :%s\r\n",
|
||||
nick, nick, server, fullname);
|
||||
write(srv, bufout, strlen(bufout));
|
||||
snprintf(ping, sizeof ping, "PING %s\r\n", server);
|
||||
channel[0] = 0;
|
||||
setbuf(stdout, NULL); /* unbuffered stdout */
|
||||
|
||||
for(;;) { /* main loop */
|
||||
FD_ZERO(&rd);
|
||||
FD_SET(0, &rd);
|
||||
FD_SET(fileno(srv), &rd);
|
||||
FD_SET(srv, &rd);
|
||||
tv.tv_sec = 120;
|
||||
tv.tv_usec = 0;
|
||||
n = select(fileno(srv) + 1, &rd, 0, 0, &tv);
|
||||
if(n < 0) {
|
||||
i = select(srv + 1, &rd, 0, 0, &tv);
|
||||
if(i < 0) {
|
||||
if(errno == EINTR)
|
||||
continue;
|
||||
eprint("sic: error on select():");
|
||||
}
|
||||
else if(n == 0) {
|
||||
if(time(NULL) - trespond >= 300)
|
||||
eprint("sic shutting down: parse timeout\n");
|
||||
sout("PING %s", host);
|
||||
perror("sic: error on select()");
|
||||
exit(EXIT_FAILURE);
|
||||
} else if(i == 0) {
|
||||
if(time(NULL) - trespond >= PINGTIMEOUT) {
|
||||
pout(server, "-!- sic shutting down: parse timeout");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
write(srv, ping, strlen(ping));
|
||||
continue;
|
||||
}
|
||||
if(FD_ISSET(fileno(srv), &rd)) {
|
||||
if(fgets(bufin, sizeof bufin, srv) == NULL)
|
||||
eprint("sic: remote host closed connection\n");
|
||||
if(FD_ISSET(srv, &rd)) {
|
||||
if(getline(srv, sizeof bufin, bufin) == -1) {
|
||||
perror("sic: remote server closed connection");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
parsesrv(bufin);
|
||||
trespond = time(NULL);
|
||||
}
|
||||
if(FD_ISSET(0, &rd)) {
|
||||
if(fgets(bufin, sizeof bufin, stdin) == NULL)
|
||||
eprint("sic: broken pipe\n");
|
||||
if(getline(0, sizeof bufin, bufin) == -1) {
|
||||
perror("sic: broken pipe");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
parsein(bufin);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
46
strlcpy.c
46
strlcpy.c
|
|
@ -1,46 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/*
|
||||
* Copy src to string dst of size siz. At most siz-1 characters
|
||||
* will be copied. Always NUL terminates (unless siz == 0).
|
||||
* Returns strlen(src); if retval >= siz, truncation occurred.
|
||||
*/
|
||||
size_t
|
||||
strlcpy(char *dst, const char *src, size_t siz)
|
||||
{
|
||||
char *d = dst;
|
||||
const char *s = src;
|
||||
size_t n = siz;
|
||||
/* Copy as many bytes as will fit */
|
||||
if (n != 0) {
|
||||
while (--n != 0) {
|
||||
if ((*d++ = *s++) == '\0')
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Not enough room in dst, add NUL and traverse rest of src */
|
||||
if (n == 0) {
|
||||
if (siz != 0)
|
||||
*d = '\0'; /* NUL-terminate dst */
|
||||
while (*s++)
|
||||
;
|
||||
}
|
||||
return(s - src - 1); /* count does not include NUL */
|
||||
}
|
||||
66
util.c
66
util.c
|
|
@ -1,66 +0,0 @@
|
|||
/* See LICENSE file for license details. */
|
||||
#include <netdb.h>
|
||||
#include <netinet/in.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
static void
|
||||
eprint(const char *fmt, ...) {
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vsnprintf(bufout, sizeof bufout, fmt, ap);
|
||||
va_end(ap);
|
||||
fprintf(stderr, "%s", bufout);
|
||||
if(fmt[0] && fmt[strlen(fmt) - 1] == ':')
|
||||
fprintf(stderr, " %s\n", strerror(errno));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static int
|
||||
dial(char *host, char *port) {
|
||||
struct addrinfo hints;
|
||||
struct addrinfo *res, *r;
|
||||
int fd;
|
||||
|
||||
memset(&hints, 0, sizeof hints);
|
||||
hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
if(getaddrinfo(host, port, &hints, &res) != 0)
|
||||
eprint("error: cannot resolve hostname '%s':", host);
|
||||
for(r = res; r; r = r->ai_next) {
|
||||
if((fd = socket(r->ai_family, r->ai_socktype, r->ai_protocol)) == -1)
|
||||
continue;
|
||||
if(connect(fd, r->ai_addr, r->ai_addrlen) == 0)
|
||||
break;
|
||||
close(fd);
|
||||
}
|
||||
freeaddrinfo(res);
|
||||
if(!r)
|
||||
eprint("error: cannot connect to host '%s'\n", host);
|
||||
return fd;
|
||||
}
|
||||
|
||||
static char *
|
||||
eat(char *s, int (*p)(int), int r) {
|
||||
while(*s != '\0' && p((unsigned char)*s) == r)
|
||||
s++;
|
||||
return s;
|
||||
}
|
||||
|
||||
static char*
|
||||
skip(char *s, char c) {
|
||||
while(*s != c && *s != '\0')
|
||||
s++;
|
||||
if(*s != '\0')
|
||||
*s++ = '\0';
|
||||
return s;
|
||||
}
|
||||
|
||||
static void
|
||||
trim(char *s) {
|
||||
char *e;
|
||||
|
||||
for (e = s + strlen(s); e > s && isspace((unsigned char)*(e - 1)); e--)
|
||||
;
|
||||
*e = '\0';
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user