Import bmake-20240430
Intersting/relevant changes since bmake-20240309
ChangeLog since bmake-20240309
2024-04-30 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240430
Merge with NetBSD make, pick up
o main.c: ensure '.include <makefile>' respects MAKESYSPATH.
Dir_FindFile will search .CURDIR first unless ".DOTLAST" is seen.
2024-04-28 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240428
Merge with NetBSD make, pick up
o simplify freeing of lists
o arch.c: trim pointless comments
o var.c: delay variable assignments until actually needed
don't reallocate memory after evaluating an expression, result is
almost always short-lived.
2024-04-26 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240426
Merge with NetBSD make, pick up
o job.c: in debug output, print the directory in which a job
failed at same time as failed target so it is more easily found in
build log.
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240424
Merge with NetBSD make, pick up
o clean up comments, code and tests
2024-04-23 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240422
Merge with NetBSD make, pick up
o var.c: avoid LazyBuf for :*time modifiers.
LazyBuf's are not nul terminated so not suitable for passing to
functions that expect that. These modifiers are used sparingly so
an extra allocation is not a problem.
2024-04-20 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240420
Merge with NetBSD make, pick up
o provide more context information for parse/evaluate errors
2024-04-14 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240414
Merge with NetBSD make, pick up
o parse.c: print -dp debug info earlier so we see which
.if or .for line is being parsed.
2024-04-04 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240404
Merge with NetBSD make, pick up
o fix some unit tests for Cygwin
o parse.c: exit immediately after reading a null byte from a makefile
* fix generation of bmake.cat1
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240314
Add/Improve support for Cygwin
o uname -s output isn't useful so allow configure to
set FORCE_MAKE_OS - to force the value of .MAKE.OS
and use Cygwin which matches uname -o
o fix some unit-tests for Cygwin
* configure.in: use_makefile=no for Cygwin et al.
NOTE: bmake does not support Cygwin and likely never will,
mk/ChangeLog since bmake-20240309
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* meta.autodep.mk: do not override start_utc
2024-04-18 Simon J Gerraty <sjg@beast.crufty.net>
* sys.dirdeps.mk: set defaults for DEP_* at level 0 too.
These help when first include of Makefile.depend happens in a leaf
dir.
* install-mk (MK_VERSION): 20240414
2024-04-09 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240408
* init.mk: allow for _ as well as . to join V
and Q from QUALIFIED_VAR_LIST and VAR_QUALIFIER_LIST.
* progs.mk: avoid overlap between PROG_VARS and
init.mk's QUALIFIED_VAR_LIST since PROG would also
match its VAR_QUALIFIER_LIST,
libs.mk does not have the same issue.
* subdir.mk: _SUBDIRUSE for realinstall should run install
remove include of ${.CURDIR}/Makefile.inc that can be done via
local.subdir.mk where needed
* own.mk: do not conflict with man.mk
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240314
* add sys/Cygwin.mk from Christian Franke
2024-05-04 00:43:12 +02:00
|
|
|
/* $NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $ */
|
2012-06-08 23:57:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
|
|
|
|
* 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. 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1988, 1989 by Adam de Boor
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
Import bmake-20240108
Interesting/relevant changes since bmake-20230909
* VERSION (_MAKE_VERSION): 20240106
Merge with NetBSD make, pick up
o fix duplicate progname when reporting an unknown target
o unit tests for Cmd_Exec using temp file
* VERSION (_MAKE_VERSION): 20240105
Merge with NetBSD make, pick up
o main.c: Cmd_Exec write cmd to a file if too big
avoid blowing commandline/env limits
* VERSION (_MAKE_VERSION): 20240101
o util.c: flesh out more of strftime
* configure.in: add --with-bmake-strftime
it is not a full implementation but enough to pass all
the unit-tests.
* parse.c: LoadFile do not append \n to empty buffer.
* VERSION (_MAKE_VERSION): 20231230
Merge with NetBSD make, pick up
o simplify memory allocation for string buffers
o fix declared types of list nodes
o suff.c: clean up freeing of suffixes
o var.c: simplify debug message for the ':@var@...@' modifier
clean up variable handling
* VERSION (_MAKE_VERSION): 20231226
Merge with NetBSD make, pick up
o compat.c: ensure make's output is correctly ordered with that of
the target when not going to a tty
o main.c: check for shellPath whether to call Shell_Init()
* VERSION (_MAKE_VERSION): 20231224
Merge with NetBSD make, pick up
o compat.c: check for shellPath whether to call Shell_Init()
tweak the unit test to detect the bug thus fixed.
o make.1: do not claim .SHELL is only used by jobs mode.
* VERSION (_MAKE_VERSION): 20231220
Merge with NetBSD make, pick up
o str.c: speed up pattern matching in the ':M' modifier
o var.c: fix confusing debug logging when deleting a variable
use consistent debug messages style when ignoring variables
* VERSION (_MAKE_VERSION): 20231210
Merge with NetBSD make, pick up
o var.c: avoid segfault on empty :C match expression
explain in debug log why variable assignment is ignored.
* VERSION (_MAKE_VERSION): 20231208
Merge with NetBSD make, pick up
o var.c: ensure fromCmd is set correctly for variables set on
command line.
* VERSION (_MAKE_VERSION): 20231124
Merge with NetBSD make, pick up
o main.c: cleanup processing of -j
fix lint warning about strchr
o var.c: more accurate error message for invalid ':mtime' argument
cleanup :[...] modifier
avoid reading beyond substring when comparing
o unit-tests cover all cases of :mtime, test and explain exporting
of variables
o cleanup comments
* bsd.after-import.mk (ECHO_TAG): FreeBSD no longer uses
$FreeBSD$ tag, so avoid adding it.
mk/ChangeLog since bmake-20230909
* dirdeps.mk: for MAKE_VERSION 20240105 we do not have the same
limits on command line length, so skip export of lists to env.
* jobs.mk: avoid C suffix in JOB_MAX_C if factor is floating
point. This keeps JOB_MAX numeric incase another makefile does
comparisons.
* gendirdeps.mk: if META_XTRAS is passed to us, add to META_FILES
2024-01-14 02:16:25 +01:00
|
|
|
/* Automatically growing null-terminated buffers of characters. */
|
2012-06-08 23:57:36 +02:00
|
|
|
|
2020-09-05 18:11:04 +02:00
|
|
|
#include <limits.h>
|
|
|
|
#include "make.h"
|
2012-06-08 23:57:36 +02:00
|
|
|
|
2020-11-07 20:39:21 +01:00
|
|
|
/* "@(#)buf.c 8.1 (Berkeley) 6/6/93" */
|
Import bmake-20240430
Intersting/relevant changes since bmake-20240309
ChangeLog since bmake-20240309
2024-04-30 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240430
Merge with NetBSD make, pick up
o main.c: ensure '.include <makefile>' respects MAKESYSPATH.
Dir_FindFile will search .CURDIR first unless ".DOTLAST" is seen.
2024-04-28 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240428
Merge with NetBSD make, pick up
o simplify freeing of lists
o arch.c: trim pointless comments
o var.c: delay variable assignments until actually needed
don't reallocate memory after evaluating an expression, result is
almost always short-lived.
2024-04-26 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240426
Merge with NetBSD make, pick up
o job.c: in debug output, print the directory in which a job
failed at same time as failed target so it is more easily found in
build log.
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240424
Merge with NetBSD make, pick up
o clean up comments, code and tests
2024-04-23 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240422
Merge with NetBSD make, pick up
o var.c: avoid LazyBuf for :*time modifiers.
LazyBuf's are not nul terminated so not suitable for passing to
functions that expect that. These modifiers are used sparingly so
an extra allocation is not a problem.
2024-04-20 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240420
Merge with NetBSD make, pick up
o provide more context information for parse/evaluate errors
2024-04-14 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240414
Merge with NetBSD make, pick up
o parse.c: print -dp debug info earlier so we see which
.if or .for line is being parsed.
2024-04-04 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240404
Merge with NetBSD make, pick up
o fix some unit tests for Cygwin
o parse.c: exit immediately after reading a null byte from a makefile
* fix generation of bmake.cat1
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20240314
Add/Improve support for Cygwin
o uname -s output isn't useful so allow configure to
set FORCE_MAKE_OS - to force the value of .MAKE.OS
and use Cygwin which matches uname -o
o fix some unit-tests for Cygwin
* configure.in: use_makefile=no for Cygwin et al.
NOTE: bmake does not support Cygwin and likely never will,
mk/ChangeLog since bmake-20240309
2024-04-24 Simon J Gerraty <sjg@beast.crufty.net>
* meta.autodep.mk: do not override start_utc
2024-04-18 Simon J Gerraty <sjg@beast.crufty.net>
* sys.dirdeps.mk: set defaults for DEP_* at level 0 too.
These help when first include of Makefile.depend happens in a leaf
dir.
* install-mk (MK_VERSION): 20240414
2024-04-09 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240408
* init.mk: allow for _ as well as . to join V
and Q from QUALIFIED_VAR_LIST and VAR_QUALIFIER_LIST.
* progs.mk: avoid overlap between PROG_VARS and
init.mk's QUALIFIED_VAR_LIST since PROG would also
match its VAR_QUALIFIER_LIST,
libs.mk does not have the same issue.
* subdir.mk: _SUBDIRUSE for realinstall should run install
remove include of ${.CURDIR}/Makefile.inc that can be done via
local.subdir.mk where needed
* own.mk: do not conflict with man.mk
2024-03-19 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20240314
* add sys/Cygwin.mk from Christian Franke
2024-05-04 00:43:12 +02:00
|
|
|
MAKE_RCSID("$NetBSD: buf.c,v 1.58 2024/04/28 15:10:19 rillig Exp $");
|
2020-11-07 20:39:21 +01:00
|
|
|
|
2021-01-14 02:24:34 +01:00
|
|
|
/* Make space in the buffer for adding at least 16 more bytes. */
|
2012-06-08 23:57:36 +02:00
|
|
|
void
|
2021-01-14 02:24:34 +01:00
|
|
|
Buf_Expand(Buffer *buf)
|
2012-06-08 23:57:36 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
buf->cap += buf->cap > 16 ? buf->cap : 16;
|
|
|
|
buf->data = bmake_realloc(buf->data, buf->cap);
|
2012-06-08 23:57:36 +02:00
|
|
|
}
|
|
|
|
|
2020-11-07 20:39:21 +01:00
|
|
|
/* Add the bytes to the buffer. */
|
2012-06-08 23:57:36 +02:00
|
|
|
void
|
2020-11-07 20:39:21 +01:00
|
|
|
Buf_AddBytes(Buffer *buf, const char *bytes, size_t bytes_len)
|
2012-06-08 23:57:36 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
size_t old_len = buf->len;
|
|
|
|
char *end;
|
|
|
|
|
2021-02-11 02:51:11 +01:00
|
|
|
if (old_len + bytes_len >= buf->cap) {
|
2021-01-14 02:24:34 +01:00
|
|
|
size_t minIncr = bytes_len + 16;
|
|
|
|
buf->cap += buf->cap > minIncr ? buf->cap : minIncr;
|
|
|
|
buf->data = bmake_realloc(buf->data, buf->cap);
|
|
|
|
}
|
|
|
|
|
|
|
|
end = buf->data + old_len;
|
|
|
|
buf->len = old_len + bytes_len;
|
|
|
|
memcpy(end, bytes, bytes_len);
|
|
|
|
end[bytes_len] = '\0';
|
2012-06-08 23:57:36 +02:00
|
|
|
}
|
|
|
|
|
2020-09-05 18:11:04 +02:00
|
|
|
/* Add the bytes between start and end to the buffer. */
|
|
|
|
void
|
2023-06-27 22:29:43 +02:00
|
|
|
Buf_AddRange(Buffer *buf, const char *start, const char *end)
|
2012-06-08 23:57:36 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
Buf_AddBytes(buf, start, (size_t)(end - start));
|
2020-09-05 18:11:04 +02:00
|
|
|
}
|
|
|
|
|
2020-11-07 20:39:21 +01:00
|
|
|
/* Add the string to the buffer. */
|
2020-09-05 18:11:04 +02:00
|
|
|
void
|
2020-11-07 20:39:21 +01:00
|
|
|
Buf_AddStr(Buffer *buf, const char *str)
|
2020-09-05 18:11:04 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
Buf_AddBytes(buf, str, strlen(str));
|
2020-09-05 18:11:04 +02:00
|
|
|
}
|
2012-06-08 23:57:36 +02:00
|
|
|
|
2020-11-07 20:39:21 +01:00
|
|
|
/* Add the number to the buffer. */
|
2020-09-05 18:11:04 +02:00
|
|
|
void
|
2020-11-07 20:39:21 +01:00
|
|
|
Buf_AddInt(Buffer *buf, int n)
|
2020-09-05 18:11:04 +02:00
|
|
|
{
|
2021-12-18 08:27:22 +01:00
|
|
|
char str[sizeof(int) * CHAR_BIT + 1];
|
2021-01-14 02:24:34 +01:00
|
|
|
|
|
|
|
size_t len = (size_t)snprintf(str, sizeof str, "%d", n);
|
|
|
|
Buf_AddBytes(buf, str, len);
|
2020-09-05 18:11:04 +02:00
|
|
|
}
|
|
|
|
|
2021-12-18 08:27:22 +01:00
|
|
|
void
|
|
|
|
Buf_AddFlag(Buffer *buf, bool flag, const char *name)
|
|
|
|
{
|
|
|
|
if (flag) {
|
|
|
|
if (buf->len > 0)
|
|
|
|
Buf_AddByte(buf, '|');
|
|
|
|
Buf_AddBytes(buf, name, strlen(name));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-20 04:54:37 +01:00
|
|
|
/* Initialize a buffer. */
|
2012-06-08 23:57:36 +02:00
|
|
|
void
|
2020-11-20 04:54:37 +01:00
|
|
|
Buf_InitSize(Buffer *buf, size_t cap)
|
2012-06-08 23:57:36 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
buf->cap = cap;
|
|
|
|
buf->len = 0;
|
|
|
|
buf->data = bmake_malloc(cap);
|
|
|
|
buf->data[0] = '\0';
|
2012-06-08 23:57:36 +02:00
|
|
|
}
|
|
|
|
|
2020-11-20 04:54:37 +01:00
|
|
|
void
|
|
|
|
Buf_Init(Buffer *buf)
|
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
Buf_InitSize(buf, 256);
|
2020-11-20 04:54:37 +01:00
|
|
|
}
|
|
|
|
|
2021-01-14 02:24:34 +01:00
|
|
|
/*
|
2021-02-11 02:51:11 +01:00
|
|
|
* Free the data from the buffer.
|
|
|
|
* Leave the buffer itself in an indeterminate state.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
Buf_Done(Buffer *buf)
|
|
|
|
{
|
|
|
|
free(buf->data);
|
|
|
|
|
|
|
|
#ifdef CLEANUP
|
|
|
|
buf->cap = 0;
|
|
|
|
buf->len = 0;
|
|
|
|
buf->data = NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the data from the buffer.
|
|
|
|
* Leave the buffer itself in an indeterminate state.
|
2021-01-14 02:24:34 +01:00
|
|
|
*/
|
2020-09-05 18:11:04 +02:00
|
|
|
char *
|
2021-02-11 02:51:11 +01:00
|
|
|
Buf_DoneData(Buffer *buf)
|
2012-06-08 23:57:36 +02:00
|
|
|
{
|
2021-01-14 02:24:34 +01:00
|
|
|
char *data = buf->data;
|
2012-06-08 23:57:36 +02:00
|
|
|
|
2021-02-11 02:51:11 +01:00
|
|
|
#ifdef CLEANUP
|
2021-01-14 02:24:34 +01:00
|
|
|
buf->cap = 0;
|
|
|
|
buf->len = 0;
|
|
|
|
buf->data = NULL;
|
2021-02-11 02:51:11 +01:00
|
|
|
#endif
|
2012-06-08 23:57:36 +02:00
|
|
|
|
2021-01-14 02:24:34 +01:00
|
|
|
return data;
|
2012-06-08 23:57:36 +02:00
|
|
|
}
|