@matheusbsbs / matheus-bagliano / commits / 7a4acc3607

clean: do not use strbuf_split*() [part 1]

builtin/clean.c:parse_choice() is fed a single line of input, which is space or comma separated list of tokens, and a list of menu items. It parses the tokens into number ranges (e.g. 1-3 that means the first three items) or string prefix (e.g. 's' to choose the menu item "(s)elect") that specify the elements in the menu item list, and tells the caller which ones are chosen. For parsing the input string, it uses strbuf_split() to split it into bunch of strbufs. Instead use string_list_split_in_place(), for a few reasons. * strbuf_split() is a bad API function to use, that yields an array of strbuf that is a bad data structure to use in general. * string_list_split_in_place() allows you to split with "comma or space"; the current code has to preprocess the input string to replace comma with space because strbuf_split() does not allow this. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 31, 2025 at 15:54 UTC 7a4acc360782c9eb0e53f51a5cf3147fa88f973e

1 file changed +23 -27

builtin/clean.c

+23 -27

@@ -480,40 +480,36 @@ static int parse_choice(struct menu_stuff *menu_stuff,

480 struct strbuf *input,

481 int **chosen)

482 {

483 - struct strbuf **choice_list, **ptr;

483 + struct string_list choice = STRING_LIST_INIT_NODUP;

484 + struct string_list_item *item;

485 int nr = 0;

486 int i;

487

487 - if (is_single) {

488 - choice_list = strbuf_split_max(input, '\n', 0);

489 - } else {

490 - char *p = input->buf;

491 - do {

492 - if (*p == ',')

493 - *p = ' ';

494 - } while (*p++);

495 - choice_list = strbuf_split_max(input, ' ', 0);

496 - }

488 + string_list_split_in_place_f(&choice, input->buf,

489 + is_single ? "\n" : ", ", -1,

490 + STRING_LIST_SPLIT_TRIM);

491

498 - for (ptr = choice_list; *ptr; ptr++) {

499 - char *p;

500 - int choose = 1;

492 + for_each_string_list_item(item, &choice) {

493 + const char *string;

494 + int choose;

495 int bottom = 0, top = 0;

496 int is_range, is_number;

497

504 - strbuf_trim(*ptr);

505 - if (!(*ptr)->len)

498 + string = item->string;

499 + if (!*string)

500 continue;

501

502 /* Input that begins with '-'; unchoose */

509 - if (*(*ptr)->buf == '-') {

503 + if (string[0] == '-') {

504 choose = 0;

511 - strbuf_remove((*ptr), 0, 1);

505 + string++;

506 + } else {

507 + choose = 1;

508 }

509

510 is_range = 0;

511 is_number = 1;

516 - for (p = (*ptr)->buf; *p; p++) {

512 + for (const char *p = string; *p; p++) {

513 if ('-' == *p) {

514 if (!is_range) {

515 is_range = 1;

@@ -531,27 +527,27 @@ static int parse_choice(struct menu_stuff *menu_stuff,

527 }

528

529 if (is_number) {

534 - bottom = atoi((*ptr)->buf);

530 + bottom = atoi(string);

531 top = bottom;

532 } else if (is_range) {

537 - bottom = atoi((*ptr)->buf);

533 + bottom = atoi(string);

534 /* a range can be specified like 5-7 or 5- */

539 - if (!*(strchr((*ptr)->buf, '-') + 1))

535 + if (!*(strchr(string, '-') + 1))

536 top = menu_stuff->nr;

537 else

542 - top = atoi(strchr((*ptr)->buf, '-') + 1);

543 - } else if (!strcmp((*ptr)->buf, "*")) {

538 + top = atoi(strchr(string, '-') + 1);

539 + } else if (!strcmp(string, "*")) {

540 bottom = 1;

541 top = menu_stuff->nr;

542 } else {

547 - bottom = find_unique((*ptr)->buf, menu_stuff);

543 + bottom = find_unique(string, menu_stuff);

544 top = bottom;

545 }

546

547 if (top <= 0 || bottom <= 0 || top > menu_stuff->nr || bottom > top ||

548 (is_single && bottom != top)) {

549 clean_print_color(CLEAN_COLOR_ERROR);

554 - printf(_("Huh (%s)?\n"), (*ptr)->buf);

550 + printf(_("Huh (%s)?\n"), string);

551 clean_print_color(CLEAN_COLOR_RESET);

552 continue;

553 }

@@ -560,7 +556,7 @@ static int parse_choice(struct menu_stuff *menu_stuff,

556 (*chosen)[i-1] = choose;

557 }

558

563 - strbuf_list_free(choice_list);

559 + string_list_clear(&choice, 0);

560

561 for (i = 0; i < menu_stuff->nr; i++)

562 nr += (*chosen)[i];