projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add procps as a build dep
[debian/amanda]
/
server-src
/
logfile.c
diff --git
a/server-src/logfile.c
b/server-src/logfile.c
index c1d3e26b35ac1609dfc408b5c721c2df2c2cbf94..488bdca5c3e05835f2a384d5f9ead82a45ffdfae 100644
(file)
--- a/
server-src/logfile.c
+++ b/
server-src/logfile.c
@@
-42,7
+42,8
@@
char *logtype_str[] = {
"ERROR", "WARNING", "INFO", "SUMMARY", /* information messages */
"START", "FINISH", /* start/end of a run */
"DISK", /* disk */
"ERROR", "WARNING", "INFO", "SUMMARY", /* information messages */
"START", "FINISH", /* start/end of a run */
"DISK", /* disk */
- "SUCCESS", "PARTIAL", "FAIL", "STRANGE", /* the end of a dump */
+ /* the end of a dump */
+ "DONE", "PART", "PARTPARTIAL", "SUCCESS", "PARTIAL", "FAIL", "STRANGE",
"CHUNK", "CHUNKSUCCESS", /* ... continued */
"STATS", /* statistics */
"MARKER", /* marker for reporter */
"CHUNK", "CHUNKSUCCESS", /* ... continued */
"STATS", /* statistics */
"MARKER", /* marker for reporter */
@@
-51,7
+52,7
@@
char *logtype_str[] = {
char *program_str[] = {
"UNKNOWN", "planner", "driver", "amreport", "dumper", "chunker",
char *program_str[] = {
"UNKNOWN", "planner", "driver", "amreport", "dumper", "chunker",
- "taper", "amflush"
+ "taper", "amflush"
, "amdump", "amidxtaped", "amfetchdump", "amcheckdump"
};
int curlinenum;
};
int curlinenum;
@@
-89,7
+90,7
@@
printf_arglist_function2(char *log_genstring, logtype_t, typ, char *, pname, cha
va_list argp;
char *leader = NULL;
char linebuf[STR_SIZE];
va_list argp;
char *leader = NULL;
char linebuf[STR_SIZE];
-
+ char *xlated_fmt = dgettext("C", format);
/* format error message */
/* format error message */
@@
-102,8
+103,9
@@
printf_arglist_function2(char *log_genstring, logtype_t, typ, char *, pname, cha
}
arglist_start(argp, format);
}
arglist_start(argp, format);
-
vsnprintf(linebuf, SIZEOF(linebuf)-1, forma
t, argp);
+
g_vsnprintf(linebuf, SIZEOF(linebuf)-1, xlated_fm
t, argp);
/* -1 to allow for '\n' */
/* -1 to allow for '\n' */
+ arglist_end(argp);
return(vstralloc(leader, linebuf, "\n", NULL));
}
return(vstralloc(leader, linebuf, "\n", NULL));
}
@@
-112,10
+114,10
@@
printf_arglist_function1(void log_add, logtype_t, typ, char *, format)
va_list argp;
int saved_errout;
char *leader = NULL;
va_list argp;
int saved_errout;
char *leader = NULL;
+ char *xlated_fmt = gettext(format);
char linebuf[STR_SIZE];
size_t n;
char linebuf[STR_SIZE];
size_t n;
-
/* format error message */
if((int)typ <= (int)L_BOGUS || (int)typ > (int)L_MARKER) typ = L_BOGUS;
/* format error message */
if((int)typ <= (int)L_BOGUS || (int)typ > (int)L_MARKER) typ = L_BOGUS;
@@
-127,7
+129,8
@@
printf_arglist_function1(void log_add, logtype_t, typ, char *, format)
}
arglist_start(argp, format);
}
arglist_start(argp, format);
- vsnprintf(linebuf, SIZEOF(linebuf)-1, format, argp);
+ /* use sizeof(linebuf)-2 to save space for a trailing newline */
+ g_vsnprintf(linebuf, SIZEOF(linebuf)-2, xlated_fmt, argp);
/* -1 to allow for '\n' */
arglist_end(argp);
/* -1 to allow for '\n' */
arglist_end(argp);
@@
-140,19
+143,20
@@
printf_arglist_function1(void log_add, logtype_t, typ, char *, format)
if(multiline == -1) open_log();
if(multiline == -1) open_log();
- if (full
write(logfd, leader, strlen(leader)) < 0
) {
- error(
"log file write error: %s"
, strerror(errno));
+ if (full
_write(logfd, leader, strlen(leader)) < strlen(leader)
) {
+ error(
_("log file write error: %s")
, strerror(errno));
/*NOTREACHED*/
}
amfree(leader);
/*NOTREACHED*/
}
amfree(leader);
+ /* add a newline if necessary */
n = strlen(linebuf);
if(n == 0 || linebuf[n-1] != '\n') linebuf[n++] = '\n';
linebuf[n] = '\0';
n = strlen(linebuf);
if(n == 0 || linebuf[n-1] != '\n') linebuf[n++] = '\n';
linebuf[n] = '\0';
- if (full
write(logfd, linebuf, n) < 0
) {
- error(
"log file write error: %s"
, strerror(errno));
+ if (full
_write(logfd, linebuf, n) < n
) {
+ error(
_("log file write error: %s")
, strerror(errno));
/*NOTREACHED*/
}
/*NOTREACHED*/
}
@@
-194,16
+198,11
@@
log_rename(
if(datestamp == NULL) datestamp = "error";
if(datestamp == NULL) datestamp = "error";
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
for(seq = 0; 1; seq++) { /* if you've got MAXINT files in your dir... */
logfile = vstralloc(conf_logdir, "/log", NULL);
for(seq = 0; 1; seq++) { /* if you've got MAXINT files in your dir... */
- snprintf(seq_str, SIZEOF(seq_str), "%u", seq);
+
g_
snprintf(seq_str, SIZEOF(seq_str), "%u", seq);
fname = newvstralloc(fname,
logfile,
".", datestamp,
fname = newvstralloc(fname,
logfile,
".", datestamp,
@@
-213,7
+212,7
@@
log_rename(
}
if(rename(logfile, fname) == -1) {
}
if(rename(logfile, fname) == -1) {
- error(
"could not rename \"%s\" to \"%s\": %s"
,
+ error(
_("could not rename \"%s\" to \"%s\": %s")
,
logfile, fname, strerror(errno));
/*NOTREACHED*/
}
logfile, fname, strerror(errno));
/*NOTREACHED*/
}
@@
-229,24
+228,24
@@
open_log(void)
{
char *conf_logdir;
{
char *conf_logdir;
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ /* now that we have a logfile, let the debug module know how to write
+ * error messages to it. This is due to some rather obscure linking
+ * problems. */
+ set_logerror(logerror);
+
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
amfree(conf_logdir);
logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600);
if(logfd == -1) {
logfile = vstralloc(conf_logdir, "/log", NULL);
amfree(conf_logdir);
logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600);
if(logfd == -1) {
- error(
"could not open log file %s: %s"
, logfile, strerror(errno));
+ error(
_("could not open log file %s: %s")
, logfile, strerror(errno));
/*NOTREACHED*/
}
if(amflock(logfd, "log") == -1) {
/*NOTREACHED*/
}
if(amflock(logfd, "log") == -1) {
- error(
"could not lock log file %s: %s"
, logfile, strerror(errno));
+ error(
_("could not lock log file %s: %s")
, logfile, strerror(errno));
/*NOTREACHED*/
}
}
/*NOTREACHED*/
}
}
@@
-256,12
+255,12
@@
static void
close_log(void)
{
if(amfunlock(logfd, "log") == -1) {
close_log(void)
{
if(amfunlock(logfd, "log") == -1) {
- error(
"could not unlock log file %s: %s"
, logfile, strerror(errno));
+ error(
_("could not unlock log file %s: %s")
, logfile, strerror(errno));
/*NOTREACHED*/
}
if(close(logfd) == -1) {
/*NOTREACHED*/
}
if(close(logfd) == -1) {
- error(
"close log file: %s"
, strerror(errno));
+ error(
_("close log file: %s")
, strerror(errno));
/*NOTREACHED*/
}
/*NOTREACHED*/
}
@@
-269,7
+268,8
@@
close_log(void)
amfree(logfile);
}
amfree(logfile);
}
-
+/* WARNING: Function accesses globals curstr, curlog, and curprog
+ * WARNING: Function has static member logline, returned via globals */
int
get_logline(
FILE * logf)
int
get_logline(
FILE * logf)