From owner-freebsd-ports Mon Aug 17 18:20:08 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id SAA06714 for freebsd-ports-outgoing; Mon, 17 Aug 1998 18:20:08 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id SAA06644 for ; Mon, 17 Aug 1998 18:20:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id SAA18970; Mon, 17 Aug 1998 18:20:01 -0700 (PDT) Received: from catastrophe.gelemna.ft-wayne.in.us (fw-line-56.fwi.com [209.84.172.61]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id SAA05641 for ; Mon, 17 Aug 1998 18:13:17 -0700 (PDT) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: from emerson.gelemna.ft-wayne.in.us (emerson.gelemna.ft-wayne.in.us [10.23.42.2]) by catastrophe.gelemna.ft-wayne.in.us (8.8.8/8.8.8) with ESMTP id UAA04525 for ; Mon, 17 Aug 1998 20:11:43 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: (from croyle@localhost) by emerson.gelemna.ft-wayne.in.us (8.9.1/8.9.1) id UAA18979; Mon, 17 Aug 1998 20:11:42 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) Message-Id: <199808180111.UAA18979@emerson.gelemna.ft-wayne.in.us> Date: Mon, 17 Aug 1998 20:11:42 -0500 (EST) From: Don Croyle Reply-To: croyle@gelemna.ft-wayne.in.us To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/7653: net/ftpsearch doesn't build under -current (with fix) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 7653 >Category: ports >Synopsis: net/ftpsearch doesn't build under -current (with fix) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 17 18:20:00 PDT 1998 >Last-Modified: >Originator: Don Croyle >Organization: >Release: FreeBSD 3.0-CURRENT i386 >Environment: A current -current. >Description: Clash between errno as a structure member and the errno macro in errno.h. The build dies here: cc -O2 -m486 -DHAVE_SIG_ATOMIC_T=1 -DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_STRING_H=1 -DHAVE_LIBREADLINE=1 -DTIME_WITH_SYS_TIME=1 -DNO_MS160SE=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MLOCK=1 -DHAVE_INET_ATON=1 -DHAVE_SETENV=1 -DHAVE_UNSETENV=1 -DHAVE_SETPRIORITY=1 -DHAVE_RFORK=1 -DHAVE_RADIXSORT=1 -DHAVE_MEMMOVE=1 -DHAVE_SOCKADDR_SA_LEN=1 -DFD_SETSIZE=1024 -DFTPSEARCHROOT=\"/usr/local/ftpsearch\" -c search.c In file included from search.c:107: ../regexp/splitexp.h:37: field `__error' declared as a function In file included from search.c:107: ../regexp/splitexp.h:117: field `__error' declared as a function search.c: In function `ListHosts': search.c:2269: parse error before `(' search.c:2271: `buf' undeclared (first use this function) search.c:2271: (Each undeclared identifier is reported only once search.c:2271: for each function it appears in.) search.c:2271: parse error before `(' search.c: At top level: search.c:2292: parse error before `else' search.c:2299: warning: parameter names (without types) in function declaration search.c:2299: conflicting types for `Finish' search.c:1953: previous declaration of `Finish' search.c:2299: warning: data definition has no type or storage class search.c:2300: parse error before `return' *** Error code 1 Stop. >How-To-Repeat: Build net/ftpsearch on a system build with recent current sources. >Fix: Rename the problem structure members from errno to errorno throughout. While I was in the neighborhood, I also added a new distribution patch to the list in the makefile and removed the manpages from the PLIST. Apply this patch. It adds a patches directory that contains the files patch-aa, patch-ab, patch-ac, patch-ad, patch-ae, patch-af, patch-ag, patch-ah, patch-ai, patch-aj, patch-ak, patch-al and patch-am. diff -ruN ftpsearch.old/Makefile ftpsearch/Makefile --- ftpsearch.old/Makefile Wed Oct 29 21:42:19 1997 +++ ftpsearch/Makefile Mon Aug 17 19:40:52 1998 @@ -20,7 +20,8 @@ ftpsearch-1.0.patch3 \ ftpsearch-1.0.patch4 \ ftpsearch-1.0.patch5 \ - ftpsearch-1.0.patch6 + ftpsearch-1.0.patch6 \ + ftpsearch-1.0.patch7 GNU_CONFIGURE= yes CONFIGURE_ENV+= FTPSEARCHROOT=${PREFIX}/ftpsearch diff -ruN ftpsearch.old/files/md5 ftpsearch/files/md5 --- ftpsearch.old/files/md5 Wed Oct 29 21:42:21 1997 +++ ftpsearch/files/md5 Mon Aug 17 19:41:12 1998 @@ -5,3 +5,4 @@ MD5 (ftpsearch-1.0.patch4) = 69a7fc28a9947da42b71d71bbac74336 MD5 (ftpsearch-1.0.patch5) = dd63d1cab58451abdad7cdf1d871731a MD5 (ftpsearch-1.0.patch6) = 4eb3617097dc569217fdbb72975b2106 +MD5 (ftpsearch-1.0.patch7) = a9269d3c52f1f0334f216cae68a8a1c7 diff -ruN ftpsearch.old/patches/patch-aa ftpsearch/patches/patch-aa --- ftpsearch.old/patches/patch-aa Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-aa Sun Aug 16 17:52:35 1998 @@ -0,0 +1,29 @@ +--- server/regexp/find_regexp.c~ Tue Feb 18 17:14:15 1997 ++++ server/regexp/find_regexp.c Sun Aug 16 17:11:41 1998 +@@ -86,7 +86,7 @@ + { + struct RegAtom *subAtom; + +- if (!Atom || Atom->errno || Atom->lbound2==0) ++ if (!Atom || Atom->errorno || Atom->lbound2==0) + return; + if (!Atom->isleaf) { + if (Atom->meta == '&' || Atom->u.Internal.vnumchildren==1) +@@ -207,7 +207,7 @@ + int submax_prob_hits; + int i,j; + +- if (!Atom || Atom->errno || Atom->lbound2==0) ++ if (!Atom || Atom->errorno || Atom->lbound2==0) + return; + + if (!Atom->isleaf) { +@@ -223,7 +223,7 @@ + for (i=0,subAtom=Atom->u.Internal.FirstChild; + iu.Internal.vnumchildren; + i++,subAtom=subAtom->Next) { +- while (subAtom->errno) ++ while (subAtom->errorno) + subAtom=subAtom->Next; + subBest[i]=NULL; + findand_sub(exp,subAtom,&subBest[i],0); diff -ruN ftpsearch.old/patches/patch-ab ftpsearch/patches/patch-ab --- ftpsearch.old/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ab Sun Aug 16 17:53:05 1998 @@ -0,0 +1,173 @@ +--- server/regexp/lens_regexp.c~ Tue Feb 18 17:14:16 1997 ++++ server/regexp/lens_regexp.c Sun Aug 16 17:13:42 1998 +@@ -46,7 +46,7 @@ + + Atom->min_onleft = premin; + Atom->max_onleft = premax; +- Atom->errno = 0; ++ Atom->errorno = 0; + + if (Atom->isleaf) { + +@@ -63,7 +63,7 @@ + for (p=Atom->u.Internal.FirstChild;p;p=p->Next) { + Calculate_left_lens(exp,p,premin+summinlen,premax+summaxlen); + +- if (!p->errno) { ++ if (!p->errorno) { + summaxlen += p->maxlen; + if (summaxlen>MAX_REG_LEN) + summaxlen=MAX_REG_LEN; +@@ -82,7 +82,7 @@ + for (p=Atom->u.Internal.FirstChild;p;p=p->Next) { + Calculate_left_lens(exp,p,premin,premax); + +- if (!p->errno) { ++ if (!p->errorno) { + if (summinlen>p->minlen) summinlen=p->minlen; + if (summaxlenmaxlen) summaxlen=p->maxlen; + } +@@ -109,7 +109,7 @@ + int minlen,maxlen,summinlen,summaxlen,newmax,newmin; + struct RegAtom *p; + +- if (Atom->errno) ++ if (Atom->errorno) + return; + + if (postmin>MAX_REG_LEN) +@@ -124,14 +124,14 @@ + newmin = exp->min_filenamelen - Atom->max_onleft - Atom->max_onright; + + if (newmax < Atom->minlen) { +- Atom->errno = ETOOLONG; ++ Atom->errorno = ETOOLONG; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } + return; + } + if (newmin > Atom->maxlen) { +- Atom->errno = ETOOSHORT; ++ Atom->errorno = ETOOSHORT; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -171,7 +171,7 @@ + else + Calculate_right_lens(exp,p,postmin+summinlen,postmax+summaxlen+ + (Atom->ubound-1)*Atom->u.Internal.summaxlen); +- if (!p->errno) { ++ if (!p->errorno) { + summaxlen += p->maxlen; + if (summaxlen>MAX_REG_LEN) + summaxlen = MAX_REG_LEN; +@@ -189,8 +189,8 @@ + summinlen = MAX_REG_LEN; + } + +- if (p->errno && p->lbound2) { +- Atom->errno = EBADEXP; ++ if (p->errorno && p->lbound2) { ++ Atom->errorno = EBADEXP; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -205,14 +205,14 @@ + for (p=Atom->u.Internal.LastChild;p;p=p->Prev) { + Calculate_right_lens(exp,p,postmin,postmax); + +- if (!p->errno) { ++ if (!p->errorno) { + if (summinlen>p->minlen) summinlen=p->minlen; + if (summaxlenmaxlen) summaxlen=p->maxlen; + } + } + + if (!Atom->u.Internal.vnumchildren) { +- Atom->errno = EBADEXP; ++ Atom->errorno = EBADEXP; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -244,7 +244,7 @@ + Atom->ubound2 = Atom->ubound; + + if (Atom->ubound2lbound2) { +- Atom->errno = ETOOLONG; ++ Atom->errorno = ETOOLONG; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -294,7 +294,7 @@ + int minlen,maxlen,summinlen,summaxlen,newmax,newmin; + struct RegAtom *p; + +- if (Atom->errno) ++ if (Atom->errorno) + return; + + if (premin>MAX_REG_LEN) +@@ -311,14 +311,14 @@ + newmin = exp->min_filenamelen - Atom->max_onleft - Atom->max_onright; + + if (newmaxminlen) { +- Atom->errno = ETOOLONG; ++ Atom->errorno = ETOOLONG; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } + return; + } + if (newmin > Atom->maxlen) { +- Atom->errno = ETOOSHORT; ++ Atom->errorno = ETOOSHORT; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -351,7 +351,7 @@ + for (p=Atom->u.Internal.FirstChild;p;p=p->Next) { + Calculate_left_lens2(exp,p,premin+summinlen,premax+summaxlen); + +- if (!p->errno) { ++ if (!p->errorno) { + summaxlen += p->maxlen; + if (summaxlen>MAX_REG_LEN) + summaxlen = MAX_REG_LEN; +@@ -369,8 +369,8 @@ + summinlen = MAX_REG_LEN; + } + +- if (p->errno && p->lbound2) { +- Atom->errno = EBADEXP; ++ if (p->errorno && p->lbound2) { ++ Atom->errorno = EBADEXP; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -384,14 +384,14 @@ + for (p=Atom->u.Internal.FirstChild;p;p=p->Next) { + Calculate_left_lens2(exp,p,premin,premax); + +- if (!p->errno) { ++ if (!p->errorno) { + if (summinlen>p->minlen) summinlen=p->minlen; + if (summaxlenmaxlen) summaxlen=p->maxlen; + } + } + + if (!Atom->u.Internal.vnumchildren) { +- Atom->errno = EBADEXP; ++ Atom->errorno = EBADEXP; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } +@@ -423,7 +423,7 @@ + Atom->ubound2 = Atom->ubound; + + if (Atom->ubound2lbound2) { +- Atom->errno = ETOOLONG; ++ Atom->errorno = ETOOLONG; + if (Atom->Parent) { + Atom->Parent->u.Internal.vnumchildren--; + } diff -ruN ftpsearch.old/patches/patch-ac ftpsearch/patches/patch-ac --- ftpsearch.old/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ac Sun Aug 16 17:53:31 1998 @@ -0,0 +1,147 @@ +--- server/regexp/optimize_regexp.c~ Tue Feb 18 17:14:16 1997 ++++ server/regexp/optimize_regexp.c Sun Aug 16 17:14:44 1998 +@@ -69,12 +69,12 @@ + if (Prev->lbound2==0 && addleft) { + if (Atom->min_onleft != Prev->min_onleft) { + subPrev = Prev; +- while (subPrev && subPrev->Prev && subPrev->Prev->errno) ++ while (subPrev && subPrev->Prev && subPrev->Prev->errorno) + subPrev = subPrev->Prev; + while (subPrev && (!subPrev->Prev || + (subPrev->Parent && subPrev->Parent->meta == '|'))) { + subPrev= subPrev->Parent; +- while (subPrev && subPrev->Prev && subPrev->Prev->errno) ++ while (subPrev && subPrev->Prev && subPrev->Prev->errorno) + subPrev = subPrev->Prev; + } + if (subPrev) +@@ -120,12 +120,12 @@ + } else { + if (Prev->minlen == 0 ) { + subPrev = Prev; +- while (subPrev && subPrev->Prev && subPrev->Prev->errno) ++ while (subPrev && subPrev->Prev && subPrev->Prev->errorno) + subPrev = subPrev->Prev; + while (subPrev && (!subPrev->Prev || + (subPrev->Parent && subPrev->Parent->meta == '|'))) { + subPrev= subPrev->Parent; +- while (subPrev && subPrev->Prev && subPrev->Prev->errno) ++ while (subPrev && subPrev->Prev && subPrev->Prev->errorno) + subPrev = subPrev->Prev; + } + if (subPrev) +@@ -160,12 +160,12 @@ + #endif + if (Prev->meta == '&') { + subPrev = Prev->u.Internal.LastChild; +- while (subPrev->errno) ++ while (subPrev->errorno) + subPrev = subPrev->Prev; + stringify_add_onleft(exp,Atom,subPrev,distance+delta,1); + } else if (Prev->meta == '|') + for (subPrev=Prev->u.Internal.LastChild;subPrev;subPrev=subPrev->Prev) { +- if (!subPrev->errno) ++ if (!subPrev->errorno) + stringify_add_onleft(exp,Atom,subPrev,distance+delta,naddleft); + } + if (delta) +@@ -214,12 +214,12 @@ + if (Next->lbound2==0 && addright) { + if (Atom->min_onright != Next->min_onright) { + subNext = Next; +- while (subNext&& subNext->Next && subNext->Next->errno) ++ while (subNext&& subNext->Next && subNext->Next->errorno) + subNext = subNext->Next; + while (subNext && (!subNext->Next || + (subNext->Parent && subNext->Parent->meta == '|'))) { + subNext= subNext->Parent; +- while (subNext && subNext->Next && subNext->Next->errno) ++ while (subNext && subNext->Next && subNext->Next->errorno) + subNext = subNext->Next; + } + if (subNext) +@@ -277,12 +277,12 @@ + } else { + if (Next->minlen == 0 ) { + subNext = Next; +- while (subNext&& subNext->Next && subNext->Next->errno) ++ while (subNext&& subNext->Next && subNext->Next->errorno) + subNext = subNext->Next; + while (subNext && (!subNext->Next || + (subNext->Parent && subNext->Parent->meta == '|'))) { + subNext= subNext->Parent; +- while (subNext && subNext->Next && subNext->Next->errno) ++ while (subNext && subNext->Next && subNext->Next->errorno) + subNext = subNext->Next; + } + if (subNext) +@@ -316,12 +316,12 @@ + #endif + if (Next->meta == '&') { + subNext = Next->u.Internal.FirstChild; +- while (subNext->errno) ++ while (subNext->errorno) + subNext=subNext->Next; + stringify_add_onright(exp,Atom,subNext,distance+delta,1); + } else if (Next->meta == '|') + for (subNext=Next->u.Internal.FirstChild;subNext;subNext=subNext->Next) +- if (!subNext->errno) ++ if (!subNext->errorno) + stringify_add_onright(exp,Atom,subNext,distance+delta,naddright); + if (delta) + delta += deltastep; +@@ -345,7 +345,7 @@ + + if (!Atom->isleaf) { + for (subAtom=Atom->u.Internal.FirstChild;subAtom;subAtom=subAtom->Next) +- if (!subAtom->errno) ++ if (!subAtom->errorno) + stringify_atoms_onleft(exp,subAtom); + return; + } +@@ -353,11 +353,11 @@ + /* Find previous atom, by walking the regexp parse tree */ + + Prev = Atom; +- while (Prev && Prev->Prev && Prev->Prev->errno) ++ while (Prev && Prev->Prev && Prev->Prev->errorno) + Prev = Prev->Prev; + while (Prev && (!Prev->Prev || (Prev->Parent && Prev->Parent->meta=='|'))) { + Prev=Prev->Parent; +- while (Prev && Prev->Prev && Prev->Prev->errno) ++ while (Prev && Prev->Prev && Prev->Prev->errorno) + Prev = Prev->Prev; + } + if (Prev) +@@ -479,7 +479,7 @@ + + if (!Atom->isleaf) { + for (subAtom=Atom->u.Internal.LastChild;subAtom;subAtom=subAtom->Prev) +- if (!subAtom->errno) ++ if (!subAtom->errorno) + stringify_atoms_onright(exp,subAtom); + return; + } +@@ -487,11 +487,11 @@ + /* Find next atom, by walking the regexp parse tree */ + + Next = Atom; +- while (Next && Next->Next && Next->Next->errno) ++ while (Next && Next->Next && Next->Next->errorno) + Next = Next->Next; + while (Next && (!Next->Next || (Next->Parent && Next->Parent->meta=='|'))) { + Next=Next->Parent; +- while (Next && Next->Next && Next->Next->errno) ++ while (Next && Next->Next && Next->Next->errorno) + Next = Next->Next; + } + if (Next) +@@ -612,7 +612,7 @@ + void optimize_regexp(struct MyRegexp *exp) + { + +- if (exp->errno || exp->CurAtom->errno) ++ if (exp->errorno || exp->CurAtom->errorno) + return; + + stringify_atoms_onleft(exp,exp->CurAtom); diff -ruN ftpsearch.old/patches/patch-ad ftpsearch/patches/patch-ad --- ftpsearch.old/patches/patch-ad Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ad Sun Aug 16 17:54:03 1998 @@ -0,0 +1,142 @@ +--- server/regexp/parse_regexp.c~ Sun Aug 16 15:04:40 1998 ++++ server/regexp/parse_regexp.c Sun Aug 16 17:15:53 1998 +@@ -106,7 +106,7 @@ + Atom->ubound = 1; + Atom->lbound2 = 1; + Atom->ubound2 = 1; +- Atom->errno = 0; ++ Atom->errorno = 0; + Atom->singlesided = 0; + + Atom->prob_hits = 999999999.0; +@@ -233,7 +233,7 @@ + + } else { + /* Failure. Don't try to handle ALL cases */ +- exp->errno = EATOMEMPTY; ++ exp->errorno = EATOMEMPTY; + return -1; + } + return 0; +@@ -487,7 +487,7 @@ + Atom->u.Leaf.right1 = 0; + Atom->u.Leaf.right2 = 0; + +- Atom->errno = 0; ++ Atom->errorno = 0; + Atom->singlesided = 0; + + Atom->prob_hits = 999999999.0; +@@ -694,10 +694,10 @@ + mixedcasesubstring=0; + + if (calcmaxlen(Atom)>100000) { +- exp->errno = ETOOCOMPLEX; ++ exp->errorno = ETOOCOMPLEX; + } + +- if (!exp->errno) { ++ if (!exp->errorno) { + + if (myregexp_debug) + show_atoms(exp,exp->CurAtom,0); +@@ -712,9 +712,9 @@ + remove_left_end(exp,exp->CurAtom); + remove_right_end(exp,exp->CurAtom); + if (!exp->CurAtom) +- exp->errno = ETOOSHORT; ++ exp->errorno = ETOOSHORT; + +- if (exp->changed && !exp->errno) { ++ if (exp->changed && !exp->errorno) { + + if (myregexp_debug) + show_atoms(exp,exp->CurAtom,0); +@@ -728,9 +728,9 @@ + remove_left_end(exp,exp->CurAtom); + remove_right_end(exp,exp->CurAtom); + if (!exp->CurAtom) +- exp->errno = ETOOSHORT; ++ exp->errorno = ETOOSHORT; + +- if (exp->changed && !exp->errno) { ++ if (exp->changed && !exp->errorno) { + if (myregexp_debug) + printf("WARNING: Needed 2 passes on regexp simplification\n"); + +@@ -758,7 +758,7 @@ + if (Atom && (Atom->lbound!=1 || Atom->ubound!=Atom->lbound)) + exp->complex = 1; + +- if (Atom && !exp->complex && !exp->errno) { ++ if (Atom && !exp->complex && !exp->errorno) { + substring=1; + casesubstring=1; + mixedcasesubstring=1; +@@ -778,7 +778,7 @@ + } + } else { + if (myregexp_debug) +- printf("exp->errno is %d\n",exp->errno); ++ printf("exp->errorno is %d\n",exp->errorno); + } + exp->substring=substring; + exp->casesubstring=casesubstring; +@@ -856,7 +856,7 @@ + + exp->CurAtom = AllocAtom(exp, '&', 0, 0); + +- for (p=cexp;*p && !exp->errno;p++) { ++ for (p=cexp;*p && !exp->errorno;p++) { + handled=0; + lower=255; + upper=0; +@@ -1033,10 +1033,10 @@ + while (isdigit(*p)) + ubound=ubound*10 + *p++ - '0'; + } else { +- exp->errno = EBADEXP; ++ exp->errorno = EBADEXP; + } + } else { +- exp->errno = EBADEXP; ++ exp->errorno = EBADEXP; + } + splitoutatom='&'; + break; +@@ -1057,7 +1057,7 @@ + break; + } + if (lbound<0 || lbound>255 || ubound255) +- exp->errno = EBADEXP; ++ exp->errorno = EBADEXP; + handled=1; + ismeta=1; + savebounds=1; +@@ -1067,7 +1067,7 @@ + } + break; + case 0: +- exp-> errno = EBADEXP; ++ exp-> errorno = EBADEXP; + break; + case '^': + if (p==cexp) { +@@ -1120,7 +1120,7 @@ + exp->Uppers[exp->bufpos]=upper; + exp->bufpos++; + if (exp->bufpos+1>=sizeof(exp->Lowers)) { +- exp->errno=ETOOLONG; ++ exp->errorno=ETOOLONG; + return 0; + } + } +@@ -1156,7 +1156,7 @@ + printf("\n"); + + if (exp->CurAtom->Parent) { +- exp->errno = EBADEXP; ++ exp->errorno = EBADEXP; + } + + return parse_regexp_postprocess(exp); diff -ruN ftpsearch.old/patches/patch-ae ftpsearch/patches/patch-ae --- ftpsearch.old/patches/patch-ae Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ae Sun Aug 16 17:54:33 1998 @@ -0,0 +1,38 @@ +--- server/regexp/prob_regexp.c~ Sun Aug 16 15:04:34 1998 ++++ server/regexp/prob_regexp.c Sun Aug 16 17:16:25 1998 +@@ -61,7 +61,7 @@ + int singlesided; + int needcenter; + +- if (Atom->errno || Atom->lbound2==0) ++ if (Atom->errorno || Atom->lbound2==0) + return; + if (!Atom->u.Leaf.len1) + return; +@@ -382,7 +382,7 @@ + min_pmul = min_pmul0 = 0; + phits = phits0 = 0.0; + +- if (Atom->errno) ++ if (Atom->errorno) + return; + + if (Atom->isleaf) { +@@ -469,7 +469,7 @@ + phits = CharCounts1[FOLDSIZE] - CharCounts1[0]; + min_pmul = CharCounts1[FOLDSIZE] - CharCounts1[0]; + for (subAtom=Atom->u.Internal.FirstChild;subAtom;subAtom=subAtom->Next) { +- if (!subAtom->errno && subAtom->lbound >= 1) ++ if (!subAtom->errorno && subAtom->lbound >= 1) + { + if (exp->suffixbased && subAtom->isleaf && + !subAtom->u.Leaf.len0) +@@ -509,7 +509,7 @@ + phits = CharCounts1[FOLDSIZE] - CharCounts1[0]; + min_pmul = CharCounts1[FOLDSIZE] - CharCounts1[0]; + for (subAtom=Atom->u.Internal.FirstChild;subAtom;subAtom=subAtom->Next) { +- if (!subAtom->errno && subAtom->lbound >=1 ) ++ if (!subAtom->errorno && subAtom->lbound >=1 ) + { + if (exp->suffixbased && subAtom->isleaf && + !subAtom->u.Leaf.len0) { diff -ruN ftpsearch.old/patches/patch-af ftpsearch/patches/patch-af --- ftpsearch.old/patches/patch-af Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-af Sun Aug 16 17:54:56 1998 @@ -0,0 +1,24 @@ +--- server/regexp/show_regexp.c~ Tue Feb 18 17:14:16 1997 ++++ server/regexp/show_regexp.c Sun Aug 16 17:17:13 1998 +@@ -141,8 +141,8 @@ + Atom->u.Leaf.len1, + Atom->u.Leaf.len); + #endif +- if (Atom->errno) +- printf(" [%s]",myregexp_errors[Atom->errno]); ++ if (Atom->errorno) ++ printf(" [%s]",myregexp_errors[Atom->errorno]); + printf("\n"); + } else { + printf(" %8f..%8d %d..%d %d..%d %d..%d %d (%d..%d)", +@@ -152,8 +152,8 @@ + Atom->min_onright,Atom->max_onright, + Atom->u.Internal.numchildren, + Atom->u.Internal.summinlen,Atom->u.Internal.summaxlen); +- if (Atom->errno) +- printf(" [%s]",myregexp_errors[Atom->errno]); ++ if (Atom->errorno) ++ printf(" [%s]",myregexp_errors[Atom->errorno]); + printf("\n"); + if (!Atom->u.Internal.numchildren || !Atom->u.Internal.FirstChild || + !Atom->u.Internal.LastChild ) { diff -ruN ftpsearch.old/patches/patch-ag ftpsearch/patches/patch-ag --- ftpsearch.old/patches/patch-ag Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ag Sun Aug 16 17:55:26 1998 @@ -0,0 +1,51 @@ +--- server/regexp/splitexp.c~ Sun Aug 16 15:04:41 1998 ++++ server/regexp/splitexp.c Sun Aug 16 17:18:14 1998 +@@ -105,9 +105,9 @@ + if (res) + return res; + +- if (exp->errno) { +- printf("exp->errno=%d\n",exp->errno); +- return exp->errno; ++ if (exp->errorno) { ++ printf("exp->errorno=%d\n",exp->errorno); ++ return exp->errorno; + } + #if 1 + Calculate_lens(exp); +@@ -122,14 +122,14 @@ + if (myregexp_verbose) + show_atoms(exp,exp->CurAtom,0); + #endif +- if (exp->errno) { +- printf("after calculate_lens: exp->errno=%d\n",exp->errno); +- return exp->errno; ++ if (exp->errorno) { ++ printf("after calculate_lens: exp->errorno=%d\n",exp->errorno); ++ return exp->errorno; + } + optimize_regexp(exp); +- if (exp->errno) { +- printf("after optimize: exp->errno=%d\n",exp->errno); +- return exp->errno; ++ if (exp->errorno) { ++ printf("after optimize: exp->errorno=%d\n",exp->errorno); ++ return exp->errorno; + } + if (myregexp_verbose) + show_atoms(exp,exp->CurAtom,0); +@@ -195,12 +195,12 @@ + exit(1); + + #if 1 +- if (!exp1->errno) { ++ if (!exp1->errorno) { + findand(exp1); + findor(exp1); + } + #endif +- if (!exp1->errno) ++ if (!exp1->errorno) + printf("Substring=%d, CaseSubString=%d, MixCaseSubString=%d, Complex=%d\n", + exp1->substring,exp1->casesubstring,exp1->mixedcasesubstring, + exp1->complex); diff -ruN ftpsearch.old/patches/patch-ah ftpsearch/patches/patch-ah --- ftpsearch.old/patches/patch-ah Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ah Sun Aug 16 17:55:37 1998 @@ -0,0 +1,20 @@ +--- server/regexp/splitexp.h~ Tue Feb 18 17:14:16 1997 ++++ server/regexp/splitexp.h Sun Aug 16 17:08:43 1998 +@@ -34,7 +34,7 @@ + struct RegAtom { + char meta; /* 0, or '&' or '|' */ + char isleaf; /* Leaf node ? */ +- unsigned char errno; /* nonzero --> invalid node */ ++ unsigned char errorno; /* nonzero --> invalid node */ + char singlesided; /* Cannot use extensions at both sides */ + double prob_hits; /* Estimated number of hits */ + unsigned int max_prob_hits;/* Maximum number of hits */ +@@ -114,7 +114,7 @@ + int allocated; + unsigned int firstbufpos; + struct RegAtom *CurAtom; +- int errno; ++ int errorno; + int suffixbased; /* nonzero if based upon suffix tables */ + int min_filenamelen; /* Only useful if anchored at both ends */ + int max_filenamelen; diff -ruN ftpsearch.old/patches/patch-ai ftpsearch/patches/patch-ai --- ftpsearch.old/patches/patch-ai Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ai Sun Aug 16 17:56:42 1998 @@ -0,0 +1,50 @@ +--- server/server/match_regexp.c~ Sun Aug 16 15:04:41 1998 ++++ server/server/match_regexp.c Sun Aug 16 17:21:06 1998 +@@ -514,9 +514,9 @@ + exp->min_filenamelen = 0; + } + Calculate_lens(exp); +- if (exp->CurAtom->errno) { ++ if (exp->CurAtom->errorno) { + if (myregexp_verbose) +- printf("ERROR exp->CurAtom->errno=%d\n",exp->CurAtom->errno); ++ printf("ERROR exp->CurAtom->errorno=%d\n",exp->CurAtom->errorno); + return -1; + } + +@@ -953,9 +953,9 @@ + return; + } + +- if (exp->errno) { ++ if (exp->errorno) { + char buf[100]; +- sprintf(buf,"regexp parsing error: %s\n",regexp_errstr(exp->errno)); ++ sprintf(buf,"regexp parsing error: %s\n",regexp_errstr(exp->errorno)); + AppendError(ReqP,buf); + free(tmpbuf2); + Finish(ReqP); +@@ -998,9 +998,9 @@ + return; + } + +- if (exp->errno || exp->CurAtom->errno) { ++ if (exp->errorno || exp->CurAtom->errorno) { + char buf[100]; +- sprintf(buf,"after calculate_lens: exp->errno=%d, exp->CurAtom->errno=%d\n",exp->errno,exp->CurAtom->errno); ++ sprintf(buf,"after calculate_lens: exp->errorno=%d, exp->CurAtom->errorno=%d\n",exp->errorno,exp->CurAtom->errorno); + AppendError(ReqP,buf); + Finish(ReqP); + return; +@@ -1008,9 +1008,9 @@ + exp->min_filenamelen++; + Calculate_lens(exp); + +- if (exp->errno || exp->CurAtom->errno) { ++ if (exp->errorno || exp->CurAtom->errorno) { + char buf[100]; +- sprintf(buf,"after calculate_lens: exp->errno=%d, exp->CurAtom->errno=%d\n",exp->errno,exp->CurAtom->errno); ++ sprintf(buf,"after calculate_lens: exp->errorno=%d, exp->CurAtom->errorno=%d\n",exp->errorno,exp->CurAtom->errorno); + AppendError(ReqP,buf); + Finish(ReqP); + return; diff -ruN ftpsearch.old/patches/patch-aj ftpsearch/patches/patch-aj --- ftpsearch.old/patches/patch-aj Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-aj Sun Aug 16 17:57:01 1998 @@ -0,0 +1,14 @@ +--- server/server/search.c~ Sun Aug 16 15:04:46 1998 ++++ server/server/search.c Sun Aug 16 17:22:08 1998 +@@ -2266,9 +2266,9 @@ + return; + } + +- if (exp->errno) { ++ if (exp->errorno) { + char buf[100]; +- sprintf(buf,"regexp parsing error: %s\n",regexp_errstr(exp->errno)); ++ sprintf(buf,"regexp parsing error: %s\n",regexp_errstr(exp->errorno)); + Freeexp(exp); + free(exp); + free(tmpbuf2); diff -ruN ftpsearch.old/patches/patch-ak ftpsearch/patches/patch-ak --- ftpsearch.old/patches/patch-ak Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-ak Sun Aug 16 18:17:26 1998 @@ -0,0 +1,17 @@ +--- server/gateway/httpdstuff.c~ Sun Aug 16 18:01:29 1998 ++++ server/gateway/httpdstuff.c Sun Aug 16 18:14:29 1998 +@@ -3218,11 +3218,11 @@ + + void DoneIdent(struct identres *res,struct http_connection *conn) + { +- if (!res->errno && res->result) ++ if (!res->errorno && res->result) + conn->identresult = strdup(res->result); + +- if (res->errno && res->errno!=ECONNREFUSED) { +- conn->ident_error = strdup(strerror(res->errno)); ++ if (res->errorno && res->errorno!=ECONNREFUSED) { ++ conn->ident_error = strdup(strerror(res->errorno)); + } + Ident_Free(res); + conn->ident = NULL; diff -ruN ftpsearch.old/patches/patch-al ftpsearch/patches/patch-al --- ftpsearch.old/patches/patch-al Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-al Sun Aug 16 18:17:52 1998 @@ -0,0 +1,130 @@ +--- server/gateway/ident.c~ Tue Feb 18 17:14:15 1997 ++++ server/gateway/ident.c Sun Aug 16 18:15:54 1998 +@@ -161,7 +161,7 @@ + return; + } + if (rgot <0) { +- conn->errno = errno; ++ conn->errorno = errno; + Ident_Done(conn); + return; + } +@@ -183,7 +183,7 @@ + while (*p && isspace((unsigned char) *p)) p++; + + if (strncasecmp("userid",p,6)) { +- conn->errno = EINVAL; ++ conn->errorno = EINVAL; + Ident_Done(conn); + return; + } +@@ -260,7 +260,7 @@ + + res->state = IDENT_NEW; + res->done = 0; +- res->errno = 0; ++ res->errorno = 0; + + res->readbuf = NULL; + res->readbuflen = 0; +@@ -279,7 +279,7 @@ + + Ident_Conn1(res); + +- if (res->errno) ++ if (res->errorno) + Ident_LinkInTimeout(res,&mintimeout,"Fail at once timeout"); + + return res; +@@ -289,12 +289,12 @@ + { + (void) now; + +- if (conn->errno) { ++ if (conn->errorno) { + Ident_Done(conn); + return; + } + +- conn->errno = ETIMEDOUT; ++ conn->errorno = ETIMEDOUT; + Ident_Done(conn); + return; + } +@@ -407,31 +407,31 @@ + } + conn->fdeof = 0; + if (conn->fd<0) { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + + flags = fcntl(conn->fd,F_GETFL,NULL); + if (flags == -1) { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + + flags |= O_NONBLOCK; + if (fcntl(conn->fd,F_SETFL,flags)<0) { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + + if (fcntl(conn->fd,F_SETFD,1)<0) { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + + on=1; + if (setsockopt(conn->fd,SOL_SOCKET,SO_KEEPALIVE,(char *) &on,sizeof(on))<0) + { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + +@@ -439,7 +439,7 @@ + lingertime.l_linger = 0; + if (setsockopt(conn->fd,SOL_SOCKET,SO_LINGER,(char *) &lingertime, + sizeof(lingertime))<0) { +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + +@@ -457,7 +457,7 @@ + AdjustMaxSock(conn->fd); + return; + } +- conn->errno = errno; ++ conn->errorno = errno; + return; + } + FD_SET(conn->fd,&readfds); +@@ -484,18 +484,18 @@ + if (errno == EINVAL) { + soerrorlen = sizeof(soerror); + if (getsockopt(conn->fd,SOL_SOCKET,SO_ERROR,(void *) &soerror,&soerrorlen)) { +- conn->errno = errno; ++ conn->errorno = errno; + Ident_Done(conn); + return; + } + if (soerrorlen == sizeof(soerror)) + errno = soerror; + } +- conn->errno = errno; ++ conn->errorno = errno; + Ident_Done(conn); + return; + } +- conn->errno = EINVAL; ++ conn->errorno = EINVAL; + Ident_Done(conn); + return; + } diff -ruN ftpsearch.old/patches/patch-am ftpsearch/patches/patch-am --- ftpsearch.old/patches/patch-am Wed Dec 31 19:00:00 1969 +++ ftpsearch/patches/patch-am Sun Aug 16 18:18:03 1998 @@ -0,0 +1,11 @@ +--- server/gateway/ident.h~ Tue Feb 18 17:14:15 1997 ++++ server/gateway/ident.h Sun Aug 16 18:06:27 1998 +@@ -38,7 +38,7 @@ + + void *closure; + void (*callback)(struct identres *self,void *closure); +- int errno; ++ int errorno; + int fd; + int fdeof; + char *name; diff -ruN ftpsearch.old/pkg/PLIST ftpsearch/pkg/PLIST --- ftpsearch.old/pkg/PLIST Wed Oct 29 21:42:28 1997 +++ ftpsearch/pkg/PLIST Sun Aug 16 12:38:45 1998 @@ -52,41 +52,6 @@ ftpsearch/gpl/namelen2.gpl ftpsearch/gpl/namelen3.gpl ftpsearch/gpl/namelen4.gpl -ftpsearch/man/man1/ftpsearch.1.gz -ftpsearch/man/man5/cnames.5.gz -ftpsearch/man/man5/ftpcli_config.5.gz -ftpsearch/man/man5/sites.5.gz -ftpsearch/man/man5/sites.alias.5.gz -ftpsearch/man/man5/sites.skip.5.gz -ftpsearch/man/man7/datasets.7.gz -ftpsearch/man/man8/astat.8.gz -ftpsearch/man/man8/autoupdateconfig.pl.8.gz -ftpsearch/man/man8/cardusage.8.gz -ftpsearch/man/man8/checkenv.pl.8.gz -ftpsearch/man/man8/chknavig.8.gz -ftpsearch/man/man8/chksites.pl.8.gz -ftpsearch/man/man8/domainhelp.8.gz -ftpsearch/man/man8/freq.8.gz -ftpsearch/man/man8/ftpcli.8.gz -ftpsearch/man/man8/ftpsearchshell.8.gz -ftpsearch/man/man8/gateway.8.gz -ftpsearch/man/man8/genaliases.8.gz -ftpsearch/man/man8/gendataset.8.gz -ftpsearch/man/man8/genit.pl.8.gz -ftpsearch/man/man8/genmotd.pl.8.gz -ftpsearch/man/man8/genspecter.8.gz -ftpsearch/man/man8/genspecter2.8.gz -ftpsearch/man/man8/listsite.8.gz -ftpsearch/man/man8/load.8.gz -ftpsearch/man/man8/makesuffix.8.gz -ftpsearch/man/man8/mergesites.8.gz -ftpsearch/man/man8/nsslave.8.gz -ftpsearch/man/man8/parsesite.8.gz -ftpsearch/man/man8/removeoldparsed.pl.8.gz -ftpsearch/man/man8/search.8.gz -ftpsearch/man/man8/sgateway.8.gz -ftpsearch/man/man8/siteadmin.pl.8.gz -ftpsearch/man/man8/sortsuffix.8.gz ftpsearch/plots/Makefile ftpsearch/plots/astatlastweek ftpsearch/plots/dinfo.gpl >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message