Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed regex initialization

Browse Source
This commit is contained in:
alm 1993-06-16 07:41:14 +00:00
parent 5f39183d4b
commit bd8e434d6d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/sed/compile.c
View File

@ -408,7 +408,7 @@ compile_re(p, repp)
/* initialize pattern buffer */ /* initialize pattern buffer */
(*repp)->buffer = NULL; (*repp)->buffer = NULL;
(*repp)->allocated = 0L; (*repp)->allocated = 0L;
(*repp)->fastmap = (char *) malloc(FASTMAP_SIZE); (*repp)->fastmap = 0; /* fastmap not used by regex > 0.12 */
(*repp)->translate = 0; (*repp)->translate = 0;
#endif #endif
if (p && (eval = regcomp(*repp, re, 0)) != 0) if (p && (eval = regcomp(*repp, re, 0)) != 0)

2
usr.bin/sed/compile.c.test
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
SED=./sed SED=sed
PRINTF=printf PRINTF=printf
# tests that a delimiter okay in ccl, i.e., s/[/]// deletes a / # tests that a delimiter okay in ccl, i.e., s/[/]// deletes a /

10
usr.bin/sed/defs.h
View File

@ -1,7 +1,7 @@
/*- /*-
* Copyright (c) 1992 Diomidis Spinellis. * Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993 * Copyright (c) 1992 The Regents of the University of California.
* The Regents of the University of California. All rights reserved. * All rights reserved.
* *
* This code is derived from software contributed to Berkeley by * This code is derived from software contributed to Berkeley by
* Diomidis Spinellis of Imperial College, University of London. * Diomidis Spinellis of Imperial College, University of London.
@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)defs.h 8.1 (Berkeley) 6/6/93 * @(#)defs.h 5.3 (Berkeley) 8/28/92
*/ */
/* /*
@ -74,7 +74,7 @@ struct s_subst {
/* /*
* An internally compiled command. * An internally compiled command.
* Initialy, label references are stored in t, on a second pass they * Initialy, label references are stored in u.t, on a second pass they
* are updated to pointers. * are updated to pointers.
*/ */
struct s_command { struct s_command {
@ -115,11 +115,11 @@ enum e_args {
struct s_appends { struct s_appends {
enum {AP_STRING, AP_FILE} type; enum {AP_STRING, AP_FILE} type;
char *s; char *s;
size_t len;
}; };
enum e_spflag { enum e_spflag {
APPEND, /* Append to the contents. */ APPEND, /* Append to the contents. */
APPENDNL, /* Append, with newline. */
REPLACE, /* Replace the contents. */ REPLACE, /* Replace the contents. */
}; };