projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Towards 2.0.5
[yaz-moved-to-github.git]
/
util
/
log.c
diff --git
a/util/log.c
b/util/log.c
index
cfcbf77
..
90a2c5b
100644
(file)
--- a/
util/log.c
+++ b/
util/log.c
@@
-2,7
+2,7
@@
* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.36 2003-02-12 14:17:50 heikki Exp $
+ * $Id: log.c,v 1.39 2003-10-09 15:51:36 adam Exp $
*/
#if HAVE_CONFIG_H
*/
#if HAVE_CONFIG_H
@@
-40,6
+40,7
@@
static int l_level = LOG_DEFAULT_LEVEL;
static FILE *l_file = NULL;
static char l_prefix[512] = "";
static char l_prefix2[512] = "";
static FILE *l_file = NULL;
static char l_prefix[512] = "";
static char l_prefix2[512] = "";
+static char l_fname[512] = "";
static struct {
int mask;
static struct {
int mask;
@@
-54,7
+55,9
@@
static struct {
{ LOG_MALLOC, "malloc"},
{ LOG_APP, "app" },
{ LOG_NOTIME, "" },
{ LOG_MALLOC, "malloc"},
{ LOG_APP, "app" },
{ LOG_NOTIME, "" },
- /* { LOG_ALL, "all" }, */
+ { LOG_APP2 , "app2" },
+ { LOG_APP3 , "app3" },
+ { LOG_ALL, "all" },
{ 0, "none" },
{ 0, NULL }
};
{ 0, "none" },
{ 0, NULL }
};
@@
-68,12
+71,25
@@
FILE *yaz_log_file(void)
void yaz_log_init_file (const char *fname)
{
void yaz_log_init_file (const char *fname)
{
+ if (fname)
+ {
+ strncpy(l_fname, fname, sizeof(l_fname)-1);
+ l_fname[sizeof(l_fname)-1] = '\0';
+ }
+ else
+ l_fname[0] = '\0';
+ yaz_log_reopen();
+}
+
+void yaz_log_reopen(void)
+{
FILE *new_file;
if (!l_file)
l_file = stderr;
FILE *new_file;
if (!l_file)
l_file = stderr;
- if (!fname || !*fname)
+
+ if (!*l_fname)
new_file=stderr;
new_file=stderr;
- else if (!(new_file = fopen(fname, "a")))
+ else if (!(new_file = fopen(l_fname, "a")))
return;
if (l_file != stderr)
{
return;
if (l_file != stderr)
{