d68cb36b0b
This patch cleans up our handling of input files, particularly dts source files, but also (to an extent) other input files such as those used by /incbin/ and those used in -I dtb and -I fs modes. We eliminate the current clunky mechanism which combines search paths (which we don't actually use at present) with the open relative to current source file behaviour, which we do. Instead there's a single srcfile_relative_open() entry point for callers which opens a new input file relative to the current source file (which the srcpos code tracks internally). It doesn't currently do search paths, but we can add that later without messing with the callers, by drawing the search path from a global (which makes sense anyway, rather than shuffling it around the rest of the processing code). That suffices for non-dts input files. For the actual dts files, srcfile_push() and srcfile_pop() wrappers open the file while also keeping track of it as the current source file for future opens. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
56 lines
1.4 KiB
C
56 lines
1.4 KiB
C
#ifndef _UTIL_H
|
|
#define _UTIL_H
|
|
|
|
/*
|
|
* Copyright 2008 Jon Loeliger, Freescale Semiconductor, Inc.
|
|
*
|
|
* This program 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 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
static inline void __attribute__((noreturn)) die(char * str, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, str);
|
|
fprintf(stderr, "FATAL ERROR: ");
|
|
vfprintf(stderr, str, ap);
|
|
exit(1);
|
|
}
|
|
|
|
static inline void *xmalloc(size_t len)
|
|
{
|
|
void *new = malloc(len);
|
|
|
|
if (!new)
|
|
die("malloc() failed\n");
|
|
|
|
return new;
|
|
}
|
|
|
|
static inline void *xrealloc(void *p, size_t len)
|
|
{
|
|
void *new = realloc(p, len);
|
|
|
|
if (!new)
|
|
die("realloc() failed (len=%d)\n", len);
|
|
|
|
return new;
|
|
}
|
|
|
|
extern char *xstrdup(const char *s);
|
|
extern char *join_path(const char *path, const char *name);
|
|
|
|
#endif /* _UTIL_H */
|