bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pacman: improve select-question

Browse source 
Make use of parseindex like in multiselect, and loop until we get a
valid answer like in multiselect.

Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
This commit is contained in:
Xavier Chantry 2010-10-17 17:18:36 +02:00
parent 00fec5e250
commit 2dd53e50de
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/pacman/callback.c
View file

@ -311,7 +311,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
depstring); depstring);
free(depstring); free(depstring);
select_display(providers); select_display(providers);
printf("\n");
*response = select_question(count); *response = select_question(count);
} }
break; break;

15
src/pacman/util.c
View file

@ -815,27 +815,28 @@ int select_question(int count)
stream = stderr; stream = stderr;
} }
while(1) {
fprintf(stream, "\n");
fprintf(stream, _("Enter a number (default=%d)"), preset); fprintf(stream, _("Enter a number (default=%d)"), preset);
fprintf(stream, ": "); fprintf(stream, ": ");
if(config->noconfirm) { if(config->noconfirm) {
fprintf(stream, "\n"); fprintf(stream, "\n");
return(preset-1); break;
} }
if(fgets(response, sizeof(response), stdin)) { if(fgets(response, sizeof(response), stdin)) {
strtrim(response); strtrim(response);
if(strlen(response) > 0) { if(strlen(response) > 0) {
char *endptr = NULL; int n;
int n = strtol(response, &endptr, 10); if(parseindex(response, &n, 1, count) != 0)
if(*endptr == '\0' && n >= 1 && n <= count) { continue;
return(n-1); return(n-1);
} else {
fprintf(stream, _("Invalid number: %s\n"), response);
return(-1);
} }
} }
break;
} }
return(preset-1); return(preset-1);
} }