Deleted Added
sdiff udiff text old ( 1591 ) new ( 28066 )
full compact
misc.c (1591) misc.c (28066)
1/*-
2 * Copyright (c) 1992 Diomidis Spinellis.
3 * Copyright (c) 1992, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Diomidis Spinellis of Imperial College, University of London.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 */
37
38#ifndef lint
1/*-
2 * Copyright (c) 1992 Diomidis Spinellis.
3 * Copyright (c) 1992, 1993
4 * The Regents of the University of California. All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * Diomidis Spinellis of Imperial College, University of London.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 */
37
38#ifndef lint
39#if 0
39static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
40static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
41#endif
42static const char rcsid[] =
43 "$Id$";
40#endif /* not lint */
41
42#include <sys/types.h>
43
44#endif /* not lint */
45
46#include <sys/types.h>
47
44#include <errno.h>
48#include
45#include <regex.h>
46#include <stdio.h>
47#include <stdlib.h>
48#include <string.h>
49
50#include "defs.h"
51#include "extern.h"
52
53/*
54 * malloc with result test
55 */
56void *
57xmalloc(size)
58 u_int size;
59{
60 void *p;
61
62 if ((p = malloc(size)) == NULL)
49#include <regex.h>
50#include <stdio.h>
51#include <stdlib.h>
52#include <string.h>
53
54#include "defs.h"
55#include "extern.h"
56
57/*
58 * malloc with result test
59 */
60void *
61xmalloc(size)
62 u_int size;
63{
64 void *p;
65
66 if ((p = malloc(size)) == NULL)
63 err(FATAL, "%s", strerror(errno));
67 err(1, "malloc");
64 return (p);
65}
66
67/*
68 * realloc with result test
69 */
70void *
71xrealloc(p, size)
72 void *p;
73 u_int size;
74{
75 if (p == NULL) /* Compatibility hack. */
76 return (xmalloc(size));
77
78 if ((p = realloc(p, size)) == NULL)
68 return (p);
69}
70
71/*
72 * realloc with result test
73 */
74void *
75xrealloc(p, size)
76 void *p;
77 u_int size;
78{
79 if (p == NULL) /* Compatibility hack. */
80 return (xmalloc(size));
81
82 if ((p = realloc(p, size)) == NULL)
79 err(FATAL, "%s", strerror(errno));
83 err(1, "realloc");
80 return (p);
81}
82
83/*
84 * Return a string for a regular expression error passed. This is a overkill,
85 * because of the silly semantics of regerror (we can never know the size of
86 * the buffer).
87 */

--- 7 unchanged lines hidden (view full) ---

95
96 if (oe != NULL)
97 free(oe);
98 s = regerror(errcode, preg, "", 0);
99 oe = xmalloc(s);
100 (void)regerror(errcode, preg, oe, s);
101 return (oe);
102}
84 return (p);
85}
86
87/*
88 * Return a string for a regular expression error passed. This is a overkill,
89 * because of the silly semantics of regerror (we can never know the size of
90 * the buffer).
91 */

--- 7 unchanged lines hidden (view full) ---

99
100 if (oe != NULL)
101 free(oe);
102 s = regerror(errcode, preg, "", 0);
103 oe = xmalloc(s);
104 (void)regerror(errcode, preg, oe, s);
105 return (oe);
106}
103
104#if __STDC__
105#include <stdarg.h>
106#else
107#include <varargs.h>
108#endif
109/*
110 * Error reporting function
111 */
112void
113#if __STDC__
114err(int severity, const char *fmt, ...)
115#else
116err(severity, fmt, va_alist)
117 int severity;
118 char *fmt;
119 va_dcl
120#endif
121{
122 va_list ap;
123#if __STDC__
124 va_start(ap, fmt);
125#else
126 va_start(ap);
127#endif
128 (void)fprintf(stderr, "sed: ");
129 switch (severity) {
130 case WARNING:
131 case COMPILE:
132 (void)fprintf(stderr, "%lu: %s: ", linenum, fname);
133 }
134 (void)vfprintf(stderr, fmt, ap);
135 va_end(ap);
136 (void)fprintf(stderr, "\n");
137 if (severity == WARNING)
138 return;
139 exit(1);
140 /* NOTREACHED */
141}