diff options
Diffstat (limited to 'contrib/cvs/lib')
| -rw-r--r-- | contrib/cvs/lib/ChangeLog | 22 | ||||
| -rw-r--r-- | contrib/cvs/lib/Makefile.in | 1 | ||||
| -rw-r--r-- | contrib/cvs/lib/getline.h | 3 | ||||
| -rw-r--r-- | contrib/cvs/lib/regex.c | 35 | ||||
| -rw-r--r-- | contrib/cvs/lib/system.h | 7 |
5 files changed, 53 insertions, 15 deletions
diff --git a/contrib/cvs/lib/ChangeLog b/contrib/cvs/lib/ChangeLog index 3d858ab..623c292 100644 --- a/contrib/cvs/lib/ChangeLog +++ b/contrib/cvs/lib/ChangeLog @@ -1,3 +1,25 @@ +1998-02-20 Jim Kingdon <kingdon@harvey.cyclic.com> + + * regex.c: Partial merge with version from emacs 20.2. Brings + over some trivial changes (whitespace and so on) (most such + changes I didn't bother with, for this time). Don't cast to int + before comparing old_regend[r] to regstart[r] (this is the point + of bothering; the old code was broken for 64 bit machines. + Reported by Paul Vixie). + +Tue Feb 17 18:33:26 1998 Ian Lance Taylor <ian@cygnus.com> + + * memmove.c: New file, resurrecting the old one. + * Makefile.in (SOURCES): Add memmove.c. + +1998-02-03 Tim Pierce <twp@skepsis.com> + + * system.h (CVS_LSTAT): New macro. + +Sat Feb 7 17:33:39 1998 Ian Lance Taylor <ian@cygnus.com> + + * getline.h (getstr): Declare. + 13 Jan 1998 Jim Kingdon * fncase.c: Include config.h before system.h. diff --git a/contrib/cvs/lib/Makefile.in b/contrib/cvs/lib/Makefile.in index 9c32d9f..92122c7 100644 --- a/contrib/cvs/lib/Makefile.in +++ b/contrib/cvs/lib/Makefile.in @@ -35,6 +35,7 @@ SOURCES = \ getopt1.c \ hostname.c \ md5.c \ + memmove.c \ mkdir.c \ regex.c \ rename.c \ diff --git a/contrib/cvs/lib/getline.h b/contrib/cvs/lib/getline.h index 30bcc25..d061b7c 100644 --- a/contrib/cvs/lib/getline.h +++ b/contrib/cvs/lib/getline.h @@ -11,5 +11,8 @@ int getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +int + getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + char _terminator, int _offset)); #endif /* _getline_h_ */ diff --git a/contrib/cvs/lib/regex.c b/contrib/cvs/lib/regex.c index ddeca2a..38b31f4 100644 --- a/contrib/cvs/lib/regex.c +++ b/contrib/cvs/lib/regex.c @@ -1,6 +1,5 @@ -/* Extended regular expression matching and search library, - version 0.12. - (Implements POSIX draft P10003.2/D11.2, except for +/* Extended regular expression matching and search library, version + 0.12. (Implements POSIX draft P10003.2/D11.2, except for internationalization features.) Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. @@ -39,10 +38,16 @@ #include "lisp.h" #include "buffer.h" + +/* Make syntax table lookup grant data in gl_state. */ +#define SYNTAX_ENTRY_VIA_PROPERTY + #include "syntax.h" +#include "charset.h" +#include "category.h" -/* Emacs uses `NULL' as a predicate. */ -#undef NULL +#define malloc xmalloc +#define free xfree #else /* not emacs */ @@ -160,7 +165,7 @@ init_syntax_once () /* We remove any previous definition of `SIGN_EXTEND_CHAR', since ours (we hope) works properly with all combinations of machines, compilers, `char' and `unsigned char' argument types. - (Per Bothner suggested the basic approach.) */ + (Per Bothner suggested the basic approach.) */ #undef SIGN_EXTEND_CHAR #if __STDC__ #define SIGN_EXTEND_CHAR(c) ((signed char) (c)) @@ -3807,15 +3812,15 @@ re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop) EVER_MATCHED_SOMETHING (reg_info[*p]) = 0; /* Restore this and inner groups' (if any) registers. */ - for (r = *p; r < *p + *(p + 1); r++) - { - regstart[r] = old_regstart[r]; - - /* xx why this test? */ - if ((int) old_regend[r] >= (int) regstart[r]) - regend[r] = old_regend[r]; - } - } + for (r = *p; r < *p + *(p + 1); r++) + { + regstart[r] = old_regstart[r]; + + /* xx why this test? */ + if (old_regend[r] >= regstart[r]) + regend[r] = old_regend[r]; + } + } p1++; EXTRACT_NUMBER_AND_INCR (mcnt, p1); PUSH_FAILURE_POINT (p1 + mcnt, d, -2); diff --git a/contrib/cvs/lib/system.h b/contrib/cvs/lib/system.h index 7648b76..8beedf0 100644 --- a/contrib/cvs/lib/system.h +++ b/contrib/cvs/lib/system.h @@ -453,6 +453,13 @@ extern int errno; #define CVS_STAT stat #endif +/* Open question: should CVS_STAT be lstat by default? We need + to use lstat in order to handle symbolic links correctly with + the PreservePermissions option. -twp */ +#ifndef CVS_LSTAT +#define CVS_LSTAT lstat +#endif + #ifndef CVS_UNLINK #define CVS_UNLINK unlink #endif |
