jinql
/
ngx-fancyindex
mirror of https://github.com/aperezdc/ngx-fancyindex
1
0
Fork 0
Code Issues Releases Wiki Activity

replace ngx_sort with ngx_qsort

pull/114/head
z4yx 2020-03-11 20:45:14 +08:00 committed by Adrian Perez
parent 56934db14c
commit a05006e3c4
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ngx_http_fancyindex_module.c
View File

@ -898,19 +898,41 @@ make_content_buf(
/* Sort entries, if needed */ /* Sort entries, if needed */
if (entries.nelts > 1) { if (entries.nelts > 1) {
/* Use ngx_sort for stability */
ngx_sort(entry, (size_t) entries.nelts,
sizeof(ngx_http_fancyindex_entry_t),
sort_cmp_func);
if (alcf->dirs_first) if (alcf->dirs_first)
{ {
/* Sort directories first */ ngx_http_fancyindex_entry_t *l, *r;
ngx_sort(entry, (size_t) entries.nelts,
sizeof(ngx_http_fancyindex_entry_t),
ngx_http_fancyindex_cmp_entries_dirs_first);
}
l = entry;
r = entry + entries.nelts - 1;
while (l < r)
{
while (l < r && l->dir)
l++;
while (l < r && !r->dir)
r--;
if (l < r) {
/* Now l points a file while r points a directory */
ngx_http_fancyindex_entry_t tmp;
tmp = *l;
*l = *r;
*r = tmp;
}
}
if (r->dir)
r++;
if (r > entry)
/* Sort directories */
ngx_qsort(entry, (size_t)(r - entry),
sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
if (r < entry + entries.nelts)
/* Sort files */
ngx_qsort(r, (size_t)(entry + entries.nelts - r),
sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
} else {
ngx_qsort(entry, (size_t)entries.nelts,
sizeof(ngx_http_fancyindex_entry_t), sort_cmp_func);
}
} }
/* Display the path, if needed */ /* Display the path, if needed */