diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug.c | 16 | ||||
| -rw-r--r-- | src/debug.h | 9 | ||||
| -rw-r--r-- | src/lockdown.c | 13 |
3 files changed, 31 insertions, 7 deletions
diff --git a/src/debug.c b/src/debug.c index 2cdeebf..b194b0d 100644 --- a/src/debug.c +++ b/src/debug.c @@ -3,6 +3,7 @@ * contains utilitary functions for debugging * * Copyright (c) 2008 Jonathan Beck All Rights Reserved. + * Copyright (c) 2010 Martin S. All Rights Reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,10 +57,12 @@ static void debug_print_line(const char *func, const char *file, int line, const (void)asprintf(&header, "%s %s:%d %s()", str_time, file, line, func); free (str_time); - /* always in light green */ + /* trim ending newlines */ + + /* print header */ printf ("%s: ", header); - /* different colors according to the severity */ + /* print actual debug content */ printf ("%s\n", buffer); /* flush this output, as we need to debug */ @@ -135,7 +138,7 @@ inline void debug_buffer_to_file(const char *file, const char *data, const int l #endif } -inline void debug_plist(plist_t plist) +inline void debug_plist_real(const char *func, const char *file, int line, plist_t plist) { #ifndef STRIP_DEBUG_CODE if (!plist) @@ -144,7 +147,12 @@ inline void debug_plist(plist_t plist) char *buffer = NULL; uint32_t length = 0; plist_to_xml(plist, &buffer, &length); - debug_info("plist size: %i\nbuffer :\n%s", length, buffer); + + /* get rid of ending newline as one is already added in the debug line */ + if (buffer[length-1] == '\n') + buffer[length-1] = '\0'; + + debug_info_real(func, file, line, "printing %i bytes plist:\n%s", length, buffer); free(buffer); #endif } diff --git a/src/debug.h b/src/debug.h index 0a29be3..2fd0960 100644 --- a/src/debug.h +++ b/src/debug.h @@ -3,6 +3,7 @@ * contains utilitary functions for debugging * * Copyright (c) 2008 Jonathan Beck All Rights Reserved. + * Copyright (c) 2010 Martin S. All Rights Reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,10 +28,13 @@ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && !defined(STRIP_DEBUG_CODE) #define debug_info(...) debug_info_real (__func__, __FILE__, __LINE__, __VA_ARGS__) +#define debug_plist(a) debug_plist_real (__func__, __FILE__, __LINE__, a) #elif defined(__GNUC__) && __GNUC__ >= 3 && !defined(STRIP_DEBUG_CODE) #define debug_info(...) debug_info_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) +#define debug_plist(a) debug_plist_real (__FUNCTION__, __FILE__, __LINE__, a) #else #define debug_info(...) +#define debug_plist(a) #endif G_GNUC_INTERNAL inline void debug_info_real(const char *func, @@ -40,6 +44,9 @@ G_GNUC_INTERNAL inline void debug_info_real(const char *func, G_GNUC_INTERNAL inline void debug_buffer(const char *data, const int length); G_GNUC_INTERNAL inline void debug_buffer_to_file(const char *file, const char *data, const int length); -G_GNUC_INTERNAL inline void debug_plist(plist_t plist); +G_GNUC_INTERNAL inline void debug_plist_real(const char *func, + const char *file, + int line, + plist_t plist); #endif diff --git a/src/lockdown.c b/src/lockdown.c index 1befb72..8f15b3f 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -1262,9 +1262,18 @@ lockdownd_error_t lockdownd_start_service(lockdownd_client_t client, const char if (port && ret == LOCKDOWN_E_SUCCESS) *port = port_loc; } - } - else + } else { ret = LOCKDOWN_E_START_SERVICE_FAILED; + plist_t error_node = plist_dict_get_item(dict, "Error"); + if (error_node && PLIST_STRING == plist_get_node_type(error_node)) { + char *error = NULL; + plist_get_string_val(error_node, &error); + if (!strcmp(error, "InvalidService")) { + ret = LOCKDOWN_E_INVALID_SERVICE; + } + free(error); + } + } plist_free(dict); dict = NULL; |