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

11 files changed, 93 insertions, 118 deletions

diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 7b5a1c3fc..f33622e26 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.6 2002/05/15 23:32:25 easysw Exp $"
+// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.7 2002/05/16 12:47:42 easysw Exp $"
 //
 // C function type code for the Fast Light Tool Kit (FLTK).
 //
@@ -26,9 +26,8 @@
 #include <FL/Fl.H>
 #include "Fl_Type.h"
 #include <FL/fl_show_input.H>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdio.h>
-#include <ctype.h>
 
 extern int i18n_type;
 extern const char* i18n_include;
@@ -704,5 +703,5 @@ void Fl_Class_Type::write_code2() {
 }
 
 //
-// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.6 2002/05/15 23:32:25 easysw Exp $".
+// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.7 2002/05/16 12:47:42 easysw Exp $".
 //
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index b43f12e71..9bfa773d4 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.4 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.5 2002/05/16 12:47:42 easysw Exp $"
 //
 // Menu item code for the Fast Light Tool Kit (FLTK).
 //
@@ -35,7 +35,7 @@
 #include <FL/fl_message.H>
 #include <FL/Fl_Menu_.H>
 #include <FL/Fl_Button.H>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -92,8 +92,6 @@ Fl_Submenu_Type Fl_Submenu_type;
 ////////////////////////////////////////////////////////////////
 // Writing the C code:
 
-#include <ctype.h>
-
 // test functions in Fl_Widget_Type.C:
 int is_name(const char *c);
 const char *array_name(Fl_Widget_Type *o);
@@ -467,5 +465,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
 }
 
 //
-// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.4 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.5 2002/05/16 12:47:42 easysw Exp $".
 //
diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index a65defc73..ee1680a33 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.cxx,v 1.6.2.6.2.7 2002/04/28 08:42:32 easysw Exp $"
+// "$Id: Fl_Type.cxx,v 1.6.2.6.2.8 2002/05/16 12:47:42 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -38,9 +38,8 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Browser_.H>
 #include <FL/fl_draw.H>
-#include <ctype.h>
 #include <stdlib.h>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdio.h>
 
 #include "Fl_Type.h"
@@ -454,8 +453,7 @@ int storestring(const char *n, const char * & p, int nostrip) {
     p = 0;
   } else {
     char *q = (char *)malloc(length+1);
-    strncpy(q,n,length);
-    q[length] = 0;
+    strlcpy(q,n,length+1);
     p = q;
   }
   modflag = 1;
