FLTK: Fix compile warnings with updated gcc

Author: chrisws

ChangeLog

@@ -1,5 +1,8 @@
+2020-05-11 (0.12.19)
+	FLTK: Fix compile warnings with updated gcc
+
 2020-05-10 (0.12.19)
-	Fix ABSMIN/ABSMAX transposed #96
+	COMMON: Fix ABSMIN/ABSMAX transposed #96
 
 2020-05-09 (0.12.19)
 	COMMON: Fix crash when passing non-array to CHART
@@ -10,7 +13,7 @@
 
 2020-05-04 (0.12.19)
 	COMMON: INPUT crash #99
-	COMMON: Fix compile warning with updated gcc
+	COMMON: Fix compile warnings with updated gcc
 
 2020-03-07 (0.12.19)
 	COMMON: implement DEFINEKEY undo #92

src/platform/fltk/EditorWidget.cxx

@@ -815,11 +815,7 @@ void EditorWidget::getInput(char *result, int size) {
   if (wnd->isBreakExec()) {
     brun_break();
   } else {
-    const char *value = _commandText->value();
-    int valueLen = strlen(value);
-    int len = (valueLen < size) ? valueLen : size;
-    strncpy(result, value, len);
-    result[len] = 0;
+    strlcpy(result, _commandText->value(), size);
   }
   setCommand(cmd_find);
 }

src/platform/fltk/MainWindow.cxx

@@ -544,18 +544,19 @@ void MainWindow::editor_plugin(Fl_Widget *w, void *eventData) {
   if (editWidget) {
     Fl_Text_Editor *editor = editWidget->getEditor();
     char filename[PATH_MAX];
-    char path[PATH_MAX];
-    strcpy(filename, editWidget->getFilename());
+    strlcpy(filename, editWidget->getFilename(), PATH_MAX);
 
     if (runMode == edit_state) {
       if (editWidget->checkSave(false) && filename[0]) {
+        char path[PATH_MAX];
         int pos = editor->insert_position();
         int row, col, s1r, s1c, s2r, s2c;
         editWidget->getRowCol(&row, &col);
         editWidget->getSelStartRowCol(&s1r, &s1c);
         editWidget->getSelEndRowCol(&s2r, &s2c);
-        snprintf(opt_command, sizeof(opt_command), "%s|%d|%d|%d|%d|%d|%d",
-                 filename, row - 1, col, s1r - 1, s1c, s2r - 1, s2c);
+        strlcpy(opt_command, filename, PATH_MAX);
+        snprintf(path, sizeof(path), "|%d|%d|%d|%d|%d|%d", row - 1, col, s1r - 1, s1c, s2r - 1, s2c);
+        strlcat(opt_command, path, PATH_MAX);
         runMode = run_state;
         editWidget->runState(rs_run);
         snprintf(path, sizeof(path), "%s/%s", packageHome, (const char *)eventData);
@@ -626,17 +627,6 @@ void MainWindow::load_file(Fl_Widget *w, void *eventData) {
 
 //--Startup functions-----------------------------------------------------------
 
-/**
- *Adds a plug-in to the menu
- */
-void MainWindow::addPlugin(Fl_Menu_Bar *menu, const char *label, const char *filename) {
-  char path[PATH_MAX];
-  snprintf(path, PATH_MAX, "%s/%s", pluginHome, filename);
-  if (access(path, R_OK) == 0) {
-    menu->add(label, 0, editor_plugin_cb, strdup(path));
-  }
-}
-
 /**
  * scan for recent files
  */
@@ -952,7 +942,6 @@ MainWindow::MainWindow(int w, int h) :
   m->add("&File/_Close Others", 0, close_other_tabs_cb);
   m->add("&File/&Save File", FL_CTRL + 's', EditorWidget::save_file_cb);
   m->add("&File/_Save File &As", FL_CTRL + FL_SHIFT + 'S', save_file_as_cb);
-  addPlugin(m, "&File/Publish Online", "publish.bas");
   m->add("&File/_Export", FL_CTRL + FL_F+9, export_file_cb);
   m->add("&File/E&xit", FL_CTRL + 'q', quit_cb);
   m->add("&Edit/_&Undo", FL_CTRL + 'z', EditorWidget::undo_cb);

src/platform/fltk/MainWindow.h

@@ -72,7 +72,6 @@ struct MainWindow : public BaseWindow {
   bool isIdeHidden();           // whether to run without the IDE displayed
   bool isInteractive();         // whether to run without an interface
   bool isModal();               // whether a modal gui loop is active
-  void addPlugin(Fl_Menu_Bar *menu, const char *label, const char *filename);
   void busyMessage();
   int  handle(int e);
   void loadHelp(const char *path);