Return to str.c CVS log

Up to [local] / src / usr.bin / make

Mostly clean-up:
- cut up those huge include files into separate interfaces for all modules.
Put the interface documentation there, and not with the implementation.
- light-weight includes for needed concrete types (lst_t.h, timestamp_t.h).
- cut out some more logically separate parts: cmd_exec, varname, parsevar,
timestamp.
- put all error handling functions together, so that we will be able to
clean them up.
- more systematic naming: functioni  to handle interval, function to handle
string.
- put the init/end code apart to minimize coupling.
- kill weird types like ReturnStatus and Boolean. Use standard bool (with a
fallback for non-iso systems)
- better interface documentation for lots of subsystems.

As a result, make compilation goes somewhat faster (5%, even considering
the largish BSD copyrights to read). The corresponding preprocessed
source goes down from 1,5M to 1M.

A few minor code changes as well: Parse_DoVar is no longer destructive.
Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an
assignment is), a few more interval handling functions. Avoid calling
XXX_End when they do nothing, just #define XXX_End   to nothing.

Parse_DoVar is slightly more general: it will handle compound assignments
as long as they make sense, e.g., VAR +!= cmd
will work.  As a side effect, VAR++=value now triggers an error
(two + in assignment).
- this stuff doesn't occur in portable Makefiles.
- writing VAR++ = value or VAR+ +=value  disambiguates it.
- this is a good thing, it uncovered a bug in bsd.port.mk.

Tested by naddy@. Okayed millert@. I'll handle the fallback if there is
any. This went through a full make build anyways, including isakmpd
(without mickey's custom binutils, as he didn't see fit to share it with me).

/*	$OpenPackages$ */
/*	$OpenBSD: str.c,v 1.19 2001/05/23 12:34:49 espie Exp $	*/
/*	$NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $	*/

/*-
 * Copyright (c) 1988, 1989, 1990, 1993
 *	The Regents of the University of California.  All rights reserved.
 * Copyright (c) 1989 by Berkeley Softworks
 * All rights reserved.
 *
 * This code is derived from software contributed to Berkeley by
 * Adam de Boor.
 *
 * 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 <ctype.h>
#include <string.h>
#include "config.h"
#include "defines.h"
#include "str.h"
#include "memory.h"
#include "buf.h"

char *
Str_concati(s1, e1, s2, e2, sep)
    const char *s1, *e1, *s2, *e2;
    int sep;
{
    size_t len1, len2;
    char *result;

    /* get the length of both strings */
    len1 = e1 - s1;
    len2 = e2 - s2;

    /* space for separator */
    if (sep)
	len1++;
    result = emalloc(len1 + len2 + 1);

    /* copy first string into place */
    memcpy(result, s1, len1);

    /* add separator character */
    if (sep)
	result[len1-1] = sep;

    /* copy second string plus EOS into place */
    memcpy(result + len1, s2, len2);
    result[len1+len2] = '\0';
    return result;
}

/*-
 * brk_string --
 *	Fracture a string into an array of words (as delineated by tabs or
 *	spaces) taking quotation marks into account.  Leading tabs/spaces
 *	are ignored.
 *
 * returns --
 *	Pointer to the array of pointers to the words.	To make life easier,
 *	the first word is always the value of the .MAKE variable.
 */
