use strlcpy

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@61 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/Makefile b/Makefile
index 6aa8279d54f0b6064283b25bb975264af58c401b..cc906a76d54a50fe28f068b6eeebad467b80f037 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CC = gcc
 LDFLAGS = 
 CFLAGS = -g3 $(optimize) -Wall $(DEFS)
 DEFS = -DVERSION=\"$(VERSION)\"
-SRCS = virus.c ttyrec.c dgamelaunch.c io.c ttyplay.c stripgfx.c
+SRCS = virus.c ttyrec.c dgamelaunch.c io.c ttyplay.c stripgfx.c strlcpy.c
 OBJS = $(SRCS:.c=.o)
 LIBS = -lncurses -lcrypt -lutil
 

diff --git a/dgamelaunch.c b/dgamelaunch.c
index 10b6379956a99cfb04a3236af9a5f05d74a52882..2e6459c97b0b73c2ff997d6d20e352f27ba136ca 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -314,14 +314,14 @@ populate_games (int *l)
                 *replacestr = '\0';
 
               games[len]->name = malloc (strlen (pdirent->d_name) + 1);
-              strncpy (games[len]->name, pdirent->d_name,
+              strlcpy (games[len]->name, pdirent->d_name,
                        strlen (pdirent->d_name) + 1);
 
               games[len]->date = malloc (11);
-              strncpy (games[len]->date, replacestr + 1, 10);
+              strlcpy (games[len]->date, replacestr + 1, 11);
 
               games[len]->time = malloc (9);
-              strncpy (games[len]->time, replacestr + 12, 8);
+              strlcpy (games[len]->time, replacestr + 12, 9);
 
               games[len]->idle_time = pstat.st_mtime;
 

diff --git a/dgamelaunch.h b/dgamelaunch.h
index 25349f6884b271adda82773c5bc8d6fabcbb893c..909c02d940c4ae555d7cf4ca088640cca17c2f54 100644 (file)
--- a/dgamelaunch.h
+++ b/dgamelaunch.h
@@ -71,4 +71,7 @@ extern void write_canned_rcfile (char *target);
 extern void editoptions (void);
 extern void writefile (int requirenew);
 
+/* strlcpy.c */
+extern size_t strlcpy(char *dst, const char *src, size_t siz);
+
 #endif