mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
12d638f48c
This adds the following commits from upstream: 1df7b047fe43 pylibfdt/Makefile.pylibfdt: use project's flags to compile the extension 61e88fdcec52 libfdt: overlay: Fix phandle overwrite check for new subtrees 49d30894466e meson: fix installation with meson-python d54aaf93673c pylibfdt: clean up python build directory ab86f1e9fda8 pylibfdt: add VERSION.txt to Python sdist 7b8a30eceabe pylibfdt: fix Python version ff4f17eb5865 pylibfdt/Makefile.pylibfdt: fix Python library being rebuild during install 9e313b14e684 pylibfdt/meson.build: fix Python library being rebuilt during install d598fc3648ec tests/run_tests.sh: fix Meson library path being dropped b98239da2f18 tests/meson.build: fix python and yaml tests not running c17d76ab5e84 checks: Check the overall length of "interrupt-map" ae26223a056e libfdt: overlay: Refactor overlay_fixup_phandle 4dd831affd01 libfdt: tests: Update test case for overlay_bad_fixup e6d294200837 tests: Remove two_roots and named_root from LIBTREE_TESTS_L and add all dtb filenames generated by dumptrees to TESTS_TREES_L in Makefile.tests 855c934e26ae tests: fix tests broken under Meson 4fd3f4f0a95d github: enforce testing pylibfdt and yaml support 9ca7d62dbf0b meson: split run-tests by type bb51223083a4 meson: fix dependencies of tests e81900635c95 meson: fix pylibfdt missing dependency on libfdt 822123856980 pylibfdt: fix get_mem_rsv for newer Python versions 1fad065080e6 libfdt: overlay: ensure that existing phandles are not overwritten b0aacd0a7735 github: add windows/msys CI build ae97d9745862 github: Don't accidentally suppress test errors 057a7dbbb777 github: Display meson test logs on failure 92b5d4e91678 pylibfdt: Remove some apparently deprecated options from setup.py 417e3299dbd1 github: Update to newer checkout action 5e6cefa17e2d fix MinGW format attribute 24f60011fd43 libfdt: Simplify adjustment of values for local fixups da39ee0e68b6 libfdt: rework shared/static libraries a669223f7a60 Makefile: do not hardcode the `install` program path 3fbfdd08afd2 libfdt: fix duplicate meson target dcef5f834ea3 tests: use correct pkg-config when cross compiling 0b8026ff254f meson: allow building from shallow clones 95c74d71f090 treesource: Restore string list output when no type markers 2283dd78eff5 libfdt: fdt_path_offset_namelen: Reject empty path 79b9e326a162 libfdt: fdt_get_alias_namelen: Validate aliases 52157f13ef3d pylibfdt: Support boolean properties d77433727566 dtc: fix missing string in usage_opts_help ad8bf9f9aa39 libfdt: Fix fdt_appendprop_addrrange documentation 6c5e189fb952 github: add workflow for Meson builds a3dc9f006a78 libfdt: rename libfdt-X.Y.Z.so to libfdt.so.X.Y.Z 35019949c4c7 workflows: build: remove setuptools_scm hack cd3e2304f4a9 pylibfdt: use fallback version in tarballs 0f5864567745 move release version into VERSION.txt 38165954c13b libfdt: add missing version symbols 5e98b5979354 editorconfig: use tab indentation for version.lds d030a893be25 tests: generate dtbs in Meson build directory 8d8372b13706 tests: fix use of deprecated meson methods 761114effaf7 pylibtfdt: fix use of deprecated meson method bf6377a98d97 meson: set minimum Meson version to 0.56.0 4c68e4b16b22 libfdt: fix library version to match project version bdc5c8793a13 meson: allow disabling tests f088e381f29e Makefile: allow to install libfdt without building executables 6df5328a902c Fix use of <ctype.h> functions ccf1f62d59ad libfdt: Fix a typo in libfdt.h 71a8b8ef0adf libfdt: meson: Fix linking on macOS linker 589d8c7653c7 dtc: Add an option to generate __local_fixups__ and __fixups__ e8364666d5ac CI: Add build matrix with multiple Linux distributions 3b02a94b486f dtc: Correct invalid dts output with mixed phandles and integers d4888958d64b tests: Add additional tests for device graph checks ea3b9a1d2c5a checks: Fix crash in graph_child_address if 'reg' cell size != 1 b2b9671583e9 livetree: fix off-by-one in propval_cell_n() bounds check ab481e483061 Add definition for a GitHub Actions CI job c88038c9b8ca Drop obsolete/broken CI definitions 0ac8b30ba5a1 yaml: Depend on libyaml >= 0.2.3 f1657b2fb5be tests: Add test cases for bad endpoint node and remote-endpoint prop checks 44bb89cafd3d checks: Fix segmentation fault in check_graph_node 60bcf1cde1a8 improve documentation for fdt_path_offset() a6f997bc77d4 add fdt_get_symbol() and fdt_get_symbol_namelen() functions 18f5ec12a10e use fdt_path_getprop_namelen() in fdt_get_alias_namelen() df093279282c add fdt_path_getprop_namelen() helper 129bb4b78bc6 doc: dt-object-internal: Fix a typo 390f481521c3 fdtoverlay: Drop a a repeated article 9f8b382ed45e manual: Fix and improve documentation about -@ 2cdf93a6d402 fdtoverlay: Fix usage string to not mention "<type>" 72fc810c3025 build-sys: add -Wwrite-strings 083ab26da83b tests: fix leaks spotted by ASAN 6f8b28f49609 livetree: fix leak spotted by ASAN fd68bb8c5658 Make name_node() xstrdup its name argument 4718189c4ca8 Delay xstrdup() of node and property names coming from a flat tree 0b842c3c8199 Make build_property() xstrdup its name argument 9cceabea1ee0 checks: correct I2C 10-bit address check 0d56145938fe yamltree.c: fix -Werror=discarded-qualifiers & -Werror=cast-qual 61fa22b05f69 checks: make check.data const 7a1d72a788e0 checks.c: fix check_msg() leak ee5799938697 checks.c: fix heap-buffer-overflow 44c9b73801c1 tests: fix -Wwrite-strings 5b60f5104fcc srcpos.c: fix -Wwrite-strings 32174a66efa4 meson: Fix cell overflow tests when running from meson 64a907f08b9b meson.build: bump version to 1.7.0 e3cde0613bfd Add -Wsuggest-attribute=format warning, correct warnings thus generated 41821821101a Use #ifdef NO_VALGRIND 71c19f20b3ef Do not redefine _GNU_SOURCE if already set 039a99414e77 Bump version to v1.7.0 9b62ec84bb2d Merge remote-tracking branch 'gitlab/main' 3f29d6d85c24 pylibfdt: add size_hint parameter for get_path 2022bb10879d checks: Update #{size,address}-cells check for 'dma-ranges' Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
409 lines
8.6 KiB
C
409 lines
8.6 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
|
|
*/
|
|
|
|
#ifndef _GNU_SOURCE
|
|
#define _GNU_SOURCE
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "dtc.h"
|
|
#include "srcpos.h"
|
|
|
|
/* A node in our list of directories to search for source/include files */
|
|
struct search_path {
|
|
struct search_path *next; /* next node in list, NULL for end */
|
|
const char *dirname; /* name of directory to search */
|
|
};
|
|
|
|
/* This is the list of directories that we search for source files */
|
|
static struct search_path *search_path_head, **search_path_tail;
|
|
|
|
/* Detect infinite include recursion. */
|
|
#define MAX_SRCFILE_DEPTH (200)
|
|
static int srcfile_depth; /* = 0 */
|
|
|
|
static char *get_dirname(const char *path)
|
|
{
|
|
const char *slash = strrchr(path, '/');
|
|
|
|
if (slash) {
|
|
int len = slash - path;
|
|
char *dir = xmalloc(len + 1);
|
|
|
|
memcpy(dir, path, len);
|
|
dir[len] = '\0';
|
|
return dir;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
FILE *depfile; /* = NULL */
|
|
struct srcfile_state *current_srcfile; /* = NULL */
|
|
static char *initial_path; /* = NULL */
|
|
static int initial_pathlen; /* = 0 */
|
|
static bool initial_cpp = true;
|
|
|
|
static void set_initial_path(char *fname)
|
|
{
|
|
int i, len = strlen(fname);
|
|
|
|
xasprintf(&initial_path, "%s", fname);
|
|
initial_pathlen = 0;
|
|
for (i = 0; i != len; i++)
|
|
if (initial_path[i] == '/')
|
|
initial_pathlen++;
|
|
}
|
|
|
|
static char *shorten_to_initial_path(char *fname)
|
|
{
|
|
char *p1, *p2, *prevslash1 = NULL;
|
|
int slashes = 0;
|
|
|
|
for (p1 = fname, p2 = initial_path; *p1 && *p2; p1++, p2++) {
|
|
if (*p1 != *p2)
|
|
break;
|
|
if (*p1 == '/') {
|
|
prevslash1 = p1;
|
|
slashes++;
|
|
}
|
|
}
|
|
p1 = prevslash1 + 1;
|
|
if (prevslash1) {
|
|
int diff = initial_pathlen - slashes, i, j;
|
|
int restlen = strlen(fname) - (p1 - fname);
|
|
char *res;
|
|
|
|
res = xmalloc((3 * diff) + restlen + 1);
|
|
for (i = 0, j = 0; i != diff; i++) {
|
|
res[j++] = '.';
|
|
res[j++] = '.';
|
|
res[j++] = '/';
|
|
}
|
|
strcpy(res + j, p1);
|
|
return res;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* Try to open a file in a given directory.
|
|
*
|
|
* If the filename is an absolute path, then dirname is ignored. If it is a
|
|
* relative path, then we look in that directory for the file.
|
|
*
|
|
* @param dirname Directory to look in, or NULL for none
|
|
* @param fname Filename to look for
|
|
* @param fp Set to NULL if file did not open
|
|
* @return allocated filename on success (caller must free), NULL on failure
|
|
*/
|
|
static char *try_open(const char *dirname, const char *fname, FILE **fp)
|
|
{
|
|
char *fullname;
|
|
|
|
if (!dirname || fname[0] == '/')
|
|
fullname = xstrdup(fname);
|
|
else
|
|
fullname = join_path(dirname, fname);
|
|
|
|
*fp = fopen(fullname, "rb");
|
|
if (!*fp) {
|
|
free(fullname);
|
|
fullname = NULL;
|
|
}
|
|
|
|
return fullname;
|
|
}
|
|
|
|
/**
|
|
* Open a file for read access
|
|
*
|
|
* If it is a relative filename, we search the full search path for it.
|
|
*
|
|
* @param fname Filename to open
|
|
* @param fp Returns pointer to opened FILE, or NULL on failure
|
|
* @return pointer to allocated filename, which caller must free
|
|
*/
|
|
static char *fopen_any_on_path(const char *fname, FILE **fp)
|
|
{
|
|
const char *cur_dir = NULL;
|
|
struct search_path *node;
|
|
char *fullname;
|
|
|
|
/* Try current directory first */
|
|
assert(fp);
|
|
if (current_srcfile)
|
|
cur_dir = current_srcfile->dir;
|
|
fullname = try_open(cur_dir, fname, fp);
|
|
|
|
/* Failing that, try each search path in turn */
|
|
for (node = search_path_head; !*fp && node; node = node->next)
|
|
fullname = try_open(node->dirname, fname, fp);
|
|
|
|
return fullname;
|
|
}
|
|
|
|
FILE *srcfile_relative_open(const char *fname, char **fullnamep)
|
|
{
|
|
FILE *f;
|
|
char *fullname;
|
|
|
|
if (streq(fname, "-")) {
|
|
f = stdin;
|
|
fullname = xstrdup("<stdin>");
|
|
} else {
|
|
fullname = fopen_any_on_path(fname, &f);
|
|
if (!f)
|
|
die("Couldn't open \"%s\": %s\n", fname,
|
|
strerror(errno));
|
|
}
|
|
|
|
if (depfile)
|
|
fprintf(depfile, " %s", fullname);
|
|
|
|
if (fullnamep)
|
|
*fullnamep = fullname;
|
|
else
|
|
free(fullname);
|
|
|
|
return f;
|
|
}
|
|
|
|
void srcfile_push(const char *fname)
|
|
{
|
|
struct srcfile_state *srcfile;
|
|
|
|
if (srcfile_depth++ >= MAX_SRCFILE_DEPTH)
|
|
die("Includes nested too deeply");
|
|
|
|
srcfile = xmalloc(sizeof(*srcfile));
|
|
|
|
srcfile->f = srcfile_relative_open(fname, &srcfile->name);
|
|
srcfile->dir = get_dirname(srcfile->name);
|
|
srcfile->prev = current_srcfile;
|
|
|
|
srcfile->lineno = 1;
|
|
srcfile->colno = 1;
|
|
|
|
current_srcfile = srcfile;
|
|
|
|
if (srcfile_depth == 1)
|
|
set_initial_path(srcfile->name);
|
|
}
|
|
|
|
bool srcfile_pop(void)
|
|
{
|
|
struct srcfile_state *srcfile = current_srcfile;
|
|
|
|
assert(srcfile);
|
|
|
|
current_srcfile = srcfile->prev;
|
|
|
|
if (fclose(srcfile->f))
|
|
die("Error closing \"%s\": %s\n", srcfile->name,
|
|
strerror(errno));
|
|
|
|
/* FIXME: We allow the srcfile_state structure to leak,
|
|
* because it could still be referenced from a location
|
|
* variable being carried through the parser somewhere. To
|
|
* fix this we could either allocate all the files from a
|
|
* table, or use a pool allocator. */
|
|
|
|
return current_srcfile ? true : false;
|
|
}
|
|
|
|
void srcfile_add_search_path(const char *dirname)
|
|
{
|
|
struct search_path *node;
|
|
|
|
/* Create the node */
|
|
node = xmalloc(sizeof(*node));
|
|
node->next = NULL;
|
|
node->dirname = xstrdup(dirname);
|
|
|
|
/* Add to the end of our list */
|
|
if (search_path_tail)
|
|
*search_path_tail = node;
|
|
else
|
|
search_path_head = node;
|
|
search_path_tail = &node->next;
|
|
}
|
|
|
|
void srcpos_update(struct srcpos *pos, const char *text, int len)
|
|
{
|
|
int i;
|
|
|
|
pos->file = current_srcfile;
|
|
|
|
pos->first_line = current_srcfile->lineno;
|
|
pos->first_column = current_srcfile->colno;
|
|
|
|
for (i = 0; i < len; i++)
|
|
if (text[i] == '\n') {
|
|
current_srcfile->lineno++;
|
|
current_srcfile->colno = 1;
|
|
} else {
|
|
current_srcfile->colno++;
|
|
}
|
|
|
|
pos->last_line = current_srcfile->lineno;
|
|
pos->last_column = current_srcfile->colno;
|
|
}
|
|
|
|
struct srcpos *
|
|
srcpos_copy(struct srcpos *pos)
|
|
{
|
|
struct srcpos *pos_new;
|
|
struct srcfile_state *srcfile_state;
|
|
|
|
if (!pos)
|
|
return NULL;
|
|
|
|
pos_new = xmalloc(sizeof(struct srcpos));
|
|
assert(pos->next == NULL);
|
|
memcpy(pos_new, pos, sizeof(struct srcpos));
|
|
|
|
/* allocate without free */
|
|
srcfile_state = xmalloc(sizeof(struct srcfile_state));
|
|
memcpy(srcfile_state, pos->file, sizeof(struct srcfile_state));
|
|
pos_new->file = srcfile_state;
|
|
|
|
return pos_new;
|
|
}
|
|
|
|
struct srcpos *srcpos_extend(struct srcpos *pos, struct srcpos *newtail)
|
|
{
|
|
struct srcpos *p;
|
|
|
|
if (!pos)
|
|
return newtail;
|
|
|
|
for (p = pos; p->next != NULL; p = p->next);
|
|
p->next = newtail;
|
|
return pos;
|
|
}
|
|
|
|
char *
|
|
srcpos_string(struct srcpos *pos)
|
|
{
|
|
const char *fname = "<no-file>";
|
|
char *pos_str;
|
|
|
|
if (pos->file && pos->file->name)
|
|
fname = pos->file->name;
|
|
|
|
|
|
if (pos->first_line != pos->last_line)
|
|
xasprintf(&pos_str, "%s:%d.%d-%d.%d", fname,
|
|
pos->first_line, pos->first_column,
|
|
pos->last_line, pos->last_column);
|
|
else if (pos->first_column != pos->last_column)
|
|
xasprintf(&pos_str, "%s:%d.%d-%d", fname,
|
|
pos->first_line, pos->first_column,
|
|
pos->last_column);
|
|
else
|
|
xasprintf(&pos_str, "%s:%d.%d", fname,
|
|
pos->first_line, pos->first_column);
|
|
|
|
return pos_str;
|
|
}
|
|
|
|
static char *
|
|
srcpos_string_comment(struct srcpos *pos, bool first_line, int level)
|
|
{
|
|
char *pos_str, *fresh_fname = NULL, *first, *rest;
|
|
const char *fname;
|
|
|
|
if (!pos) {
|
|
if (level > 1) {
|
|
xasprintf(&pos_str, "<no-file>:<no-line>");
|
|
return pos_str;
|
|
} else {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
if (!pos->file)
|
|
fname = "<no-file>";
|
|
else if (!pos->file->name)
|
|
fname = "<no-filename>";
|
|
else if (level > 1)
|
|
fname = pos->file->name;
|
|
else {
|
|
fresh_fname = shorten_to_initial_path(pos->file->name);
|
|
if (fresh_fname)
|
|
fname = fresh_fname;
|
|
else
|
|
fname = pos->file->name;
|
|
}
|
|
|
|
if (level > 1)
|
|
xasprintf(&first, "%s:%d:%d-%d:%d", fname,
|
|
pos->first_line, pos->first_column,
|
|
pos->last_line, pos->last_column);
|
|
else
|
|
xasprintf(&first, "%s:%d", fname,
|
|
first_line ? pos->first_line : pos->last_line);
|
|
|
|
if (fresh_fname)
|
|
free(fresh_fname);
|
|
|
|
if (pos->next != NULL) {
|
|
rest = srcpos_string_comment(pos->next, first_line, level);
|
|
xasprintf(&pos_str, "%s, %s", first, rest);
|
|
free(first);
|
|
free(rest);
|
|
} else {
|
|
pos_str = first;
|
|
}
|
|
|
|
return pos_str;
|
|
}
|
|
|
|
char *srcpos_string_first(struct srcpos *pos, int level)
|
|
{
|
|
return srcpos_string_comment(pos, true, level);
|
|
}
|
|
|
|
char *srcpos_string_last(struct srcpos *pos, int level)
|
|
{
|
|
return srcpos_string_comment(pos, false, level);
|
|
}
|
|
|
|
void srcpos_verror(struct srcpos *pos, const char *prefix,
|
|
const char *fmt, va_list va)
|
|
{
|
|
char *srcstr;
|
|
|
|
srcstr = srcpos_string(pos);
|
|
|
|
fprintf(stderr, "%s: %s ", prefix, srcstr);
|
|
vfprintf(stderr, fmt, va);
|
|
fprintf(stderr, "\n");
|
|
|
|
free(srcstr);
|
|
}
|
|
|
|
void srcpos_error(struct srcpos *pos, const char *prefix,
|
|
const char *fmt, ...)
|
|
{
|
|
va_list va;
|
|
|
|
va_start(va, fmt);
|
|
srcpos_verror(pos, prefix, fmt, va);
|
|
va_end(va);
|
|
}
|
|
|
|
void srcpos_set_line(char *f, int l)
|
|
{
|
|
current_srcfile->name = f;
|
|
current_srcfile->lineno = l;
|
|
|
|
if (initial_cpp) {
|
|
initial_cpp = false;
|
|
set_initial_path(f);
|
|
}
|
|
}
|