You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Jim Jagielski <ji...@hyperreal.com> on 1997/01/25 23:38:32 UTC
cvs commit: apache/src/regex regcomp.c
jim 97/01/25 14:38:31
Modified: src CHANGES Configure conf.h Makefile.tmpl
src/regex regcomp.c
Log:
Submitted by: Andreas Koenig <k...@anna.in-berlin.de>
Description: Various NEXT porting and compiling patches, including
changing an already used NEXT define in regcomp.c
Revision Changes Path
1.134 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.133
retrieving revision 1.134
diff -C3 -r1.133 -r1.134
*** CHANGES 1997/01/25 20:28:17 1.133
--- CHANGES 1997/01/25 22:38:20 1.134
***************
*** 1,5 ****
--- 1,9 ----
Changes with Apache 1.2b5
+ *) Various NeXT compilation patches, as well as a change in
+ regex/regcomp.c since that file also used a NEXT define.
+ [Andreas Koenig]
+
*) Allow * to terminate the end of a directory match in mod_dir.
Allows /~* to match for both /~joe and /~joe/. [David Bronder]
1.74 +11 -8 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.73
retrieving revision 1.74
diff -C3 -r1.73 -r1.74
*** Configure 1997/01/22 19:46:40 1.73
--- Configure 1997/01/25 22:38:22 1.74
***************
*** 155,160 ****
--- 155,169 ----
DBM_LIB="-ldbm"
+ #
+ # Look for ranlib. Do it early in case we want to override it below
+ #
+ if ./helpers/PrintPath -s ranlib; then
+ RANLIB="ranlib"
+ else
+ RANLIB="true"
+ fi
+
case "$PLAT" in
*-apple-aux3*)
OS='A/UX 3.1.x'
***************
*** 267,272 ****
--- 276,283 ----
OS='NeXT'
CFLAGS="$CFLAGS -DNEXT"
DEF_WANTHSREGEX=yes
+ RANLIB="sleep 5; /bin/ranlib"
+ # ranlib on most NeXTs sets the time wrong. 5 secs wait does much good
;;
*-dec-osf*)
OS='DEC OSF/1'
***************
*** 508,521 ****
else
LIBS="$LIBS -L/usr/local/lib -lsocks"
fi
- fi
- #
- # Look for ranlib
- #
- if ./helpers/PrintPath -s ranlib; then
- RANLIB="ranlib"
- else
- RANLIB="true"
fi
#
--- 519,524 ----
1.73 +1 -2 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C3 -r1.72 -r1.73
*** conf.h 1997/01/24 20:55:08 1.72
--- conf.h 1997/01/25 22:38:23 1.73
***************
*** 164,170 ****
#define tolower(c) (isupper(c) ? tolower(c) : c)
#elif defined(NEXT)
- #include <libc.h>
typedef unsigned short mode_t;
#define HAVE_GMTOFF
#undef NO_KILLPG
--- 164,169 ----
***************
*** 524,530 ****
#include <grp.h>
#include <fcntl.h>
#include <limits.h>
! #if !defined(QNX) && !defined(CONVEXOS11)
#include <memory.h>
#endif
#ifdef NEED_PROCESS_H
--- 523,529 ----
#include <grp.h>
#include <fcntl.h>
#include <limits.h>
! #if !defined(QNX) && !defined(CONVEXOS11) && !defined(NEXT)
#include <memory.h>
#endif
#ifdef NEED_PROCESS_H
1.39 +2 -2 apache/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C3 -r1.38 -r1.39
*** Makefile.tmpl 1997/01/24 10:19:39 1.38
--- Makefile.tmpl 1997/01/25 22:38:24 1.39
***************
*** 29,39 ****
$(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
! (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB))
modules/proxy/libproxy.a:
(cd modules; \
! $(MAKE) CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB))
clean:
rm -f httpd $(OBJS)
--- 29,39 ----
$(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
! (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB="$(RANLIB)")
modules/proxy/libproxy.a:
(cd modules; \
! $(MAKE) CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB="$(RANLIB)")
clean:
rm -f httpd $(OBJS)
1.2 +8 -8 apache/src/regex/regcomp.c
Index: regcomp.c
===================================================================
RCS file: /export/home/cvs/apache/src/regex/regcomp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** regcomp.c 1996/07/23 22:06:45 1.1
--- regcomp.c 1997/01/25 22:38:29 1.2
***************
*** 44,52 ****
#define MORE2() (p->next+1 < p->end)
#define SEE(c) (MORE() && PEEK() == (c))
#define SEETWO(a, b) (MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
! #define EAT(c) ((SEE(c)) ? (NEXT(), 1) : 0)
#define EATTWO(a, b) ((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
! #define NEXT() (p->next++)
#define NEXT2() (p->next += 2)
#define NEXTn(n) (p->next += (n))
#define GETNEXT() (*p->next++)
--- 44,52 ----
#define MORE2() (p->next+1 < p->end)
#define SEE(c) (MORE() && PEEK() == (c))
#define SEETWO(a, b) (MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
! #define EAT(c) ((SEE(c)) ? (NEXT1(), 1) : 0)
#define EATTWO(a, b) ((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
! #define NEXT1() (p->next++)
#define NEXT2() (p->next += 2)
#define NEXTn(n) (p->next += (n))
#define GETNEXT() (*p->next++)
***************
*** 324,330 ****
if (!( c == '*' || c == '+' || c == '?' ||
(c == '{' && MORE2() && isdigit(PEEK2())) ))
return; /* no repetition, we're done */
! NEXT();
REQUIRE(!wascaret, REG_BADRPT);
switch (c) {
--- 324,330 ----
if (!( c == '*' || c == '+' || c == '?' ||
(c == '{' && MORE2() && isdigit(PEEK2())) ))
return; /* no repetition, we're done */
! NEXT1();
REQUIRE(!wascaret, REG_BADRPT);
switch (c) {
***************
*** 361,367 ****
repeat(p, pos, count, count2);
if (!EAT('}')) { /* error heuristics */
while (MORE() && PEEK() != '}')
! NEXT();
REQUIRE(MORE(), REG_EBRACE);
SETERROR(REG_BADBR);
}
--- 361,367 ----
repeat(p, pos, count, count2);
if (!EAT('}')) { /* error heuristics */
while (MORE() && PEEK() != '}')
! NEXT1();
REQUIRE(MORE(), REG_EBRACE);
SETERROR(REG_BADBR);
}
***************
*** 539,545 ****
repeat(p, pos, count, count2);
if (!EATTWO('\\', '}')) { /* error heuristics */
while (MORE() && !SEETWO('\\', '}'))
! NEXT();
REQUIRE(MORE(), REG_EBRACE);
SETERROR(REG_BADBR);
}
--- 539,545 ----
repeat(p, pos, count, count2);
if (!EATTWO('\\', '}')) { /* error heuristics */
while (MORE() && !SEETWO('\\', '}'))
! NEXT1();
REQUIRE(MORE(), REG_EBRACE);
SETERROR(REG_BADBR);
}
***************
*** 698,704 ****
start = p_b_symbol(p);
if (SEE('-') && MORE2() && PEEK2() != ']') {
/* range */
! NEXT();
if (EAT('-'))
finish = '-';
else
--- 698,704 ----
start = p_b_symbol(p);
if (SEE('-') && MORE2() && PEEK2() != ']') {
/* range */
! NEXT1();
if (EAT('-'))
finish = '-';
else
***************
*** 729,735 ****
register char c;
while (MORE() && isalpha(PEEK()))
! NEXT();
len = p->next - sp;
for (cp = cclasses; cp->name != NULL; cp++)
if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
--- 729,735 ----
register char c;
while (MORE() && isalpha(PEEK()))
! NEXT1();
len = p->next - sp;
for (cp = cclasses; cp->name != NULL; cp++)
if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
***************
*** 799,805 ****
register char c;
while (MORE() && !SEETWO(endc, ']'))
! NEXT();
if (!MORE()) {
SETERROR(REG_EBRACK);
return(0);
--- 799,805 ----
register char c;
while (MORE() && !SEETWO(endc, ']'))
! NEXT1();
if (!MORE()) {
SETERROR(REG_EBRACK);
return(0);