Update kris/util.c strlcpy

diff --git a/kris/Makefile b/kris/Makefile
new file mode 120000 (symlink)
index 0000000..d0b0e8e
--- /dev/null
+++ b/kris/Makefile
@@ -0,0 +1 @@
+../Makefile
\ No newline at end of file

diff --git a/kris/config.mk b/kris/config.mk
new file mode 120000 (symlink)
index 0000000..f2cf390
--- /dev/null
+++ b/kris/config.mk
@@ -0,0 +1 @@
+../config.mk
\ No newline at end of file

diff --git a/kris/sic.c b/kris/sic.c
index 4767aa75a61e77a8f3377ae360bbd311e69c2048..dd120ea50bd61130ab4149cb6eff5e313b3a19e7 100644 (file)
--- a/kris/sic.c
+++ b/kris/sic.c
@@ -28,14 +28,6 @@ static char channel[256];
 static time_t trespond;
 static FILE *srv;
 
 static time_t trespond;
 static FILE *srv;
 

-#define va_buf(buf, fmt) {\
-       va_list ap; \
-       \
-       va_start(ap, fmt); \
-       vsnprintf(buf, sizeof buf, fmt, ap); \
-       va_end(ap); \
-}
-

 #include "util.c"
 
 static void
 #include "util.c"
 
 static void


@@ -167,7 +159,7 @@ main(int argc, char *argv[]) {
                        if(++i < argc) password = argv[i];
                        break;
                case 'v':
                        if(++i < argc) password = argv[i];
                        break;
                case 'v':

-                       eprint("sic-"VERSION", ? 2005-2007 Anselm R. Garbe, Nico Golde\n");
+                       eprint("sic-"VERSION", ©2005-2009 Kris Maglione, Anselm R. Garbe, Nico Golde\n");

                default:
                        eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
                }
                default:
                        eprint("usage: sic [-h host] [-p port] [-n nick] [-k keyword] [-v]\n");
                }

diff --git a/kris/util.c b/kris/util.c
index 19c2f2b8c6a459773ec2bc3fdca7fb95373041c2..53b2fe8920ca91db1f7516be866acba96a29eb4d 100644 (file)
--- a/kris/util.c
+++ b/kris/util.c
@@ -2,6 +2,13 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
 

+#define va_buf(buf, fmt) {\
+       va_list ap; \
+       va_start(ap, fmt); \
+       vsnprintf(buf, sizeof buf, fmt, ap); \
+       va_end(ap); \
+}
+

 static void
 eprint(const char *fmt, ...) {
 
 static void
 eprint(const char *fmt, ...) {
 


@@ -34,7 +41,7 @@ dial(char *host, int port) {
 #define strlcpy _strlcpy
 static void
 strlcpy(char *to, const char *from, int l) {
 #define strlcpy _strlcpy
 static void
 strlcpy(char *to, const char *from, int l) {

-       strncpy(to, from, l-1);
+       memccpy(to, from, '\0', l);

        to[l-1] = '\0';
 }
 
        to[l-1] = '\0';
 }