ccc5b4e6f4
Cast sizeof() to (int), as it's being compared against an int, not a size_t. If i is changed to a size_t, it means the logic must be slightly changed later in the flow, where --i is checked to be >= 0. I am not sure I want to make a logic change to account for clearing up a warning, when an aesthetic one will keep from modifying the logic. Other harmless casts, that I think I've made in the right directions. Make gpbc() an inline function, rather than an obfuscated macro, make its scratch space local, rather than global. The previous macro used a dirty hack (logical AND in place of a conditional) which would lead GCC to throw a fit (rightly so) as the logical check, as well as the incrementation of a variable, were not used for anything. const'ify a few places where gcc3 yells. xstrdup() some global consts in places where we xstrdup() when not using consts, but tried to assign them to non-consts before. Don't use execv(2) if we don't have the kind of arguments it wants. Reviewed by: asmodai obrien tjr Submitted by: tjr (a gcc3 build log)
381 lines
7.2 KiB
C
381 lines
7.2 KiB
C
/* $OpenBSD: misc.c,v 1.26 2001/11/16 23:50:40 deraadt Exp $ */
|
|
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Ozan Yigit at York University.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__SCCSID("@(#)misc.c 8.1 (Berkeley) 6/6/93");
|
|
__RCSID_SOURCE("$OpenBSD: misc.c,v 1.26 2001/11/16 23:50:40 deraadt Exp $");
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <err.h>
|
|
#include "mdef.h"
|
|
#include "stdd.h"
|
|
#include "extern.h"
|
|
#include "pathnames.h"
|
|
|
|
|
|
char *ep; /* first free char in strspace */
|
|
static char *strspace; /* string space for evaluation */
|
|
char *endest; /* end of string space */
|
|
static size_t strsize = STRSPMAX;
|
|
static size_t bufsize = BUFSIZE;
|
|
|
|
char *buf; /* push-back buffer */
|
|
char *bufbase; /* the base for current ilevel */
|
|
char *bbase[MAXINP]; /* the base for each ilevel */
|
|
char *bp; /* first available character */
|
|
char *endpbb; /* end of push-back buffer */
|
|
|
|
|
|
/*
|
|
* find the index of second str in the first str.
|
|
*/
|
|
ptrdiff_t
|
|
indx(s1, s2)
|
|
const char *s1;
|
|
const char *s2;
|
|
{
|
|
char *t;
|
|
|
|
t = strstr(s1, s2);
|
|
if (t == NULL)
|
|
return (-1);
|
|
else
|
|
return (t - s1);
|
|
}
|
|
/*
|
|
* putback - push character back onto input
|
|
*/
|
|
void
|
|
putback(c)
|
|
int c;
|
|
{
|
|
if (c == EOF)
|
|
return;
|
|
if (bp >= endpbb)
|
|
enlarge_bufspace();
|
|
*bp++ = c;
|
|
}
|
|
|
|
/*
|
|
* pbstr - push string back onto input
|
|
* putback is replicated to improve
|
|
* performance.
|
|
*/
|
|
void
|
|
pbstr(s)
|
|
const char *s;
|
|
{
|
|
size_t n;
|
|
|
|
n = strlen(s);
|
|
while ((size_t)(endpbb - bp) <= n)
|
|
enlarge_bufspace();
|
|
while (n > 0)
|
|
*bp++ = s[--n];
|
|
}
|
|
|
|
/*
|
|
* pbnum - convert number to string, push back on input.
|
|
*/
|
|
void
|
|
pbnum(n)
|
|
int n;
|
|
{
|
|
int num;
|
|
|
|
num = (n < 0) ? -n : n;
|
|
do {
|
|
putback(num % 10 + '0');
|
|
}
|
|
while ((num /= 10) > 0);
|
|
|
|
if (n < 0)
|
|
putback('-');
|
|
}
|
|
|
|
/*
|
|
* pbunsigned - convert unsigned long to string, push back on input.
|
|
*/
|
|
void
|
|
pbunsigned(n)
|
|
unsigned long n;
|
|
{
|
|
do {
|
|
putback(n % 10 + '0');
|
|
}
|
|
while ((n /= 10) > 0);
|
|
}
|
|
|
|
void
|
|
initspaces()
|
|
{
|
|
int i;
|
|
|
|
strspace = xalloc(strsize+1);
|
|
ep = strspace;
|
|
endest = strspace+strsize;
|
|
buf = (char *)xalloc(bufsize);
|
|
bufbase = buf;
|
|
bp = buf;
|
|
endpbb = buf + bufsize;
|
|
for (i = 0; i < MAXINP; i++)
|
|
bbase[i] = buf;
|
|
}
|
|
|
|
void
|
|
enlarge_strspace()
|
|
{
|
|
char *newstrspace;
|
|
int i;
|
|
|
|
strsize *= 2;
|
|
newstrspace = malloc(strsize + 1);
|
|
if (!newstrspace)
|
|
errx(1, "string space overflow");
|
|
memcpy(newstrspace, strspace, strsize/2);
|
|
for (i = 0; i <= sp; i++)
|
|
if (sstack[i])
|
|
mstack[i].sstr = (mstack[i].sstr - strspace)
|
|
+ newstrspace;
|
|
ep = (ep-strspace) + newstrspace;
|
|
free(strspace);
|
|
strspace = newstrspace;
|
|
endest = strspace + strsize;
|
|
}
|
|
|
|
void
|
|
enlarge_bufspace()
|
|
{
|
|
char *newbuf;
|
|
int i;
|
|
|
|
bufsize *= 2;
|
|
newbuf = realloc(buf, bufsize);
|
|
if (!newbuf)
|
|
errx(1, "too many characters pushed back");
|
|
for (i = 0; i < MAXINP; i++)
|
|
bbase[i] = (bbase[i]-buf)+newbuf;
|
|
bp = (bp-buf)+newbuf;
|
|
bufbase = (bufbase-buf)+newbuf;
|
|
buf = newbuf;
|
|
endpbb = buf+bufsize;
|
|
}
|
|
|
|
/*
|
|
* chrsave - put single char on string space
|
|
*/
|
|
void
|
|
chrsave(c)
|
|
int c;
|
|
{
|
|
if (ep >= endest)
|
|
enlarge_strspace();
|
|
*ep++ = c;
|
|
}
|
|
|
|
/*
|
|
* read in a diversion file, and dispose it.
|
|
*/
|
|
void
|
|
getdiv(n)
|
|
int n;
|
|
{
|
|
int c;
|
|
|
|
if (active == outfile[n])
|
|
errx(1, "undivert: diversion still active");
|
|
rewind(outfile[n]);
|
|
while ((c = getc(outfile[n])) != EOF)
|
|
putc(c, active);
|
|
(void) fclose(outfile[n]);
|
|
outfile[n] = NULL;
|
|
}
|
|
|
|
void
|
|
onintr(signo)
|
|
int signo __unused;
|
|
{
|
|
#define intrmessage "m4: interrupted.\n"
|
|
write(STDERR_FILENO, intrmessage, sizeof(intrmessage)-1);
|
|
_exit(1);
|
|
}
|
|
|
|
/*
|
|
* killdiv - get rid of the diversion files
|
|
*/
|
|
void
|
|
killdiv()
|
|
{
|
|
int n;
|
|
|
|
for (n = 0; n < maxout; n++)
|
|
if (outfile[n] != NULL) {
|
|
(void) fclose(outfile[n]);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* resizedivs: allocate more diversion files */
|
|
void
|
|
resizedivs(n)
|
|
int n;
|
|
{
|
|
int i;
|
|
|
|
outfile = (FILE **)realloc(outfile, sizeof(FILE *) * n);
|
|
if (outfile == NULL)
|
|
errx(1, "too many diverts %d", n);
|
|
for (i = maxout; i < n; i++)
|
|
outfile[i] = NULL;
|
|
maxout = n;
|
|
}
|
|
|
|
void *
|
|
xalloc(n)
|
|
size_t n;
|
|
{
|
|
char *p = malloc(n);
|
|
|
|
if (p == NULL)
|
|
err(1, "malloc");
|
|
return p;
|
|
}
|
|
|
|
char *
|
|
xstrdup(s)
|
|
const char *s;
|
|
{
|
|
char *p = strdup(s);
|
|
if (p == NULL)
|
|
err(1, "strdup");
|
|
return p;
|
|
}
|
|
|
|
void
|
|
usage()
|
|
{
|
|
fprintf(stderr,
|
|
"usage: m4 [-d flags] [-t name] [-gs] [-D name[=value]]...\n"
|
|
" [-U name]... [-I dirname]... file...\n");
|
|
exit(1);
|
|
}
|
|
|
|
int
|
|
obtain_char(f)
|
|
struct input_file *f;
|
|
{
|
|
if (f->c == EOF)
|
|
return EOF;
|
|
else if (f->c == '\n')
|
|
f->lineno++;
|
|
|
|
f->c = fgetc(f->file);
|
|
return f->c;
|
|
}
|
|
|
|
void
|
|
set_input(f, real, name)
|
|
struct input_file *f;
|
|
FILE *real;
|
|
const char *name;
|
|
{
|
|
f->file = real;
|
|
f->lineno = 1;
|
|
f->c = 0;
|
|
f->name = xstrdup(name);
|
|
}
|
|
|
|
void
|
|
release_input(f)
|
|
struct input_file *f;
|
|
{
|
|
if (f->file != stdin)
|
|
fclose(f->file);
|
|
f->c = EOF;
|
|
/*
|
|
* XXX can't free filename, as there might still be
|
|
* error information pointing to it.
|
|
*/
|
|
}
|
|
|
|
void
|
|
doprintlineno(f)
|
|
struct input_file *f;
|
|
{
|
|
pbunsigned(f->lineno);
|
|
}
|
|
|
|
void
|
|
doprintfilename(f)
|
|
struct input_file *f;
|
|
{
|
|
pbstr(rquote);
|
|
pbstr(f->name);
|
|
pbstr(lquote);
|
|
}
|
|
|
|
/*
|
|
* buffer_mark/dump_buffer: allows one to save a mark in a buffer,
|
|
* and later dump everything that was added since then to a file.
|
|
*/
|
|
size_t
|
|
buffer_mark()
|
|
{
|
|
return bp - buf;
|
|
}
|
|
|
|
|
|
void
|
|
dump_buffer(f, m)
|
|
FILE *f;
|
|
size_t m;
|
|
{
|
|
char *s;
|
|
|
|
for (s = bp; s - buf > (int)m;)
|
|
fputc(*--s, f);
|
|
}
|