cutils: introduce get_relocated_path
Add the function that will compute a relocated version of the directories in CONFIG_QEMU_*DIR and CONFIG_QEMU_*PATH. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
9386a4a715
commit
f4f5ed2cbd
@ -184,4 +184,16 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n);
|
||||
*/
|
||||
int qemu_pstrcmp0(const char **str1, const char **str2);
|
||||
|
||||
|
||||
/**
|
||||
* get_relocated_path:
|
||||
* @dir: the directory (typically a `CONFIG_*DIR` variable) to be relocated.
|
||||
*
|
||||
* Returns a path for @dir that uses the directory of the running executable
|
||||
* as the prefix. For example, if `bindir` is `/usr/bin` and @dir is
|
||||
* `/usr/share/qemu`, the function will append `../share/qemu` to the
|
||||
* directory that contains the running executable and return the result.
|
||||
*/
|
||||
char *get_relocated_path(const char *dir);
|
||||
|
||||
#endif
|
||||
|
@ -560,9 +560,9 @@ config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('.')[1]
|
||||
config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2])
|
||||
|
||||
arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
|
||||
strings = ['HOST_DSOSUF', 'CONFIG_IASL', 'bindir', 'qemu_confdir', 'qemu_datadir',
|
||||
strings = ['HOST_DSOSUF', 'CONFIG_IASL', 'bindir', 'prefix', 'qemu_confdir', 'qemu_datadir',
|
||||
'qemu_moddir', 'qemu_localstatedir', 'qemu_helperdir', 'qemu_localedir',
|
||||
'qemu_icondir', 'qemu_desktopdir', 'qemu_firmwarepath']
|
||||
'qemu_icondir', 'qemu_desktopdir', 'qemu_firmwarepath', 'sysconfdir']
|
||||
foreach k, v: config_host
|
||||
if arrays.contains(k)
|
||||
if v != ''
|
||||
|
@ -889,3 +889,64 @@ int qemu_pstrcmp0(const char **str1, const char **str2)
|
||||
{
|
||||
return g_strcmp0(*str1, *str2);
|
||||
}
|
||||
|
||||
static inline bool starts_with_prefix(const char *dir)
|
||||
{
|
||||
size_t prefix_len = strlen(CONFIG_PREFIX);
|
||||
return !memcmp(dir, CONFIG_PREFIX, prefix_len) &&
|
||||
(!dir[prefix_len] || G_IS_DIR_SEPARATOR(dir[prefix_len]));
|
||||
}
|
||||
|
||||
/* Return the next path component in dir, and store its length in *p_len. */
|
||||
static inline const char *next_component(const char *dir, int *p_len)
|
||||
{
|
||||
int len;
|
||||
while (*dir && G_IS_DIR_SEPARATOR(*dir)) {
|
||||
dir++;
|
||||
}
|
||||
len = 0;
|
||||
while (dir[len] && !G_IS_DIR_SEPARATOR(dir[len])) {
|
||||
len++;
|
||||
}
|
||||
*p_len = len;
|
||||
return dir;
|
||||
}
|
||||
|
||||
char *get_relocated_path(const char *dir)
|
||||
{
|
||||
size_t prefix_len = strlen(CONFIG_PREFIX);
|
||||
const char *bindir = CONFIG_BINDIR;
|
||||
const char *exec_dir = qemu_get_exec_dir();
|
||||
GString *result;
|
||||
int len_dir, len_bindir;
|
||||
|
||||
/* Fail if qemu_init_exec_dir was not called. */
|
||||
assert(exec_dir[0]);
|
||||
if (!starts_with_prefix(dir) || !starts_with_prefix(bindir)) {
|
||||
return strdup(dir);
|
||||
}
|
||||
|
||||
result = g_string_new(exec_dir);
|
||||
|
||||
/* Advance over common components. */
|
||||
len_dir = len_bindir = prefix_len;
|
||||
do {
|
||||
dir += len_dir;
|
||||
bindir += len_bindir;
|
||||
dir = next_component(dir, &len_dir);
|
||||
bindir = next_component(bindir, &len_bindir);
|
||||
} while (len_dir == len_bindir && !memcmp(dir, bindir, len_dir));
|
||||
|
||||
/* Ascend from bindir to the common prefix with dir. */
|
||||
while (len_bindir) {
|
||||
bindir += len_bindir;
|
||||
g_string_append(result, "/..");
|
||||
bindir = next_component(bindir, &len_bindir);
|
||||
}
|
||||
|
||||
if (*dir) {
|
||||
assert(G_IS_DIR_SEPARATOR(dir[-1]));
|
||||
g_string_append(result, dir - 1);
|
||||
}
|
||||
return result->str;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user