Attachment #190241 for bug #224737

Lines 3-9 Link Here

(-)ports-mgmt/dialog4ports/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= dialog4ports	4	PORTNAME= dialog4ports
5	PORTVERSION= 0.1.6	5	PORTVERSION= 0.1.6
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES= ports-mgmt	7	CATEGORIES= ports-mgmt
8	MASTER_SITES= http://m1cro.me/dialog4ports/ \	8	MASTER_SITES= http://m1cro.me/dialog4ports/ \
9	http://files.etoilebsd.net/dialog4ports/ \	9	http://files.etoilebsd.net/dialog4ports/ \




--- dialog4ports.c.orig	2016-07-08 14:49:08 UTC
+++ dialog4ports.c
@@ -43,6 +43,7 @@
 
 static int list_no = 0;
 static int group = 0;
+static char const *env_delimiter = " \t";
 
 /* The initial items size */
 static int items_sz = 5;
@@ -50,16 +51,22 @@ static int items_sz = 5;
 static StringList *enable_items = NULL;
 /* New items */
 static StringList *new_items = NULL;
+/* One options section */
+typedef struct {
+  char env_name[32];
+  char section_name[256];
+  int type;
+} dialog_section;
 
 /* add item to items */
 static void
-add_item(dialog_mixedlist **items, char const *name, char const *text,
+add_item(dialog_option_item **items, char const *name, char const *text,
 		bool state, bool new, int type, int grp)
 {
 
 	if ((list_no + 1 > items_sz) || *items == NULL) {
 		items_sz *= 2;
-		*items = realloc(*items, items_sz * sizeof(dialog_mixedlist));
+		*items = realloc(*items, items_sz * sizeof(dialog_option_item));
 		if (*items == NULL)
 			err(EXIT_FAILURE, "Need more memory!");
 	}
@@ -126,81 +133,171 @@ parse_env_sl(char const *env_name)
 
 /* parsing part */
 static int
-parsing_env(dialog_mixedlist **items, char const *env_name, int type)
+parse_env_all(dialog_option_item **items, char const *env_name, int type)
 {
-	char *env, buf[256];
-	char const *delimiter = " \t";
-	char *token, *token2;
+	char *env;
+	char *token;
 	char *temp, *tofree;
-	char *temp2, *tofree2;
 
 	env = getenv(env_name);
 	if (env == NULL)
 		return (0);
 
-	if (strcmp(env_name, "ALL_OPTIONS") == 0) {
-		tofree = temp = strdup(env);
+	tofree = temp = strdup(env);
+	while ((token = strsep(&temp, env_delimiter)) != NULL) {
+		if (token[0] == '\0')
+			continue;
+		add_item(items, token, get_desc(token, ""), is_enable(token),
+				is_new(token), type, group);
+	}
+	free(tofree);
 
-		while ((token = strsep(&temp, delimiter)) != NULL) {
-			if (token[0] == '\0')
-				continue;
-			add_item(items, token, get_desc(token, ""), is_enable(token),
-					is_new(token), type, group);
+	group++;
+
+	return (0);
+}
+
+static void
+order_sections(dialog_section **sections, int sections_size)
+{
+	char *env;
+	char *token, *temp, *tofree;
+	dialog_section *ordered_sections, *sec;
+	int i, found;
+
+	env = getenv("OPTIONS_SECTION_ORDER");
+	if (env == NULL || env[0] == '\0')
+		return;
+
+	if (sections_size == 0)
+		errx(EXIT_FAILURE, "OPTIONS_SECTION_ORDER is defined, but there are no option sections");
+
+	ordered_sections = malloc(sizeof(dialog_section)*sections_size);
+	sec = ordered_sections;
+	found = 0;
+
+	tofree = temp = strdup(env);
+	while ((token = strsep(&temp, env_delimiter)) != NULL) {
+		if (token[0] == '\0')
+			continue;
+
+		for (i = 0; i < sections_size; i++) {
+			if (strcmp((*sections)[i].section_name, token) == 0) {
+				*sec++ = (*sections)[i];
+				found++;
+				break;
+			}
 		}
-		free(tofree);
-	} else {
+		if (i >= sections_size)
+			errx(EXIT_FAILURE, "can't find section %s from OPTIONS_SECTION_ORDER in any option group", token);
+	}
+	free(tofree);
+
+	if (found != sections_size)
+		errx(EXIT_FAILURE, "Items in OPTIONS_SECTION_ORDER should match the declared option sections");
+
+	free(*sections);
+	*sections = ordered_sections;
+}
+
+static void
+read_env_section(dialog_section **sections, int *sections_size, char const *env_name, int type)
+{
+	char *env;
+	char *token;
+	char *temp, *tofree;
+	dialog_section *new_section;
+
+	env = getenv(env_name);
+	if (env == NULL)
+		return;
+
+	tofree = temp = strdup(env);
+	while ((token = strsep(&temp, env_delimiter)) != NULL) {
+		if (token[0] == '\0')
+			continue;
+
+		if (*sections_size == 0)
+			*sections = malloc(sizeof(dialog_section));
+		else
+			*sections = realloc(*sections, sizeof(dialog_section) * (*sections_size + 1));
+
+		new_section = *sections + *sections_size;
+
+		strcpy(new_section->env_name, env_name);
+		strncpy(new_section->section_name, token, sizeof(new_section->section_name));
+		new_section->type = type;
+
+		++*sections_size;
+	}
+	free(tofree);
+}
+
+static int
+add_sections(dialog_option_item **items, dialog_section *sections, int sections_size)
+{
+	int i;
+	char *env, buf[256];
+	char *token;
+	char *temp, *tofree;
+	dialog_section *sec = sections;
+
+	for (i = 0; i < sections_size; i++, sec++) {
+		add_item(items, get_desc(sec->section_name, sec->section_name), "", false, false,
+				ITEM_SEPARATOR, group);
+
+		snprintf(buf, sizeof(buf), "%s_%s", sec->env_name, sec->section_name);
+		env = getenv(buf);
+		if (env == NULL)
+			errx(EXIT_FAILURE, "%s does not exists", buf);
+
 		tofree = temp = strdup(env);
-		while ((token = strsep(&temp, delimiter)) != NULL) {
+		while ((token = strsep(&temp, env_delimiter)) != NULL) {
 			if (token[0] == '\0')
 				continue;
-			add_item(items, get_desc(token, token), "", false, false,
-					ITEM_SEPARATOR, group);
-
-			snprintf(buf, sizeof(buf), "%s_%s", env_name, token);
-			env = getenv(buf);
-			if (env == NULL)
-				errx(EXIT_FAILURE, "%s does not exists", buf);
-			tofree2 = temp2 = strdup(env);
-			while ((token2 = strsep(&temp2, delimiter)) != NULL) {
-				if (token2[0] == '\0')
-					continue;
-				add_item(items, token2, get_desc(token2, ""),
-						is_enable(token2), is_new(token2), type, group);
-			}
-			free(tofree2);
-			group++;
+			add_item(items, token, get_desc(token, ""),
+					is_enable(token), is_new(token), sec->type, group);
 		}
-
 		free(tofree);
+		group++;
 	}
+
 	if (group == 0)
 		group++;
 
 	return (0);
 }
 
-
 /* prepare items for next drawing*/
-static dialog_mixedlist *
+static dialog_option_item *
 prepare_items(void)
 {
-	dialog_mixedlist *items = NULL;
+	dialog_option_item *items = NULL;
+	dialog_section *sections = NULL;
+	int sections_size = 0;
 
 	enable_items = parse_env_sl("PORT_OPTIONS");
 	new_items = parse_env_sl("NEW_OPTIONS");
 
-	parsing_env(&items, "ALL_OPTIONS", ITEM_CHECK);
-	parsing_env(&items, "OPTIONS_GROUP", ITEM_CHECK);
-	parsing_env(&items, "OPTIONS_MULTI", ITEM_CHECK);
-	parsing_env(&items, "OPTIONS_SINGLE", ITEM_RADIO);
-	parsing_env(&items, "OPTIONS_RADIO", ITEM_RADIO);
+	parse_env_all(&items, "ALL_OPTIONS", ITEM_CHECK);
+	read_env_section(&sections, &sections_size, "OPTIONS_GROUP", ITEM_CHECK);
+	read_env_section(&sections, &sections_size, "OPTIONS_MULTI", ITEM_CHECK);
+	read_env_section(&sections, &sections_size, "OPTIONS_SINGLE", ITEM_RADIO);
+	read_env_section(&sections, &sections_size, "OPTIONS_RADIO", ITEM_RADIO);
+
+	order_sections(&sections, sections_size);
+
+	add_sections(&items, sections, sections_size);
+
+	if (sections != NULL)
+		free(sections);
 
 	return (items);
 }
 
 static int
 mixedlist_show(const char *title, const char *cprompt, int height,
-		int min_height, int width, dialog_mixedlist *items, bool align_center,
+		int min_height, int width, dialog_option_item *items, bool align_center,
 		bool fullscreen)
 {
 	int res;
@@ -235,7 +332,7 @@ main(int argc, char *argv[])
 	bool align_center = 0;
 	bool fullscreen = 0;
 	char *helpfile;
-	dialog_mixedlist *items;
+	dialog_option_item *items;
 
 	setlocale(LC_ALL, "");
 	errno = 0;




--- mixedlist.c.orig	2018-02-01 07:53:26 UTC
+++ mixedlist.c
@@ -36,7 +36,7 @@ static int list_width, check_x, item_x;
 #define MIN_HIGH			(1 + (5 * MARGIN))
 
 static int
-d4p_default_mixlistitem(dialog_mixedlist *items)
+d4p_default_mixlistitem(dialog_option_item *items)
 {
 	int result = 0;
 
@@ -55,7 +55,7 @@ d4p_default_mixlistitem(dialog_mixedlist
 }
 
 static int
-d4p_calc_mixlist_width(int item_no, dialog_mixedlist *items)
+d4p_calc_mixlist_width(int item_no, dialog_option_item *items)
 {
 	int n, i, len1 = 0, len2 = 0;
 	for (i = 0; i < item_no; ++i) {
@@ -140,7 +140,7 @@ d4p_clean_window(WINDOW *dialog)
  */
 static void
 print_item(WINDOW *win,
-		dialog_mixedlist *items,
+		dialog_option_item *items,
 		int choice,
 		bool selected)
 {
@@ -250,7 +250,7 @@ dlg_mixedlist(const char *title,
 		int min_height,
 		int width,
 		int item_no,
-		dialog_mixedlist *items,
+		dialog_option_item *items,
 		bool align_center,
 		bool fullscreen)
 {




--- mixedlist.h.orig	2018-02-01 07:50:50 UTC
+++ mixedlist.h
@@ -15,7 +15,7 @@ typedef struct {
 	int group;
 	bool state;
 	bool new;
-} dialog_mixedlist;
+} dialog_option_item;
 
 /* List of items */
 #define ITEM_CHECK			1
@@ -23,7 +23,7 @@ typedef struct {
 #define ITEM_SEPARATOR		3
 
 int dlg_mixedlist(const char *title, const char *cprompt, int height,
-		int min_height, int width, int item_no, dialog_mixedlist *items,
+		int min_height, int width, int item_no, dialog_option_item *items,
 		bool align_center, bool fullscreen);
 
 #endif

Return to bug 224737

Line 0 Link Here

(-)ports-mgmt/dialog4ports/files/patch-dialog4ports.c (+257 lines)
		1	--- dialog4ports.c.orig 2016-07-08 14:49:08 UTC
		2	+++ dialog4ports.c
		3	@@ -43,6 +43,7 @@
		4
		5	static int list_no = 0;
		6	static int group = 0;
		7	+static char const *env_delimiter = " \t";
		8
		9	/* The initial items size */
		10	static int items_sz = 5;
		11	@@ -50,16 +51,22 @@ static int items_sz = 5;
		12	static StringList *enable_items = NULL;
		13	/* New items */
		14	static StringList *new_items = NULL;
		15	+/* One options section */
		16	+typedef struct {
		17	+ char env_name[32];
		18	+ char section_name[256];
		19	+ int type;
		20	+} dialog_section;
		21
		22	/* add item to items */
		23	static void
		24	-add_item(dialog_mixedlist *items, char const name, char const *text,
		25	+add_item(dialog_option_item *items, char const name, char const *text,
		26	bool state, bool new, int type, int grp)
		27	{
		28
		29	if ((list_no + 1 > items_sz) \|\| *items == NULL) {
		30	items_sz *= 2;
		31	- items = realloc(items, items_sz * sizeof(dialog_mixedlist));
		32	+ items = realloc(items, items_sz * sizeof(dialog_option_item));
		33	if (*items == NULL)
		34	err(EXIT_FAILURE, "Need more memory!");
		35	}
		36	@@ -126,81 +133,171 @@ parse_env_sl(char const *env_name)
		37
		38	/* parsing part */
		39	static int
		40	-parsing_env(dialog_mixedlist *items, char const env_name, int type)
		41	+parse_env_all(dialog_option_item *items, char const env_name, int type)
		42	{
		43	- char *env, buf[256];
		44	- char const *delimiter = " \t";
		45	- char token, token2;
		46	+ char *env;
		47	+ char *token;
		48	char temp, tofree;
		49	- char temp2, tofree2;
		50
		51	env = getenv(env_name);
		52	if (env == NULL)
		53	return (0);
		54
		55	- if (strcmp(env_name, "ALL_OPTIONS") == 0) {
		56	- tofree = temp = strdup(env);
		57	+ tofree = temp = strdup(env);
		58	+ while ((token = strsep(&temp, env_delimiter)) != NULL) {
		59	+ if (token[0] == '\0')
		60	+ continue;
		61	+ add_item(items, token, get_desc(token, ""), is_enable(token),
		62	+ is_new(token), type, group);
		63	+ }
		64	+ free(tofree);
65
66	- while ((token = strsep(&temp, delimiter)) != NULL) {
67	- if (token[0] == '\0')
68	- continue;
69	- add_item(items, token, get_desc(token, ""), is_enable(token),
70	- is_new(token), type, group);
71	+ group++;
72	+
73	+ return (0);
74	+}
75	+
76	+static void
77	+order_sections(dialog_section **sections, int sections_size)
78	+{
79	+ char *env;
80	+ char token, temp, *tofree;
81	+ dialog_section ordered_sections, sec;
82	+ int i, found;
83	+
84	+ env = getenv("OPTIONS_SECTION_ORDER");
85	+ if (env == NULL \|\| env[0] == '\0')
86	+ return;
87	+
88	+ if (sections_size == 0)
89	+ errx(EXIT_FAILURE, "OPTIONS_SECTION_ORDER is defined, but there are no option sections");
90	+
91	+ ordered_sections = malloc(sizeof(dialog_section)*sections_size);
92	+ sec = ordered_sections;
93	+ found = 0;
94	+
95	+ tofree = temp = strdup(env);
96	+ while ((token = strsep(&temp, env_delimiter)) != NULL) {
97	+ if (token[0] == '\0')
98	+ continue;
99	+
100	+ for (i = 0; i < sections_size; i++) {
101	+ if (strcmp((*sections)[i].section_name, token) == 0) {
102	+ sec++ = (sections)[i];
103	+ found++;
104	+ break;
105	+ }
106	}
107	- free(tofree);
108	- } else {
109	+ if (i >= sections_size)
110	+ errx(EXIT_FAILURE, "can't find section %s from OPTIONS_SECTION_ORDER in any option group", token);
111	+ }
112	+ free(tofree);
113	+
114	+ if (found != sections_size)
115	+ errx(EXIT_FAILURE, "Items in OPTIONS_SECTION_ORDER should match the declared option sections");
116	+
117	+ free(*sections);
118	+ *sections = ordered_sections;
119	+}
120	+
121	+static void
122	+read_env_section(dialog_section *sections, int sections_size, char const *env_name, int type)
123	+{
124	+ char *env;
125	+ char *token;
126	+ char temp, tofree;
127	+ dialog_section *new_section;
128	+
129	+ env = getenv(env_name);
130	+ if (env == NULL)
131	+ return;
132	+
133	+ tofree = temp = strdup(env);
134	+ while ((token = strsep(&temp, env_delimiter)) != NULL) {
135	+ if (token[0] == '\0')
136	+ continue;
137	+
138	+ if (*sections_size == 0)
139	+ *sections = malloc(sizeof(dialog_section));
140	+ else
141	+ sections = realloc(sections, sizeof(dialog_section) * (*sections_size + 1));
142	+
143	+ new_section = sections + sections_size;
144	+
145	+ strcpy(new_section->env_name, env_name);
146	+ strncpy(new_section->section_name, token, sizeof(new_section->section_name));
147	+ new_section->type = type;
148	+
149	+ ++*sections_size;
150	+ }
151	+ free(tofree);
152	+}
153	+
154	+static int
155	+add_sections(dialog_option_item *items, dialog_section sections, int sections_size)
156	+{
157	+ int i;
158	+ char *env, buf[256];
159	+ char *token;
160	+ char temp, tofree;
161	+ dialog_section *sec = sections;
162	+
163	+ for (i = 0; i < sections_size; i++, sec++) {
164	+ add_item(items, get_desc(sec->section_name, sec->section_name), "", false, false,
165	+ ITEM_SEPARATOR, group);
166	+
167	+ snprintf(buf, sizeof(buf), "%s_%s", sec->env_name, sec->section_name);
168	+ env = getenv(buf);
169	+ if (env == NULL)
170	+ errx(EXIT_FAILURE, "%s does not exists", buf);
171	+
172	tofree = temp = strdup(env);
173	- while ((token = strsep(&temp, delimiter)) != NULL) {
174	+ while ((token = strsep(&temp, env_delimiter)) != NULL) {
175	if (token[0] == '\0')
176	continue;
177	- add_item(items, get_desc(token, token), "", false, false,
178	- ITEM_SEPARATOR, group);
179	-
180	- snprintf(buf, sizeof(buf), "%s_%s", env_name, token);
181	- env = getenv(buf);
182	- if (env == NULL)
183	- errx(EXIT_FAILURE, "%s does not exists", buf);
184	- tofree2 = temp2 = strdup(env);
185	- while ((token2 = strsep(&temp2, delimiter)) != NULL) {
186	- if (token2[0] == '\0')
187	- continue;
188	- add_item(items, token2, get_desc(token2, ""),
189	- is_enable(token2), is_new(token2), type, group);
190	- }
191	- free(tofree2);
192	- group++;
193	+ add_item(items, token, get_desc(token, ""),
194	+ is_enable(token), is_new(token), sec->type, group);
195	}
196	-
197	free(tofree);
198	+ group++;
199	}
200	+
201	if (group == 0)
202	group++;
203
204	return (0);
205	}
206
207	-
208	/* prepare items for next drawing*/
209	-static dialog_mixedlist *
210	+static dialog_option_item *
211	prepare_items(void)
212	{
213	- dialog_mixedlist *items = NULL;
214	+ dialog_option_item *items = NULL;
215	+ dialog_section *sections = NULL;
216	+ int sections_size = 0;
217
218	enable_items = parse_env_sl("PORT_OPTIONS");
219	new_items = parse_env_sl("NEW_OPTIONS");
220
221	- parsing_env(&items, "ALL_OPTIONS", ITEM_CHECK);
222	- parsing_env(&items, "OPTIONS_GROUP", ITEM_CHECK);
223	- parsing_env(&items, "OPTIONS_MULTI", ITEM_CHECK);
224	- parsing_env(&items, "OPTIONS_SINGLE", ITEM_RADIO);
225	- parsing_env(&items, "OPTIONS_RADIO", ITEM_RADIO);
226	+ parse_env_all(&items, "ALL_OPTIONS", ITEM_CHECK);
227	+ read_env_section(&sections, &sections_size, "OPTIONS_GROUP", ITEM_CHECK);
228	+ read_env_section(&sections, &sections_size, "OPTIONS_MULTI", ITEM_CHECK);
229	+ read_env_section(&sections, &sections_size, "OPTIONS_SINGLE", ITEM_RADIO);
230	+ read_env_section(&sections, &sections_size, "OPTIONS_RADIO", ITEM_RADIO);
231	+
232	+ order_sections(&sections, sections_size);
233	+
234	+ add_sections(&items, sections, sections_size);
235	+
236	+ if (sections != NULL)
237	+ free(sections);
238
239	return (items);
240	}
241
242	static int
243	mixedlist_show(const char title, const char cprompt, int height,
244	- int min_height, int width, dialog_mixedlist *items, bool align_center,
245	+ int min_height, int width, dialog_option_item *items, bool align_center,
246	bool fullscreen)
247	{
248	int res;
249	@@ -235,7 +332,7 @@ main(int argc, char *argv[])
250	bool align_center = 0;
251	bool fullscreen = 0;
252	char *helpfile;
253	- dialog_mixedlist *items;
254	+ dialog_option_item *items;
255
256	setlocale(LC_ALL, "");
257	errno = 0;

Line 0 Link Here

(-)ports-mgmt/dialog4ports/files/patch-mixedlist.c (+38 lines)
	1	--- mixedlist.c.orig 2018-02-01 07:53:26 UTC
	2	+++ mixedlist.c
	3	@@ -36,7 +36,7 @@ static int list_width, check_x, item_x;
	4	#define MIN_HIGH (1 + (5 * MARGIN))
	5
	6	static int
	7	-d4p_default_mixlistitem(dialog_mixedlist *items)
	8	+d4p_default_mixlistitem(dialog_option_item *items)
	9	{
	10	int result = 0;
	11
	12	@@ -55,7 +55,7 @@ d4p_default_mixlistitem(dialog_mixedlist
	13	}
	14
	15	static int
	16	-d4p_calc_mixlist_width(int item_no, dialog_mixedlist *items)
	17	+d4p_calc_mixlist_width(int item_no, dialog_option_item *items)
	18	{
	19	int n, i, len1 = 0, len2 = 0;
	20	for (i = 0; i < item_no; ++i) {
	21	@@ -140,7 +140,7 @@ d4p_clean_window(WINDOW *dialog)
	22	*/
	23	static void
	24	print_item(WINDOW *win,
	25	- dialog_mixedlist *items,
	26	+ dialog_option_item *items,
	27	int choice,
	28	bool selected)
	29	{
	30	@@ -250,7 +250,7 @@ dlg_mixedlist(const char *title,
	31	int min_height,
	32	int width,
	33	int item_no,
	34	- dialog_mixedlist *items,
	35	+ dialog_option_item *items,
	36	bool align_center,
	37	bool fullscreen)
	38	{

Line 0 Link Here

(-)ports-mgmt/dialog4ports/files/patch-mixedlist.h (+20 lines)
	1	--- mixedlist.h.orig 2018-02-01 07:50:50 UTC
	2	+++ mixedlist.h
	3	@@ -15,7 +15,7 @@ typedef struct {
	4	int group;
	5	bool state;
	6	bool new;
	7	-} dialog_mixedlist;
	8	+} dialog_option_item;
	9
	10	/* List of items */
	11	#define ITEM_CHECK 1
	12	@@ -23,7 +23,7 @@ typedef struct {
	13	#define ITEM_SEPARATOR 3
	14
	15	int dlg_mixedlist(const char title, const char cprompt, int height,
	16	- int min_height, int width, int item_no, dialog_mixedlist *items,
	17	+ int min_height, int width, int item_no, dialog_option_item *items,
	18	bool align_center, bool fullscreen);
	19
	20	#endif