Merge pull request #2402 from dscho/add-i-in-c-status-and-help-gfw

dscho · dscho · commit ababd06741f0 · 2019-11-16T01:33:26.000+01:00
built-in add -i/-p: update to latest iteration
diff --git a/add-interactive.c b/add-interactive.c
@@ -351,7 +351,8 @@ static ssize_t list_and_choose(struct add_i_state *s,
 				}
 			}
 
-			p[sep] = '\0';
+			if (p[sep])
+				p[sep++] = '\0';
 			if (from < 0) {
 				from = find_unique(p, items);
 				if (from >= 0)
@@ -377,7 +378,7 @@ static ssize_t list_and_choose(struct add_i_state *s,
 					res += choose ? +1 : -1;
 				}
 
-			p += sep + 1;
+			p += sep;
 		}
 
 		if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,8 @@ static ssize_t list_and_choose(struct add_i_state *s,`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`354`		`- p[sep] = '\0';`
	`354`	`+ if (p[sep])`
	`355`	`+ p[sep++] = '\0';`
`355`	`356`	`if (from < 0) {`
`356`	`357`	`from = find_unique(p, items);`
`357`	`358`	`if (from >= 0)`
`@@ -377,7 +378,7 @@ static ssize_t list_and_choose(struct add_i_state *s,`
`377`	`378`	`res += choose ? +1 : -1;`
`378`	`379`	`}`
`379`	`380`
`380`		`- p += sep + 1;`
	`381`	`+ p += sep;`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`if ((immediate && res != LIST_AND_CHOOSE_ERROR) \|\|`