summaryrefslogtreecommitdiff
path: root/src/Fl_display.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-05-16 12:47:44 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-05-16 12:47:44 +0000
commit88d54cd78bf73348e4f207ab3f741aa374f28b1c (patch)
treed9310acf36b480d31f0c1527520fe7376f7953ca /src/Fl_display.cxx
parent36546824762618bbe76d4ac72b632ca9927acd9f (diff)
Massive update to use strlcpy() and strlcat() instead of strncpy()
and strncat() in almost all places (there are still a few strncpy's that need to be used...) Added configure check for strlcat() and strlcpy(). Added emulation code for strlcat() and strlcpy(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2239 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_display.cxx')
-rw-r--r--src/Fl_display.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Fl_display.cxx b/src/Fl_display.cxx
index f8b9b2aec..ddd2ac4b6 100644
--- a/src/Fl_display.cxx
+++ b/src/Fl_display.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $"
+// "$Id: Fl_display.cxx,v 1.4.2.3.2.5 2002/05/16 12:47:43 easysw Exp $"
//
// Display function for the Fast Light Tool Kit (FLTK).
//
@@ -36,11 +36,10 @@ void Fl::display(const char *d) {
#else
static char e[1024];
strcpy(e,"DISPLAY=");
- strncat(e,d,sizeof(e) - 1);
- e[sizeof(e) - 1] = '\0';
+ strlcat(e,d,sizeof(e));
for (char *c = e+8; *c!=':'; c++) {
if (!*c) {
- strncat(e,":0.0",sizeof(e) - 1);
+ strlcat(e,":0.0",sizeof(e));
break;
}
}
@@ -49,5 +48,5 @@ void Fl::display(const char *d) {
}
//
-// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.4 2002/04/11 11:52:42 easysw Exp $".
+// End of "$Id: Fl_display.cxx,v 1.4.2.3.2.5 2002/05/16 12:47:43 easysw Exp $".
//