BSD 4_4 release

[unix-history] / usr / src / usr.bin / sed / defs.h

diff --git a/usr/src/usr.bin/sed/defs.h b/usr/src/usr.bin/sed/defs.h
index b65c641..3cc580f 100644 (file)
--- a/usr/src/usr.bin/sed/defs.h
+++ b/usr/src/usr.bin/sed/defs.h
@@ -1,14 +1,40 @@
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Diomidis Spinellis of Imperial College, University of London.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Diomidis Spinellis of Imperial College, University of London.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)defs.h      5.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)defs.h      8.1 (Berkeley) 6/6/93

  */
 
 /*
  */
 
 /*


@@ -35,19 +61,20 @@ struct s_addr {
  * Substitution command
  */
 struct s_subst {
  * Substitution command
  */
 struct s_subst {

-       int n;                                  /* Occurrence to subst 0=g */
+       int n;                                  /* Occurrence to subst. */

        int p;                                  /* True if p flag */
        char *wfile;                            /* NULL if no wfile */
        int wfd;                                /* Cached file descriptor */
        int p;                                  /* True if p flag */
        char *wfile;                            /* NULL if no wfile */
        int wfd;                                /* Cached file descriptor */

-       regex_t re;                             /* Regular expression */
-       regmatch_t *pmatch;                     /* Array of match strucs */
+       regex_t *re;                            /* Regular expression */
+       int maxbref;                            /* Largest backreference. */
+       u_long linenum;                         /* Line number. */

        char *new;                              /* Replacement text */
 };
 
 
 /*
  * An internally compiled command.
        char *new;                              /* Replacement text */
 };
 
 
 /*
  * An internally compiled command.

- * Initialy, label references are stored in u.t, on a second pass they
+ * Initialy, label references are stored in t, on a second pass they

  * are updated to pointers.
  */
 struct s_command {
  * are updated to pointers.
  */
 struct s_command {


@@ -88,8 +115,25 @@ enum e_args {
 struct s_appends {
        enum {AP_STRING, AP_FILE} type;
        char *s;
 struct s_appends {
        enum {AP_STRING, AP_FILE} type;
        char *s;

+       size_t len;
+};
+
+enum e_spflag {
+       APPEND,                                 /* Append to the contents. */
+       REPLACE,                                /* Replace the contents. */

 };
 
 };
 

+/*
+ * Structure for a space (process, hold, otherwise).
+ */
+typedef struct {
+       char *space;            /* Current space pointer. */
+       size_t len;             /* Current length. */
+       int deleted;            /* If deleted. */
+       char *back;             /* Backing memory. */
+       size_t blen;            /* Backing memory length. */
+} SPACE;
+

 /*
  * Error severity codes:
  */
 /*
  * Error severity codes:
  */