[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     7fe7d5d8618b1adfcd5f95b529dfcb4843f5b363
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Sep 10 06:19:00 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Sep 10 06:19:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=7fe7d5d8

Added reading of the new incoming alternative description line and its addition to the flag descriptions.

---
 ufed-curses-checklist.c | 23 ++++++++++++++---------
 ufed-curses-help.c      |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 5d7179e..978e2f5 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -91,7 +91,7 @@ static void read_flags(void)
 	size_t fullWidth = 0;
 	struct {
 		int start, end;
-	} name, desc, pkg, state;
+	} name, desc, desc_alt, pkg, state;
 
 	if(input == NULL)
 		ERROR_EXIT(-1, "fdopen failed with error %d\n", errno);
@@ -126,15 +126,17 @@ static void read_flags(void)
 
 		/* read description(s) and determine flag status */
 		for (int i = 0; i < ndescr; ++i) {
-			desc.start  = desc.end  = -1;
-			pkg.start   = pkg.end   = -1;
-			state.start = state.end = -1;
+			desc.start     = desc.end     = -1;
+			desc_alt.start = desc_alt.end = -1;
+			pkg.start      = pkg.end      = -1;
+			state.start    = state.end    = -1;
 
 			line = getline(input);
 			if (!line) break;
 
-			if ( (sscanf(line, "\t%n%*[^\t]%n\t (%n%*[^)]%n) [%n%*[ +-]%n%c",
+			if ( (sscanf(line, "\t%n%*[^\t]%n\t%n%*[^\t]%n\t (%n%*[^)]%n) [%n%*[ +-]%n%c",
 					&desc.start,  &desc.end,
+					&desc_alt.start,  &desc_alt.end,
 					&pkg.start,   &pkg.end,
 					&state.start, &state.end,
 					&endChar) != 1)
@@ -146,13 +148,16 @@ static void read_flags(void)
 				ERROR_EXIT(-1, "Illegal description stats on line %d:\n\"%s\"\n", lineNum + 1, line);
 
 			// Add description line to flag:
-			line[desc.end]  = '\0';
-			line[state.end] = '\0';
+			line[desc.end]     = '\0';
+			line[desc_alt.end] = '\0';
+			line[state.end]    = '\0';
 			if ( (pkg.end - pkg.start) > 1) {
 				line[pkg.end]   = '\0';
-				fullWidth = addFlagDesc(newFlag, &line[pkg.start], &line[desc.start], &line[state.start]);
+				fullWidth = addFlagDesc(newFlag, &line[pkg.start], &line[desc.start],
+										&line[desc_alt.start], &line[state.start]);
 			} else
-				fullWidth = addFlagDesc(newFlag, NULL, &line[desc.start], &line[state.start]);
+				fullWidth = addFlagDesc(newFlag, NULL, &line[desc.start],
+										&line[desc_alt.start], &line[state.start]);
 
 			// Note new max length if this line is longest:
 			if (fullWidth > maxDescWidth)

diff --git a/ufed-curses-help.c b/ufed-curses-help.c
index 7dfbf93..8fce938 100644
--- a/ufed-curses-help.c
+++ b/ufed-curses-help.c
@@ -258,9 +258,9 @@ static void init_lines(void)
 		if (n) {
 			memcpy(buf, word, n);
 			buf[n++] = '\0';
-			addFlagDesc(line, NULL, buf, "+      ");
+			addFlagDesc(line, NULL, buf, NULL, "+      ");
 		} else
-			addFlagDesc(line, NULL, " ", "+      ");
+			addFlagDesc(line, NULL, " ", NULL, "+      ");
 
 		// Advance behind current spaces
 		while (word[n] == ' ')