#include "gnunet_strings_lib.h"
#include "gnunet_time_lib.h"
+#include <regex.h>
+
/**
* After how many milliseconds do we always print
* that "message X was repeated N times"? Use 12h.
struct LogDef
{
/**
- * Component name. NULL means that this definition matches any component
+ * Component name regex
*/
- char *component;
+ regex_t component_regex;
/**
- * File name. NULL means that this definition matches any file
+ * File name regex
*/
- char *file;
+ regex_t file_regex;
/**
- * Stores strlen(file)
+ * Function name regex
*/
- int strlen_file;
-
- /**
- * Function name. NULL means that this definition matches any function
- */
- char *function;
+ regex_t function_regex;
/**
* Lowest line at which this definition matches.
logdefs = GNUNET_realloc (logdefs, logdefs_size * sizeof (struct LogDef));
}
+
+/**
+ * Abort the process, generate a core dump if possible.
+ */
+void
+GNUNET_abort ()
+{
+#if WINDOWS
+ DebugBreak ();
+#endif
+ abort ();
+}
+
+
/**
* Utility function - adds a parsed definition to logdefs array.
*
* @param to_line see struct LogDef
* @param level see struct LogDef, must be >= 0
* @param force see struct LogDef
+ * @return 0 on success, regex-specific error otherwise
*/
-static void
+static int
add_definition (char *component, char *file, char *function, int from_line,
int to_line, int level, int force)
{
- if (logdefs_size == logdefs_len)
- resize_logdefs ();
struct LogDef n;
+ int r;
+ if (logdefs_size == logdefs_len)
+ resize_logdefs ();
memset (&n, 0, sizeof (n));
- if (strlen (component) > 0 && component[0] != '*')
- n.component = GNUNET_strdup (component);
- if (strlen (file) > 0 && file[0] != '*')
+ if (strlen (component) == 0)
+ component = (char *) ".*";
+ r = regcomp (&n.component_regex, (const char *) component, REG_NOSUB);
+ if (r != 0)
+ {
+ return r;
+ }
+ if (strlen (file) == 0)
+ file = (char *) ".*";
+ r = regcomp (&n.file_regex, (const char *) file, REG_NOSUB);
+ if (r != 0)
+ {
+ regfree (&n.component_regex);
+ return r;
+ }
+ if ((NULL == function) || (strlen (function) == 0))
+ function = (char *) ".*";
+ r = regcomp (&n.function_regex, (const char *) function, REG_NOSUB);
+ if (r != 0)
{
- n.file = GNUNET_strdup (file);
- n.strlen_file = strlen (file);
+ regfree (&n.component_regex);
+ regfree (&n.file_regex);
+ return r;
}
- if ((NULL != function) && (strlen (function) > 0) && (function[0] != '*'))
- n.function = GNUNET_strdup (function);
n.from_line = from_line;
n.to_line = to_line;
n.level = level;
n.force = force;
logdefs[logdefs_len++] = n;
+ return 0;
}
struct LogDef *ld;
int i;
int force_only;
- size_t strlen_file;
if (comp == NULL)
/* Use default component */
/* Only look for forced definitions? */
force_only = min_level >= 0;
- strlen_file = strlen (file);
for (i = 0; i < logdefs_len; i++)
{
ld = &logdefs[i];
if ((!force_only || ld->force) &&
- (line >= ld->from_line && line <= ld->to_line) && (ld->component == NULL
- || strcmp (comp,
- ld->component)
- == 0) &&
- (ld->file == NULL ||
- (ld->strlen_file <= strlen_file &&
- strcmp (&file[strlen_file - ld->strlen_file], ld->file) == 0)) &&
- (ld->function == NULL || strcmp (function, ld->function) == 0))
+ (line >= ld->from_line && line <= ld->to_line) &&
+ (regexec (&ld->component_regex, comp, 0, NULL, 0) == 0) &&
+ (regexec (&ld->file_regex, file, 0, NULL, 0) == 0) &&
+ (regexec (&ld->function_regex, function, 0, NULL, 0) == 0))
{
/* We're finished */
return caller_level <= ld->level;
*
* @param constname name of the environment variable from which to get the
* string to be parsed
- * @param force 1 if definitions found in @constname are to be forced
+ * @param force 1 if definitions found in constname are to be forced
* @return number of added definitions
*/
static int
state = 0;
level = get_type ((const char *) start);
if (level == GNUNET_ERROR_TYPE_INVALID ||
- level == GNUNET_ERROR_TYPE_UNSPECIFIED)
+ level == GNUNET_ERROR_TYPE_UNSPECIFIED ||
+ 0 != add_definition (comp, file, function, from_line, to_line,
+ level, force))
{
free (def);
return counter;
}
- add_definition (comp, file, function, from_line, to_line, level, force);
counter += 1;
start = p + 1;
break;
int dirwarn;
char *fn;
const char *env_logfile = NULL;
+ int altlog_fd;
min_level = get_type (loglevel);
#if !defined(GNUNET_CULL_LOGGING)
component_nopid = GNUNET_strdup (comp);
env_logfile = getenv ("GNUNET_FORCE_LOGFILE");
- if (env_logfile != NULL)
+ if ((env_logfile != NULL) && (strlen (env_logfile) > 0))
logfile = env_logfile;
if (logfile == NULL)
if (NULL == fn)
return GNUNET_SYSERR;
dirwarn = (GNUNET_OK != GNUNET_DISK_directory_create_for_file (fn));
- altlog = FOPEN (fn, "a");
- if (altlog == NULL)
+ altlog_fd = OPEN (fn, O_APPEND |
+#if WINDOWS
+ O_BINARY |
+#endif
+ O_WRONLY | O_CREAT,
+#if WINDOWS
+ _S_IREAD | _S_IWRITE
+#else
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
+#endif
+ );
+ if (altlog_fd != -1)
+ {
+ int dup_return;
+ if (GNUNET_stderr != NULL)
+ fclose (GNUNET_stderr);
+ dup_return = dup2 (altlog_fd, 2);
+ close (altlog_fd);
+ if (dup_return != -1)
+ {
+ altlog = fdopen (2, "ab");
+ if (altlog == NULL)
+ {
+ close (2);
+ altlog_fd = -1;
+ }
+ }
+ else
+ {
+ altlog_fd = -1;
+ }
+ }
+ if (altlog_fd == -1)
{
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", fn);
if (dirwarn)
return GNUNET_SYSERR;
}
GNUNET_free (fn);
- if (GNUNET_stderr != NULL)
- fclose (GNUNET_stderr);
GNUNET_stderr = altlog;
return GNUNET_OK;
}