@@ -682,5 +680,5 @@ void Fl_Type::read_property(const char *c) {
 int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
 
 //
-// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.7 2002/04/28 08:42:32 easysw Exp $".
+// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.8 2002/05/16 12:47:42 easysw Exp $".
 //
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index d08da240b..759998650 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.14 2002/04/28 11:40:25 easysw Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.15 2002/05/16 12:47:42 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -31,7 +31,7 @@
 #include <FL/fl_message.H>
 #include <FL/Fl_Slider.H>
 #include <FL/Fl_Window.H>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -1339,8 +1339,6 @@ void selection_changed(Fl_Type *p) {
 ////////////////////////////////////////////////////////////////
 // Writing the C code:
 
-#include <ctype.h>
-
 // test to see if user named a function, or typed in code:
 int is_name(const char *c) {
   for (; *c; c++) if (ispunct(*c) && *c!='_' && *c!=':') return 0;
@@ -1373,8 +1371,9 @@ const char *array_name(Fl_Widget_Type *o) {
     if (n1 > num || n1==num && sawthis) return 0;
   }
   static char buffer[128];
+  // MRS: we want strncpy() here...
   strncpy(buffer,c,d-c+1);
-  sprintf(buffer+(d-c+1),"%d]",num+1);
+  snprintf(buffer+(d-c+1),sizeof(buffer) - (d-c+1), "%d]",num+1);
   return buffer;
 }
 
@@ -1976,5 +1975,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.14 2002/04/28 11:40:25 easysw Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.15 2002/05/16 12:47:42 easysw Exp $".
 //
diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx
index c778084d0..0eca85c58 100644
--- a/fluid/Fl_Window_Type.cxx
+++ b/fluid/Fl_Window_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.4 2002/05/03 14:33:00 easysw Exp $"
+// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.5 2002/05/16 12:47:43 easysw Exp $"
 //
 // Window type code for the Fast Light Tool Kit (FLTK).
 //
@@ -725,7 +725,7 @@ int Fl_Window_Type::handle(int event) {
 ////////////////////////////////////////////////////////////////
 
 #include <stdio.h>
-#include <string.h>
+#include "../src/flstring.h"
 
 void Fl_Window_Type::write_code1() {
   Fl_Widget_Type::write_code1();
@@ -792,5 +792,5 @@ int Fl_Window_Type::read_fdesign(const char* name, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.4 2002/05/03 14:33:00 easysw Exp $".
+// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.5 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx
index cd0dfa774..c9f4d9c9c 100644
--- a/fluid/Fluid_Image.cxx
+++ b/fluid/Fluid_Image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $"
+// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.9 2002/05/16 12:47:43 easysw Exp $"
 //
 // Pixmap label support for the Fast Light Tool Kit (FLTK).
 //
@@ -27,10 +27,9 @@
 #include <FL/Fl_Widget.H>
 #include "Fl_Type.h"
 #include "Fluid_Image.h"
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdio.h>
 #include <errno.h>
-#include <ctype.h>
 #include <stdlib.h>
 #include <FL/filename.H>
 
@@ -220,5 +219,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
 
 
 //
-// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.8 2002/03/25 21:08:41 easysw Exp $".
+// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.9 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/code.cxx b/fluid/code.cxx
index 1e15abd71..13554f4c8 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $"
+// "$Id: code.cxx,v 1.9.2.9.2.5 2002/05/16 12:47:43 easysw Exp $"
 //
 // Code output routines for the Fast Light Tool Kit (FLTK).
 //
@@ -23,10 +23,9 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //
 
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdarg.h>
 
 #include <FL/Fl.H>
@@ -136,7 +135,7 @@ int write_declare(const char *format, ...) {
   va_list args;
   char buf[1024];
   va_start(args, format);
-  vsprintf(buf, format, args);
+  vsnprintf(buf, sizeof(buf), format, args);
   va_end(args);
   included **p = &included_root;
   while (*p) {
@@ -464,5 +463,5 @@ void Fl_Type::write_code1() {
 void Fl_Type::write_code2() {}
 
 //
-// End of "$Id: code.cxx,v 1.9.2.9.2.4 2002/03/25 21:08:41 easysw Exp $".
+// End of "$Id: code.cxx,v 1.9.2.9.2.5 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 9185d5c04..e47718349 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11.2.7 2002/05/01 08:51:59 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.8 2002/05/16 12:47:43 easysw Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -35,30 +35,11 @@
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Menu_Item.H>
 #include <stdio.h>
-#include <config.h>
-
-#include <string.h>
-
-#ifdef HAVE_STRINGS_H
-#  include <strings.h>
-#endif // HAVE_STRINGS_H
-
-// Apparently Unixware defines "index" to strchr (!) rather than
-// providing a proper entry point or not providing the (obsolete)
-// BSD function.  Make sure index is not defined...
-#ifdef index
-#  undef index
-#endif // index
-
-#if defined(WIN32) || defined(__EMX__)
-#define strcasecmp stricmp
-#endif
+#include "../src/flstring.h"
 
 #include "Fl_Widget_Type.h"
 
 #if !HAVE_STRCASECMP
-#  include <ctype.h>
-
 //
 // 'strcasecmp()' - Do a case-insensitive compare...
 //
@@ -924,5 +905,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11.2.7 2002/05/01 08:51:59 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.8 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/file.cxx b/fluid/file.cxx
index 1cb7b8c3a..cd3610169 100644
--- a/fluid/file.cxx
+++ b/fluid/file.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: file.cxx,v 1.7.2.6.2.5 2002/05/13 20:54:49 easysw Exp $"
+// "$Id: file.cxx,v 1.7.2.6.2.6 2002/05/16 12:47:43 easysw Exp $"
 //
 // Fluid file routines for the Fast Light Tool Kit (FLTK).
 //
@@ -28,10 +28,9 @@
 // Please report all bugs and problems to "fltk-bugs@fltk.org".
 //
 
-#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "../src/flstring.h"
 #include <stdarg.h>
 #include "alignment_panel.h"
 
@@ -157,7 +156,7 @@ void read_error(const char *format, ...) {
   va_start(args, format);
   if (!fin) {
     char buffer[1024];
-    vsprintf(buffer, format, args);
+    vsnprintf(buffer, sizeof(buffer), format, args);
     fl_message(buffer);
   } else {
     fprintf(stderr, "%s:%d: ", fname, lineno);
@@ -632,5 +631,5 @@ void read_fdesign() {
 }
 
 //
-// End of "$Id: file.cxx,v 1.7.2.6.2.5 2002/05/13 20:54:49 easysw Exp $".
+// End of "$Id: file.cxx,v 1.7.2.6.2.6 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index e683c4cfd..1f8bbc8d7 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.25 2002/05/02 10:08:44 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.26 2002/05/16 12:47:43 easysw Exp $"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -39,8 +39,6 @@
 #include <FL/filename.H>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <errno.h>
 
 #include "../src/flstring.h"
@@ -298,7 +296,7 @@ static char* cutfname() {
   if (!beenhere) {
     beenhere = 1;
     fluid_prefs.getUserdataPath(name, sizeof(name));
-    strncat(name, "cut_buffer", sizeof(name) - 1);
+    strlcat(name, "cut_buffer", sizeof(name));
     // getUserdataPath zeros the "name" buffer...
   }
 
@@ -565,8 +563,7 @@ void update_history(const char *filename) {
           i * sizeof(relative_history[0]));
 
   // Put the new file at the top...
-  strncpy(absolute_history[0], absolute, sizeof(absolute_history[0]) - 1);
-  absolute_history[0][sizeof(absolute_history[0]) - 1] = '\0';
+  strlcpy(absolute_history[0], absolute, sizeof(absolute_history[0]));
 
   fl_filename_relative(relative_history[0], sizeof(relative_history[0]),
                        absolute_history[0]);
@@ -798,5 +795,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.25 2002/05/02 10:08:44 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.26 2002/05/16 12:47:43 easysw Exp $".
 //
diff --git a/fluid/makedepend b/fluid/makedepend
index b9a413d53..740eefe6f 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -8,9 +8,10 @@ Fl_Function_Type.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Tabs.H
 Fl_Function_Type.o: ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H
 Fl_Function_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
 Fl_Function_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
-Fl_Function_Type.o: ../FL/fl_show_input.H ../FL/fl_ask.H function_panel.h
-Fl_Function_Type.o: ../FL/Fl_Window.H ../FL/Fl_Light_Button.H
-Fl_Function_Type.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fl_Function_Type.o: ../FL/fl_show_input.H ../FL/fl_ask.H ../src/flstring.h
+Fl_Function_Type.o: ../config.h function_panel.h ../FL/Fl_Window.H
+Fl_Function_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
+Fl_Function_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H
 Fl_Function_Type.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H ../FL/Fl_Box.H
 Fl_Function_Type.o: ../FL/fl_ask.H
 Fl_Menu_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
@@ -27,8 +28,9 @@ Fl_Menu_Type.o: ../FL/Fl_Button.H ../FL/Fl_Check_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
 Fl_Menu_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_message.H
-Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H ../FL/Fl_Input.H
-Fl_Menu_Type.o: Shortcut_Button.h ../FL/fl_draw.H
+Fl_Menu_Type.o: ../FL/fl_ask.H ../src/flstring.h ../config.h
+Fl_Menu_Type.o: ../FL/Fl_Output.H ../FL/Fl_Input.H Shortcut_Button.h
+Fl_Menu_Type.o: ../FL/fl_draw.H
 Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H
 Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
@@ -54,13 +56,15 @@ Fl_Widget_Type.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H
 Fl_Widget_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Valuator.H ../FL/fl_message.H ../FL/fl_ask.H
-Fl_Widget_Type.o: ../FL/Fl_Slider.H widget_panel.h ../FL/Fl_Value_Input.H
-Fl_Widget_Type.o: ../FL/Fl_Input.H Shortcut_Button.h ../FL/fl_show_colormap.H
+Fl_Widget_Type.o: ../FL/Fl_Slider.H ../src/flstring.h ../config.h
+Fl_Widget_Type.o: widget_panel.h ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
+Fl_Widget_Type.o: Shortcut_Button.h ../FL/fl_show_colormap.H
 Fl_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
-Fl_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H Fl_Type.h
-Fl_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
-Fl_Type.o: Fluid_Image.h ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H
+Fl_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H
+Fl_Type.o: ../src/flstring.h ../config.h Fl_Type.h ../FL/Fl_Widget.H
+Fl_Type.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
+Fl_Type.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H
 Fl_Type.o: ../FL/Fl_Window.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
 Fl_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
 Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
@@ -83,6 +87,7 @@ Fl_Window_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H
 Fl_Window_Type.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H widget_panel.h
 Fl_Window_Type.o: ../FL/Fl_Value_Input.H ../FL/Fl_Input.H Shortcut_Button.h
+Fl_Window_Type.o: ../src/flstring.h ../config.h
 Fluid_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fluid_Image.o: ../FL/Fl_Widget.H Fl_Type.h ../FL/Fl_Menu.H
 Fluid_Image.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Shared_Image.H
@@ -90,53 +95,54 @@ Fluid_Image.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fluid_Image.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
 Fluid_Image.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
 Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
-Fluid_Image.o: ../FL/filename.H ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H
-Fluid_Image.o: ../FL/Fl_Button.H ../FL/fl_ask.H ../FL/Fl_File_Browser.H
-Fluid_Image.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-Fluid_Image.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H
-Fluid_Image.o: ../FL/Fl.H ../FL/filename.H ../FL/Fl_File_Input.H
-Fluid_Image.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
-Fluid_Image.o: ../FL/Fl_Button.H
-code.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h
-code.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
-code.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
-code.o: ../FL/Fl_Group.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-code.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
-code.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
-code.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Preferences.H
-code.o: ../FL/Fl_Tooltip.H ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Input.H
-code.o: ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
-code.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
-code.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-code.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-code.o: ../FL/filename.H
+Fluid_Image.o: ../src/flstring.h ../config.h ../FL/filename.H
+Fluid_Image.o: ../FL/Fl_File_Chooser.H ../FL/Fl_Window.H ../FL/Fl_Button.H
+Fluid_Image.o: ../FL/fl_ask.H ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
+Fluid_Image.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+Fluid_Image.o: ../FL/Fl_Valuator.H ../FL/Fl_File_Icon.H ../FL/Fl.H
+Fluid_Image.o: ../FL/filename.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
+Fluid_Image.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
+code.o: ../src/flstring.h ../config.h ../FL/Fl.H ../FL/Enumerations.H
+code.o: ../FL/Fl_Export.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
+code.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Shared_Image.H
+code.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Group.H
+code.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H
+code.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
+code.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H alignment_panel.h
+code.o: ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H
+code.o: ../FL/Fl_Button.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+code.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Check_Button.H
+code.o: ../FL/Fl_Light_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H
+code.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+code.o: ../FL/Fl_Valuator.H ../FL/filename.H
 factory.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H
-factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../config.h
-factory.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
-factory.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Shared_Image.H
-factory.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-factory.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
-factory.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H
-factory.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Box.H ../FL/Fl_Button.H
-factory.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
-factory.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Light_Button.H
-factory.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
-factory.o: ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
-factory.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-factory.o: ../FL/Fl_Check_Browser.H ../FL/Fl_File_Browser.H
-factory.o: ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H ../FL/filename.H
-factory.o: ../FL/Fl_Counter.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-factory.o: ../FL/Fl_File_Input.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
-factory.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
+factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../src/flstring.h
+factory.o: ../config.h Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H
+factory.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
+factory.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H
+factory.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Tabs.H ../FL/Fl_Pack.H
+factory.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+factory.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+factory.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_Return_Button.H
+factory.o: ../FL/Fl_Button.H ../FL/Fl_Repeat_Button.H ../FL/Fl.H
+factory.o: ../FL/Fl_Light_Button.H ../FL/Fl_Check_Button.H
+factory.o: ../FL/Fl_Light_Button.H ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H
+factory.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+factory.o: ../FL/Fl_Valuator.H ../FL/Fl_Check_Browser.H
+factory.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H
+factory.o: ../FL/filename.H ../FL/Fl_Counter.H ../FL/Fl_Input.H
+factory.o: ../FL/Fl_Input_.H ../FL/Fl_File_Input.H ../FL/Fl_Text_Display.H
+factory.o: ../FL/fl_draw.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
 factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_Help_View.H
 factory.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H
 factory.o: ../FL/Fl_Dial.H ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H
 factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H
 factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H
-file.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
-file.o: ../FL/Fl_Window.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H
-file.o: ../FL/Fl_Widget.H ../FL/Fl_Button.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H
-file.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+file.o: ../src/flstring.h ../config.h alignment_panel.h ../FL/Fl.H
+file.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
+file.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
+file.o: ../FL/Fl_Button.H ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Group.H
+file.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 file.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/Fl_Choice.H
 file.o: ../FL/Fl_Menu_.H ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
 file.o: ../FL/Fl_Return_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H