Commit Graph

26 Commits

Author SHA1 Message Date
rillig 399f66b1c1 make: rename local variable in bmake_malloc
The length of a string does not include the trailing '\0'.

No binary change.
2022-01-07 08:30:04 +00:00
rillig 85aee7a6f7 make(1): remove do-not-format markers from comments
These markers had been used inconsistently.  Furthermore the source code
had not been formatted automatically before 2020 at all, otherwise there
wouldn't have been any trailing whitespace left.
2021-01-19 20:51:46 +00:00
rillig 4d2ba079d3 make(1): remove duplicate code from bmake_strdup
Inlining is the job of the compiler, not of humans.
2020-12-07 22:37:18 +00:00
rillig f336e55bc4 make(1): revert previous commit
It had accidentally reverted all the work from the past few days.
2020-10-05 19:27:47 +00:00
rillig b6c0384ff9 make(1): fix double-free bug in -DCLEANUP mode (since 2020-10-02)
The bug had been introduced with dir.c 1.155 on 2020-10-02 22:20:25.  In
that commit, openDirectories was replaced with a combination of a list
with a hash table, for more efficient lookup by name.

Upon cleanup, OpenDirs_Done is called, which in turn called
Dir_ClearPath.  Dir_ClearPath takes full ownership of the given list and
empties it.  This was no problem before since afterwards the list was
empty and calling Lst_Free just frees the remaining list pointer.

With OpenDirs, this list was combined with a hash table, and the hash
table contains the list nodes, assuming that the OpenDirs functions have
full ownership of both the list and the hash table.  This assumption was
generally correct, except for the one moment during cleanup where full
ownership of the list was passed to Dir_ClearPath, while the hash table
still contained pointers to the (now freed) list nodes.  This by itself
was not a problem since the hash table would be freed afterwards.  But
as part of Dir_ClearPath, OpenDirs_Remove was called, which looked up
the freed directory by name and now found the freed list node, trying to
free it again.  Boom.

Fixed by replacing the call to Dir_ClearPath with code that only frees
the directories, without giving up control over the list.
2020-10-05 19:24:29 +00:00
rillig 052e64b5e1 make(1): clean up #include sections 2020-10-03 21:52:50 +00:00
rillig ef0b5be0ac make(1): remove redundant function prototypes 2020-10-01 22:42:00 +00:00
rillig 6de75a95f8 make(1): clean up RCSID blocks
These blocks mostly consisted of redundant structure, following the same
#ifndef pattern over and over, with only minimal variation.

It's easier to maintain if the common structure is only written once and
encapsulated in a macro.

To avoid "defined but unused" warnings from GCC in the case where
MAKE_NATIVE is not defined, I had to add volatile.  Adding
MAKE_ATTR_UNUSED alone would not preserve the rcsid variable in the
resulting binary.
2020-09-13 15:15:51 +00:00
rillig 09d927125b make(1): remove redundancy from comments in make_malloc.c 2020-09-02 06:10:44 +00:00
rillig 64e0a331dc make(1): fix build with -DUSE_EMALLOC 2020-08-29 16:47:45 +00:00
rillig 23181bcce8 make(1): add bmake_strsedup for duplicating a substring 2020-08-29 11:24:54 +00:00
rillig 0cbd5c0e4f make(1): remove unreached code from bmake_strndup
The "at most" branch was never taken since all call sites in var.c only
ever need a substring, and the target buffer is not limited.  Therefore
rename the function and make it simpler.

It's ok that bmake_strldup is defined as estrndup in case of USE_EMALLOC
since that function's implementation is compatible to the "copy
exactly", it just contains some extra null checks that will never match
since the variable values cannot (well, or should not) contain null
bytes.  Theoretically they can, but the behavior then depends on the
exact implementation and is unreliable, therefore nobody does this.
After all, Makefiles are used for text processing, not for binary data.
2020-08-20 06:35:14 +00:00
rillig ee1eefc8ec make(1): remove unnecessary test from bmake_strndup
The passed memory is never NULL.
2020-08-12 18:47:21 +00:00
rillig 0fc5d0f74a make(1): in bmake_strndup, only scan the relevant part of the string
Just in case the given str is not really a string.

The POSIX 2018 documentation on strndup does not specify as clearly as
possible whether s has to be a string or whether raw memory is
acceptable as well.  It only indirectly calls the s parameter of strndup
a string.
2020-08-12 03:27:29 +00:00
rillig 44d841d2c5 make(1): remove redundant parentheses around return values 2020-07-03 08:02:55 +00:00
dholland 3e81c5349d nowadays function specifiers go in declaration_specifiers
(not after the declarator)
2017-04-16 20:20:24 +00:00
sjg e47157f5d2 Do not include make_malloc.h or declare progname,
both are already done in make.h
2012-06-20 17:46:28 +00:00
joerg b1e1b1d4c2 Replace __dead, __unused and the various printf format attributes
with versions prefixed by MAKE_ATTR_* to avoid modifying the
implementation namespace. Make sure they are available in all places
using nonints.h to fix bootstrap on Linux.
2012-06-12 19:21:50 +00:00
wiz 8e7413b140 Declare enomem __dead for clang. 2012-06-10 21:44:12 +00:00
sjg 35fdcec3af Avoid nested extern declaration warnings 2012-05-18 02:28:16 +00:00
dholland f8d6aa2c68 Many C libraries don't set errno when malloc fails, so always use
strerror(ENOMEM).
2010-12-25 20:35:25 +00:00
dsl b294f6c2a3 Fix sense of MAKE_NATICE test. 2009-01-24 23:19:50 +00:00
dsl 4802ea584f Add #ifndef MAKE_NATIVE around __RCSID 2009-01-24 23:07:48 +00:00
dsl 97347d2cbb Fixes to includes of make_malloc.h to that it actually builds when
USE_EMALLOC is undefined.
Fixes earlier fixes :-)
2009-01-24 14:43:28 +00:00
cegger 9fde1a673e buildfixes for OSX:
- include <sys/types> for size_t
- progname is undeclared
- include <string.h> for string functions like strlen()
- include <errno.h> for errno
2009-01-24 13:06:16 +00:00
dsl 4fb693c12c Move the bmake_malloc() functions into their own .c and .h files.
Include instead of make.h in a few places.
2009-01-24 11:59:39 +00:00