char **
brk_string(str, store_argc, buffer)
    const char *str;
    int *store_argc;
    char **buffer;
{
    int argc;
    char ch;
    char inquote;
    const char *p;
    char *start, *t;
    size_t len;
    int argmax = 50;
    size_t curlen = 0;
    char **argv = emalloc((argmax + 1) * sizeof(char *));

    /* skip leading space chars. */
    for (; *str == ' ' || *str == '\t'; ++str)
	continue;

    /* allocate room for a copy of the string */
    if ((len = strlen(str) + 1) > curlen)
	*buffer = emalloc(curlen = len);

    /*
     * copy the string; at the same time, parse backslashes,
     * quotes and build the argument list.
     */
    argc = 0;
    inquote = '\0';
    for (p = str, start = t = *buffer;; ++p) {
	switch (ch = *p) {
	case '"':
	case '\'':
	    if (inquote) {
		if (inquote == ch)
		    inquote = '\0';
		else
		    break;
	    } else {
		inquote = ch;
		/* Don't miss "" or '' */
		if (start == NULL && p[1] == inquote) {
		    start = t + 1;
		    break;
		}
	    }
	    continue;
	case ' ':
	case '\t':
	case '\n':
	    if (inquote)
		break;
	    if (!start)
		continue;
	    /* FALLTHROUGH */
	case '\0':
	    /*
	     * end of a token -- make sure there's enough argv
	     * space and save off a pointer.
	     */
	    if (!start)
		goto done;

	    *t++ = '\0';
	    if (argc == argmax) {
		argmax *= 2;		/* ramp up fast */
		argv = erealloc(argv, (argmax + 1) * sizeof(char *));
	    }
	    argv[argc++] = start;
	    start = NULL;
	    if (ch == '\n' || ch == '\0')
		goto done;
	    continue;
	case '\\':
	    switch (ch = *++p) {
	    case '\0':
	    case '\n':
		/* hmmm; fix it up as best we can */
		ch = '\\';
		--p;
		break;
	    case 'b':
		ch = '\b';
		break;
	    case 'f':
		ch = '\f';
		break;
	    case 'n':
		ch = '\n';
		break;
	    case 'r':
		ch = '\r';
		break;
	    case 't':
		ch = '\t';
		break;
	    }
		break;
	}
	if (!start)
	    start = t;
	*t++ = ch;
    }
done:
    argv[argc] = NULL;
    *store_argc = argc;
    return argv;
}


const char *
iterate_words(end)
    const char	**end;
{
    const char	*start, *p;
    char	state = 0;
    start = *end;

    while (isspace(*start))
	start++;
    if (*start == '\0')
	return NULL;

    for (p = start;; p++)
	switch(*p) {
	    case '\\':
		if (p[1] != '\0')
		    p++;
		break;
	    case '\'':
	    case '"':
		if (state == *p)
		    state = 0;
		else if (state == 0)
		    state = *p;
		break;
	    case ' ':
	    case '\t':
		if (state != 0)
		    break;
		/* FALLTHROUGH */
	    case '\0':
		*end = p;
		return start;
	    default:
		break;
	    }
}

bool
Str_Matchi(string, estring, pattern, end)
    const char *string; 		/* String */
    const char *estring;		/* End of string */
    const char *pattern;		/* Pattern */
    const char *end;			/* End of Pattern */
{
    while (pattern != end) {
	/* Check for a "*" as the next pattern character.  It matches
	 * any substring.  We handle this by calling ourselves
	 * recursively for each postfix of string, until either we
	 * match or we reach the end of the string.  */
	if (*pattern == '*') {
	    pattern++;
	    /* Skip over contiguous  sequences of `?*', so that recursive
	     * calls only occur on `real' characters.  */
	    while (pattern != end && (*pattern == '?' || *pattern == '*')) {
		if (*pattern == '?') {
		    if (string == estring)
			return false;
		    else
			string++;
		}
		pattern++;
	    }
	    if (pattern == end)
		return true;
	    for (; string != estring; string++)
		if (Str_Matchi(string, estring, pattern, end))
		    return true;
	    return false;
	} else if (string == estring)
	    return false;
	/* Check for a "[" as the next pattern character.  It is
	 * followed by a list of characters that are acceptable, or
	 * by a range (two characters separated by "-").  */
	else if (*pattern == '[') {
	    pattern++;
	    if (pattern == end)
		return false;
	    if (*pattern == '!' || *pattern == '^') {
		pattern++;
		if (pattern == end)
			return false;
		/* Negative match */
		for (;;) {
		    if (*pattern == '\\') {
			if (++pattern == end)
			    return false;
		    }
		    if (*pattern == *string)
			return false;
		    if (pattern[1] == '-') {
			if (pattern + 2 == end)
			    return false;
			if (*pattern < *string && *string <= pattern[2])
			    return false;
			if (pattern[2] <= *string && *string < *pattern)
			    return false;
			pattern += 3;
		    } else
			pattern++;
		    if (pattern == end)
			return false;
		    /* The test for ']' is done at the end so that ']'
		     * can be used at the start of the range without '\' */
		    if (*pattern == ']')
			break;
		}
	    } else {
		for (;;) {
		    if (*pattern == '\\') {
			if (++pattern == end)
			    return false;
		    }
		    if (*pattern == *string)
			break;
		    if (pattern[1] == '-') {
			if (pattern + 2 == end)
			    return false;
			if (*pattern < *string && *string <= pattern[2])
			    break;
			if (pattern[2] <= *string && *string < *pattern)
			    break;
			pattern += 3;
		    } else
			pattern++;
		    /* The test for ']' is done at the end so that ']'
		     * can be used at the start of the range without '\' */
		    if (pattern == end || *pattern == ']')
			return false;
		}
		/* Found matching character, skip over rest of class.  */
		while (*pattern != ']') {
		    if (*pattern == '\\')
			pattern++;
		    /* A non-terminated character class is ok.	*/
		    if (pattern == end)
			break;
		    pattern++;
		}
	    }
	}
	/* '?' matches any single character, so shunt test.  */
	else if (*pattern != '?') {
	    /* If the next pattern character is '\', just strip off the
	     * '\' so we do exact matching on the character that follows.  */
	    if (*pattern == '\\') {
		if (++pattern == end)
		    return false;
	    }
	    /* There's no special character.  Just make sure that
	     * the next characters of each string match.  */
	    if (*pattern != *string)
		return false;
	}
	pattern++;
	string++;
    }
    if (string == estring)
	return true;
    else
	return false;
}


