AC_ARG_ENABLE([$1], [$2])
if test "[$enable_][$1]" = yes; then
for var in [$4]; do
- if test "${!var}" != yes; then
+ if test "$(eval "echo \$$var")" != yes; then
AC_MSG_ERROR([*** cannot enable $1 without $var])
fi
done
ifelse([$3], yes, [dnl
[enable_][$1]=yes
for var in [$4]; do
- if test "${!var}" != yes; then
+ if test "$(eval "echo \$$var")" != yes; then
[enable_][$1]=no
break
fi
-AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [1.4])
+AC_INIT([doldaconnect], [1.4])
+AC_CONFIG_SRCDIR(daemon/main.c)
+AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
+AC_USE_SYSTEM_EXTENSIONS
DOLDA_AC_GROUP([Checking build chain])
state = 3;
else if(*args != ' ')
state = 1;
+ else
+ args++;
break;
case 1:
if((*args == ' ') || (*args == 0))
int minsize, maxsize;
int dotth;
size_t buflen;
- int termnum, satisfied, skipcheck;
+ int termnum, satisfied, matches, skipcheck, proper;
int level, tersat[32];
wchar_t *terms[32], *lname;
char hashtth[24];
termnum = 0;
p2 = p;
done = 0;
+ proper = 0;
while(!done)
{
if((*p2 == 0) || (*p2 == '$'))
} else {
if((terms[termnum] = icmbstowcs(p, hub->charset)) != NULL) {
wcslower(terms[termnum]);
+ if(wcslen(terms[termnum]) > 1)
+ proper = 1;
termnum++;
}
}
}
p2++;
}
+ if(!proper)
+ goto out;
node = shareroot->child;
level = 0;
for(i = 0; i < termnum; i++)
tersat[i] = -1;
satisfied = 0;
+ matches = 0;
while(1)
{
skipcheck = 0;
qstrf(dsk, "%s%s\005%ji%s%s%s", prefix, buf, (intmax_t)node->size, infix, hub->nativename, postfix);
}
free(buf);
+ if(++matches >= 20)
+ break;
}
}
if((!skipcheck && (satisfied == termnum)) || (node->child == NULL))
if(peer->direction == TRNSD_DOWN)
requestfile(peer);
} else {
- if(peer->wcsname == NULL)
+ if((peer->wcsname == NULL) || (peer->transfer != NULL))
{
peer->close = 1;
return;