diff --git a/lash_compat/liblash/lash.c b/lash_compat/liblash/lash.c index 7e271021..2342534e 100644 --- a/lash_compat/liblash/lash.c +++ b/lash_compat/liblash/lash.c @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2009 Nedko Arnaudov + * Copyright (C) 2009,2010 Nedko Arnaudov * ************************************************************************** * This file contains the liblash implementaiton @@ -25,6 +25,7 @@ */ #include "lash/lash.h" +#include "../../common/catdup.h" const char * lash_protocol_string(lash_protocol_t protocol) { @@ -247,3 +248,17 @@ void lash_config_set_value_double(lash_config_t * config, double value) void lash_config_set_value_string(lash_config_t * config, const char * value) { } + +const char * lash_get_fqn(const char * dir, const char * file) +{ + static char * fqn = NULL; + + if (fqn != NULL) + { + free(fqn); + } + + fqn = catdup3(dir, "/", file); + + return fqn; +} diff --git a/lash_compat/liblash/lash/lash.h b/lash_compat/liblash/lash/lash.h index 3b54203f..798c2218 100644 --- a/lash_compat/liblash/lash/lash.h +++ b/lash_compat/liblash/lash/lash.h @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2009 Nedko Arnaudov + * Copyright (C) 2009,2010 Nedko Arnaudov * Copyright (C) 2002 Robert Ham * ************************************************************************** @@ -156,6 +156,9 @@ void lash_config_set_value_float(lash_config_t * config, float value); void lash_config_set_value_double(lash_config_t * config, double value); void lash_config_set_value_string(lash_config_t * config, const char * value); +/* internal function in lash-0.5.x, depecated in lash-0.6.x, used by jack-rack */ +const char * lash_get_fqn(const char * dir, const char * file); + #ifdef __cplusplus } #endif diff --git a/wscript b/wscript index c3ef3ca7..2cf11f26 100644 --- a/wscript +++ b/wscript @@ -386,7 +386,7 @@ def build(bld): liblash.target = 'lash' liblash.vnum = "1.1.1" liblash.defines = ['LOG_OUTPUT_STDOUT'] - liblash.source = [os.path.join("lash_compat", "liblash", 'lash.c')] + liblash.source = [os.path.join("lash_compat", "liblash", 'lash.c'), os.path.join("common", "catdup.c")] bld.install_files('${PREFIX}/include/lash', 'lash_compat/liblash/lash/*.h')