/*-
 *-----------------------------------------------------------------------
 * Str_SYSVMatch --
 *	Check word against pattern for a match (% is wild),
 *
 * Results:
 *	Returns the beginning position of a match or null. The number
 *	of characters matched is returned in len.
 *-----------------------------------------------------------------------
 */
const char *
Str_SYSVMatch(word, pattern, len)
    const char	*word;		/* Word to examine */
    const char	*pattern;	/* Pattern to examine against */
    size_t	*len;		/* Number of characters to substitute */
{
    const char *p = pattern;
    const char *w = word;
    const char *m;

    if (*p == '\0') {
	/* Null pattern is the whole string.  */
	*len = strlen(w);
	return w;
    }

    if ((m = strchr(p, '%')) != NULL) {
	/* Check that the prefix matches.  */
	for (; p != m && *w && *w == *p; w++, p++)
	     continue;

	if (p != m)
	    return NULL;	/* No match.  */

	if (*++p == '\0') {
	    /* No more pattern, return the rest of the string.	*/
	    *len = strlen(w);
	    return w;
	}
    }

    m = w;

    /* Find a matching tail.  */
    do {
	if (strcmp(p, w) == 0) {
	    *len = w - m;
	    return m;
	}
    } while (*w++ != '\0');


    return NULL;
}


/*-
 *-----------------------------------------------------------------------
 * Str_SYSVSubst --
 *	Substitute '%' on the pattern with len characters from src.
 *	If the pattern does not contain a '%' prepend len characters
 *	from src.
 *
 * Side Effects:
 *	Places result on buf
 *-----------------------------------------------------------------------
 */
void
Str_SYSVSubst(buf, pat, src, len)
    Buffer buf;
    const char *pat;
    const char *src;
    size_t   len;
{
    const char *m;

    if ((m = strchr(pat, '%')) != NULL) {
	/* Copy the prefix.  */
	Buf_Addi(buf, pat, m);
	/* Skip the %.	*/
	pat = m + 1;
    }

    /* Copy the pattern.  */
    Buf_AddChars(buf, len, src);

    /* Append the rest.  */
    Buf_AddString(buf, pat);
}

char *
Str_dupi(begin, end)
    const char *begin;
    const char *end;
{
    char *s;

    s = emalloc(end - begin + 1);
    memcpy(s, begin, end - begin);
    s[end-begin] = '\0';
    return s;
}

char *
escape_dupi(begin, end, set)
    const char *begin;
    const char *end;
    const char *set;
{
    char *s, *t;

    t = s = emalloc(end - begin + 1);
    while (begin != end) {
	if (*begin == '\\') {
	    begin++;
	    if (begin == end) {
		*t++ = '\\';
		break;
	    }
	    if (strchr(set, *begin) == NULL)
		*t++ = '\\';
	}
	*t++ = *begin++;
    }
    *t++ = '\0';
    return s;
}

char *
Str_rchri(s, e, c)
    const char *s;
    const char *e;
    int c;
{
    if (s != e)
	do {
	    if (*--e == c)
		return (char *)e;
	} while (e != s);
    return NULL;
}