/* This file is part of the Zebra server.
- Copyright (C) 1994-2011 Index Data
+ Copyright (C) Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include "dict-p.h"
-static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
+static void scan_direction(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
int start, int *count, void *client,
int (*userfunc)(char *, const char *, int, void *),
int dir)
else
lo = 0;
}
- indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi && lo >= 0 && *count > 0)
{
}
if (*count>0 && subptr)
{
- scan_direction(dict, subptr, pos+1, str, -1, count,
+ scan_direction(dict, subptr, pos+1, str, -1, count,
client, userfunc, dir);
dict_bf_readp(dict->dbf, ptr, &p);
- indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
if (*count>0 && dir<0 && info[sizeof(Dict_ptr)+sizeof(Dict_char)])
{
}
}
-void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
+void dict_scan_r(Dict dict, Dict_ptr ptr, int pos, Dict_char *str,
int *before, int *after, void *client,
int (*userfunc)(char *, const char *, int, void *))
{
{
if ((*userfunc)((char *) str, info+
(dict_strlen((Dict_char*) info)+1)
- *sizeof(Dict_char),
+ *sizeof(Dict_char),
*after, client))
{
*after = 0;
}
}
if (*after && subptr)
- scan_direction(dict, subptr, pos+1, str, -1,
+ scan_direction(dict, subptr, pos+1, str, -1,
after, client, userfunc, 1);
}
- else if (subptr)
+ else
{
- dict_scan_r(dict, subptr, pos+1, str, before, after,
- client, userfunc);
+ if (subptr)
+ dict_scan_r(dict, subptr, pos+1, str, before, after,
+ client, userfunc);
+ if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
+ {
+ if (*before)
+ {
+ str[pos+1] = DICT_EOS;
+ if ((*userfunc)((char*) str,
+ info+sizeof(Dict_ptr)+
+ sizeof(Dict_char),
+ - *before, client))
+ {
+ *before = 0;
+ }
+ else
+ --(*before);
+ }
+ }
}
break;
}
scan_direction(dict, ptr, pos, str, cmp ? mid : mid+1, after,
client, userfunc, 1);
if (*before && mid > 0)
- scan_direction(dict, ptr, pos, str, mid-1, before,
+ scan_direction(dict, ptr, pos, str, mid-1, before,
client, userfunc, -1);
}