[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3978 - branches/freewrt_1_0/package/config
From:       tg () freewrt ! org
Date:       2011-12-27 20:52:04
Message-ID: 20111227205204.D95A21C003 () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2011-12-27 21:52:03 +0100 (Tue, 27 Dec 2011)
New Revision: 3978

Modified:
   branches/freewrt_1_0/package/config/checklist.c
   branches/freewrt_1_0/package/config/confdata.c
   branches/freewrt_1_0/package/config/menubox.c
   trunk/freewrt/tools/config/confdata.c
Log:
• raise the [#142] line length fixed limit (yuk) further,
  to avoid segfaulting (or worse) with even longer ssh pubkeys
• MFC the colourkey patch from r2424 while here


Modified: branches/freewrt_1_0/package/config/checklist.c
===================================================================
--- branches/freewrt_1_0/package/config/checklist.c	2011-12-27 18:48:29 UTC (rev 3977)
+++ branches/freewrt_1_0/package/config/checklist.c	2011-12-27 20:52:03 UTC (rev 3978)
@@ -47,10 +47,15 @@
     else
 	wprintw (win, "(%c)", status ? 'X' : ' ');
 
+#if 0
     wattrset (win, selected ? tag_selected_attr : tag_attr);
     mvwaddch(win, choice, item_x, item[0]);
     wattrset (win, selected ? item_selected_attr : item_attr);
     waddstr (win, (char *)item+1);
+#else
+    wattrset (win, selected ? item_selected_attr : item_attr);
+    waddstr (win, item);
+#endif
     if (selected) {
     	wmove (win, choice, check_x+1);
     	wrefresh (win);

Modified: branches/freewrt_1_0/package/config/confdata.c
===================================================================
--- branches/freewrt_1_0/package/config/confdata.c	2011-12-27 18:48:29 UTC (rev 3977)
+++ branches/freewrt_1_0/package/config/confdata.c	2011-12-27 20:52:03 UTC (rev 3978)
@@ -68,7 +68,7 @@
 int conf_read(const char *name)
 {
 	FILE *in = NULL;
-	char line[2048];
+	char line[32768];
 	char *p, *p2;
 	int lineno = 0;
 	struct symbol *sym;

Modified: branches/freewrt_1_0/package/config/menubox.c
===================================================================
--- branches/freewrt_1_0/package/config/menubox.c	2011-12-27 18:48:29 UTC (rev 3977)
+++ branches/freewrt_1_0/package/config/menubox.c	2011-12-27 20:52:03 UTC (rev 3978)
@@ -87,10 +87,12 @@
 #endif
     wattrset (win, selected ? item_selected_attr : item_attr);
     mvwaddstr (win, choice, item_x, menu_item);
+#if 0
     if (hotkey) {
     	wattrset (win, selected ? tag_key_selected_attr : tag_key_attr);
     	mvwaddch(win, choice, item_x+j, menu_item[j]);
     }
+#endif
     if (selected) {
 	wmove (win, choice, item_x+1);
 	wrefresh (win);

Modified: trunk/freewrt/tools/config/confdata.c
===================================================================
--- trunk/freewrt/tools/config/confdata.c	2011-12-27 18:48:29 UTC (rev 3977)
+++ trunk/freewrt/tools/config/confdata.c	2011-12-27 20:52:03 UTC (rev 3978)
@@ -70,7 +70,7 @@
 int conf_read(const char *name)
 {
 	FILE *in = NULL;
-	char line[2048];
+	char line[32768];
 	char *p, *p2;
 	int lineno = 0;
 	struct symbol *sym;

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits

[prev in list] [next in list] [prev in thread] [next in thread]