Merge changes I made in the last year (#136)

Co-authored-by: Emeka Nkurumeh <emekankurumeh@outlook.com>

1 files changed, 44 insertions, 9 deletions

diff --git a/kirc.h b/kirc.h
index 722bda8..04fda43 100644
--- a/kirc.h
+++ b/kirc.h
@@ -1,14 +1,26 @@
+/*
+ * SPDX-License-Identifier: MIT
+ * Copyright (C) 2023 Michael Czigler
+ */
+
 #ifndef __KIRC_H
 #define __KIRC_H
 
 #define _POSIX_C_SOURCE 200809L
-#define CTCP_CMDS "ACTION VERSION TIME CLIENTINFO PING"
+#define CTCP_CMDS "ACTION VERSION TIME CLIENTINFO PING DCC"
 #define VERSION "0.3.2"
+#define TESTCHARS "\xe1\xbb\xa4"
 #define MSG_MAX 512
 #define CHA_MAX 200
-#define NIC_MAX 26
+#define WRAP_LEN 26
 #define HIS_MAX 100
+#define FNM_MAX 255
+#define CON_MAX 20
 #define CBUF_SIZ 1024
+#define DCC_FLAGS (O_WRONLY | O_APPEND)
+#define DCC_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
+#define STR_(a) #a
+#define STR(a) STR_(a)
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <sys/types.h>
@@ -26,16 +38,19 @@
 #include <poll.h>
 #include <errno.h>
 #include <termios.h>
+#include <limits.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
-static char cdef[MSG_MAX] = ""; /* default PRIVMSG channel */
 static int conn;                /* connection socket */
 static int verb = 0;            /* verbose output */
 static int sasl = 0;            /* SASL method */
 static int isu8 = 0;            /* UTF-8 flag */
-static char *host = "irc.libera.chat";  /* host address */
-static char *port = "6667";     /* port */
-static char *chan = NULL;       /* channel(s) */
+static const char *host = "irc.libera.chat";  /* host address */
+static const char *port = "6667";     /* port */
+static char chan[MSG_MAX];      /* channel and prompt */
 static char *nick = NULL;       /* nickname */
 static char *pass = NULL;       /* password */
 static char *user = NULL;       /* user name */
@@ -45,14 +60,21 @@ static char *olog = NULL;       /* chat log path */
 static char *inic = NULL;       /* additional server command */
 static int cmds = 0;            /* indicates additional server commands */
 static char cbuf[CBUF_SIZ];     /* additional stdin server commands */
+static short ipv6 = 0;
+
+/* define function macros */
+#define htonll(x) ((1==htonl(1)) ? (x) : (((uint64_t)htonl((x) & 0xFFFFFFFFUL)) << 32) | htonl((uint32_t)((x) >> 32)))
+#define buffer_position_move(l, dest, src, size) memmove(l->buf + l->posb + dest, l->buf + l->posb + src, size)
+#define buffer_position_move_end(l, dest, src) buffer_position_move(l, dest, src, l->lenb - (l->posb + src) + 1)
+#define u8_character_start(c) (isu8 ? (c & 0x80) == 0x00 || (c & 0xC0) == 0xC0 : 1)
 
 static int ttyinfd = STDIN_FILENO;
 static struct termios orig;
 static int rawmode = 0;
 static int atexit_registered = 0;
-static int history_max_len = HIS_MAX;
 static int history_len = 0;
 static char **history = NULL;
+static short small_screen;
 
 typedef struct PARAMETERS {
     char *prefix;
@@ -68,8 +90,7 @@ typedef struct PARAMETERS {
 } param_t, *param;
 
 typedef struct STATE {
-    char *prompt;               /* Prompt to display. */
-    char *buf;                  /* Edited line buffer. */
+    char buf[MSG_MAX];          /* Edited line buffer. */
     size_t buflen;              /* Edited line buffer size. */
     size_t plenb;               /* Prompt length. */
     size_t plenu8;              /* Prompt length. */
@@ -88,4 +109,18 @@ struct abuf {
     int len;
 };
 
+struct dcc_connection {
+    char filename[FNM_MAX + 1];
+    struct sockaddr_in sin;
+    struct sockaddr_in6 sin6;
+    size_t bytes_read;
+    size_t file_size;
+    int file_fd;
+};
+
+static struct {
+    struct pollfd sock_fds[CON_MAX + 2];
+    struct dcc_connection slots[CON_MAX];
+} dcc_sessions = {0};
+
 #endif