Bruce/ask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux doesn't have mergesort, so just use qsort by (length, alphabetic)

Browse Source
This commit is contained in:
Bruce Hill 2019-06-12 17:18:39 -07:00
parent 2b7b4cd8d7
commit b9440f4b8a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ask.c
View File

@ -297,9 +297,12 @@ static char *get_input(FILE *in, FILE *out, const char *prompt, const char *init
return picked; return picked;
} }
static int cmp_len(const void *a, const void *b) static int cmp_len(const void *v1, const void *v2)
{ {
return (int)(strlen(*(char**)a) - strlen(*(char**)b)); char *s1 = *(char**)v1, *s2 = *(char**)v2;
size_t len1 = strlen(s1), len2 = strlen(s2);
if (len1 != len2) return (int)(len1 - len2);
return strcmp(s1, s2);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -404,8 +407,8 @@ int main(int argc, char *argv[])
if (tcsetattr(fileno(tty_out), TCSAFLUSH, &bb_termios) == -1) if (tcsetattr(fileno(tty_out), TCSAFLUSH, &bb_termios) == -1)
return 1; return 1;
// Prefer shorter matches, but otherwise keep original order (mergesort is stable) // Prefer shorter matches, but otherwise use alphabetic order
mergesort(opts, (size_t)nopts, sizeof(char*), cmp_len); qsort(opts, (size_t)nopts, sizeof(char*), cmp_len);
char *output = get_input(tty_in, tty_out, prompt, query, nopts, opts); char *output = get_input(tty_in, tty_out, prompt, query, nopts, opts);
fflush(tty_out); fflush(tty_out);