Only insert the filename into the log, not the path.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2408 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Angus Salkeld 2009-09-09 00:25:36 +00:00
parent 7f3da97ca3
commit f3b92eb6b3
2 changed files with 19 additions and 2 deletions

View File

@ -41,6 +41,13 @@ if test "$prefix" = "NONE"; then
fi
fi
if test "$srcdir" = "."; then
AC_MSG_NOTICE([building in place srcdir:$srcdir])
AC_DEFINE([BUILDING_IN_PLACE], 1, [building in place])
else
AC_MSG_NOTICE([building out of tree srcdir:$srcdir])
fi
# Checks for programs.
# check stolen from gnulib/m4/gnu-make.m4

View File

@ -1303,6 +1303,7 @@ void _logsys_log_vprintf (
unsigned int len;
unsigned int level;
int subsysid;
char * short_file_name;
subsysid = LOGSYS_DECODE_SUBSYSID(rec_ident);
level = LOGSYS_DECODE_LEVEL(rec_ident);
@ -1318,6 +1319,15 @@ void _logsys_log_vprintf (
logsys_print_buffer[len - 1] = '\0';
len -= 1;
}
#ifdef BUILDING_IN_PLACE
short_file_name = file_name;
#else
short_file_name = strrchr (file_name, '/');
if (short_file_name == NULL)
short_file_name = file_name;
else
short_file_name++; /* move past the "/" */
#endif /* BUILDING_IN_PLACE */
/*
* Create a log record
@ -1325,7 +1335,7 @@ void _logsys_log_vprintf (
_logsys_log_rec (
rec_ident,
function_name,
file_name,
short_file_name,
file_line,
logsys_print_buffer, len + 1,
LOGSYS_REC_END);
@ -1336,7 +1346,7 @@ void _logsys_log_vprintf (
* expect the worker thread to output the log data once signaled
*/
log_printf_to_logs (rec_ident,
file_name, function_name, file_line,
short_file_name, function_name, file_line,
logsys_print_buffer);
} else {
/*