mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-02-05 22:17:05 +00:00
8c2aa889bb
Previously we always used the file->stem value as our stem in set_file_variables(); when that wasn't correct we had to temporarily set that value while the function was called, then reset it afterward. This led to issues (for example when we assumed the stem was a cached string but it wasn't). Avoid this by passing in the stem as an argument so that different values can be provided. Add tests to verify this. * src/commands.c (set_file_variables): Take second parameter stem to relieve the callers of set_file_variables() from setting/restoring file->stem. * src/commands.h (set_file_variables): Ditto. (execute_file_commands): Pass file->stem to set_file_variables(). * src/file.c (expand_deps): Pass d->stem to set_file_variables() and remove set and restore of file->stem. * src/implicit.c (pattern_search): Pass stem to set_file_variables() and remove set and restore of file->stem. * tests/scripts/features/se_explicit: Add new tests. * tests/scripts/features/se_implicit: Ditto. * tests/scripts/features/se_statpat: Ditto. * tests/scripts/variables/automatic: Ditto.
45 lines
1.9 KiB
C
45 lines
1.9 KiB
C
/* Definition of data structures describing shell commands for GNU Make.
|
|
Copyright (C) 1988-2022 Free Software Foundation, Inc.
|
|
This file is part of GNU Make.
|
|
|
|
GNU Make is free software; you can redistribute it and/or modify it under the
|
|
terms of the GNU General Public License as published by the Free Software
|
|
Foundation; either version 3 of the License, or (at your option) any later
|
|
version.
|
|
|
|
GNU Make is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Structure that gives the commands to make a file
|
|
and information about where these commands came from. */
|
|
|
|
struct commands
|
|
{
|
|
floc fileinfo; /* Where commands were defined. */
|
|
char *commands; /* Commands text. */
|
|
char **command_lines; /* Commands chopped up into lines. */
|
|
unsigned char *lines_flags; /* One set of flag bits for each line. */
|
|
unsigned short ncommand_lines;/* Number of command lines. */
|
|
char recipe_prefix; /* Recipe prefix for this command set. */
|
|
unsigned int any_recurse:1; /* Nonzero if any 'lines_flags' elt has */
|
|
/* the COMMANDS_RECURSE bit set. */
|
|
};
|
|
|
|
/* Bits in 'lines_flags'. */
|
|
#define COMMANDS_RECURSE 1 /* Recurses: + or $(MAKE). */
|
|
#define COMMANDS_SILENT 2 /* Silent: @. */
|
|
#define COMMANDS_NOERROR 4 /* No errors: -. */
|
|
|
|
struct file;
|
|
struct child;
|
|
|
|
RETSIGTYPE fatal_error_signal (int sig);
|
|
void execute_file_commands (struct file *file);
|
|
void print_commands (const struct commands *cmds);
|
|
void delete_child_targets (struct child *child);
|
|
void chop_commands (struct commands *cmds);
|
|
void set_file_variables (struct file *file, const char *stem);
|