* SOFTWARE.
*/
+#define BT_LOG_OUTPUT_LEVEL log_level
#define BT_LOG_TAG "COMMON"
-#include "logging.h"
+#include "logging/log.h"
#include <unistd.h>
#include <string.h>
}
#endif /* __MINGW32__ */
+#ifdef __MINGW32__
+static
+const char *bt_get_home_dir(int log_level)
+{
+ return g_get_home_dir();
+}
+#else /* __MINGW32__ */
static
-char *bt_secure_getenv(const char *name)
+char *bt_secure_getenv(const char *name, int log_level)
{
if (bt_common_is_setuid_setgid()) {
BT_LOGD("Disregarding environment variable for setuid/setgid binary: "
return getenv(name);
}
-#ifdef __MINGW32__
static
-const char *bt_get_home_dir(void)
-{
- return g_get_home_dir();
-}
-#else /* __MINGW32__ */
-static
-const char *bt_get_home_dir(void)
+const char *bt_get_home_dir(int log_level)
{
char *val = NULL;
struct passwd *pwd;
- val = bt_secure_getenv(HOME_ENV_VAR);
+ val = bt_secure_getenv(HOME_ENV_VAR, log_level);
if (val) {
goto end;
}
#endif /* __MINGW32__ */
BT_HIDDEN
-char *bt_common_get_home_plugin_path(void)
+char *bt_common_get_home_plugin_path(int log_level)
{
char *path = NULL;
const char *home_dir;
size_t length;
- home_dir = bt_get_home_dir();
+ home_dir = bt_get_home_dir(log_level);
if (!home_dir) {
goto end;
}
length = strlen(home_dir) + strlen(HOME_PLUGIN_SUBPATH) + 1;
if (length >= PATH_MAX) {
- BT_LOGW("Home directory path is too long: length=%zu",
- length);
+ BT_LOGW("Home directory path is too long: "
+ "length=%zu, max-length=%u", length, PATH_MAX);
goto end;
}
return p[-1] == '*' && at_end_of_pattern(p, pattern, pattern_len);
}
+#ifdef __MINGW32__
+BT_HIDDEN
+GString *bt_common_normalize_path(const char *path, const char *wd)
+{
+ char *tmp;
+ GString *norm_path = NULL;
+
+ BT_ASSERT(path);
+
+ tmp = _fullpath(NULL, path, PATH_MAX);
+ if (!tmp) {
+ goto error;
+ }
+
+ norm_path = g_string_new(tmp);
+ if (!norm_path) {
+ goto error;
+ }
+
+ goto end;
+error:
+ if (norm_path) {
+ g_string_free(norm_path, TRUE);
+ norm_path = NULL;
+ }
+end:
+ if (tmp) {
+ free(tmp);
+ }
+ return norm_path;
+}
+#else
static
void append_path_parts(const char *path, GPtrArray *parts)
{
(void) g_string_free(gstring, TRUE);
}
-#ifdef __MINGW32__
-BT_HIDDEN
-GString *bt_common_normalize_path(const char *path, const char *wd)
-{
- char *tmp;
- GString *norm_path = NULL;
-
- BT_ASSERT(path);
-
- tmp = _fullpath(NULL, path, PATH_MAX);
- if (!tmp) {
- goto error;
- }
-
- norm_path = g_string_new(tmp);
- if (!norm_path) {
- goto error;
- }
-
- goto end;
-error:
- if (norm_path) {
- g_string_free(norm_path, TRUE);
- norm_path = NULL;
- }
-end:
- if (tmp) {
- free(tmp);
- }
- return norm_path;
-}
-#else
BT_HIDDEN
GString *bt_common_normalize_path(const char *path, const char *wd)
{
#endif
BT_HIDDEN
-size_t bt_common_get_page_size(void)
+size_t bt_common_get_page_size(int log_level)
{
int page_size;