version 1.119, 2016/03/18 13:22:27 |
version 1.120, 2016/04/13 15:38:45 |
|
|
pg_searchres(const struct req *req, struct manpage *r, size_t sz) |
pg_searchres(const struct req *req, struct manpage *r, size_t sz) |
{ |
{ |
char *arch, *archend; |
char *arch, *archend; |
size_t i, iuse, isec; |
const char *sec; |
|
size_t i, iuse; |
int archprio, archpriouse; |
int archprio, archpriouse; |
int prio, priouse; |
int prio, priouse; |
char sec; |
|
|
|
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
if (validate_filename(r[i].file)) |
if (validate_filename(r[i].file)) |
Line 616 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 616 pg_searchres(const struct req *req, struct manpage *r, |
|
if (req->q.equal) { |
if (req->q.equal) { |
puts("<HR>"); |
puts("<HR>"); |
iuse = 0; |
iuse = 0; |
priouse = 10; |
priouse = 20; |
archpriouse = 3; |
archpriouse = 3; |
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
isec = strcspn(r[i].file, "123456789"); |
sec = r[i].file; |
sec = r[i].file[isec]; |
sec += strcspn(sec, "123456789"); |
if ('\0' == sec) |
if (sec[0] == '\0') |
continue; |
continue; |
prio = sec_prios[sec - '1']; |
prio = sec_prios[sec[0] - '1']; |
if (NULL == req->q.arch) { |
if (sec[1] != '/') |
|
prio += 10; |
|
if (req->q.arch == NULL) { |
archprio = |
archprio = |
(NULL == (arch = strchr( |
((arch = strchr(sec + 1, '/')) |
r[i].file + isec, '/'))) ? 3 : |
== NULL) ? 3 : |
(NULL == (archend = strchr( |
((archend = strchr(arch + 1, '/')) |
arch + 1, '/'))) ? 0 : |
== NULL) ? 0 : |
strncmp(arch, "amd64/", |
strncmp(arch, "amd64/", |
archend - arch) ? 2 : 1; |
archend - arch) ? 2 : 1; |
if (archprio < archpriouse) { |
if (archprio < archpriouse) { |