projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move gbp.conf into debian/
[debian/amanda]
/
server-src
/
reporter.c
diff --git
a/server-src/reporter.c
b/server-src/reporter.c
index f9fabea9535f5ed26d7096d5e198bd1219454e6d..3b0410b7d3fbb7281f07d5b372491e079e2379f5 100644
(file)
--- a/
server-src/reporter.c
+++ b/
server-src/reporter.c
@@
-1975,7
+1975,7
@@
handle_note(void)
BSTRNCMP(curstr, "Taper protocol error") == 0) {
exit_status |= STATUS_TAPE;
}
BSTRNCMP(curstr, "Taper protocol error") == 0) {
exit_status |= STATUS_TAPE;
}
- pidstr =
index
(curstr,' ');
+ pidstr =
strchr
(curstr,' ');
if (pidstr) {
pidstr++;
}
if (pidstr) {
pidstr++;
}
@@
-2140,6
+2140,8
@@
handle_chunk(
amfree(label);
return NULL;
}
amfree(label);
return NULL;
}
+ /* set tapefcount, it is increased below */
+ tapefcount = fileno - 1;
skip_integer(s, ch);
skip_whitespace(s, ch);
if(ch == '\0') {
skip_integer(s, ch);
skip_whitespace(s, ch);
if(ch == '\0') {
@@
-2259,8
+2261,9
@@
handle_chunk(
if(current_tape == NULL) {
error("current_tape == NULL");
}
if(current_tape == NULL) {
error("current_tape == NULL");
}
+ ++tapefcount;
if (sp->filenum == 0) {
if (sp->filenum == 0) {
- sp->filenum =
++
tapefcount;
+ sp->filenum = tapefcount;
sp->tapelabel = current_tape->label;
}
tapechunks[level] +=1;
sp->tapelabel = current_tape->label;
}
tapechunks[level] +=1;
@@
-2405,7
+2408,7
@@
handle_success(
origkb = 0.1;
}
if (curprog == P_TAPER && logtype == L_PARTIAL) {
origkb = 0.1;
}
if (curprog == P_TAPER && logtype == L_PARTIAL) {
- char *t =
index
(s-1,']');
+ char *t =
strchr
(s-1,']');
if (t) {
char *errmsg, *u;
errmsg = unquote_string(t+1);
if (t) {
char *errmsg, *u;
errmsg = unquote_string(t+1);
@@
-2497,8
+2500,10
@@
handle_success(
/*NOTREACHED*/
}
stats[i].taper_time += sec;
/*NOTREACHED*/
}
stats[i].taper_time += sec;
- sp->filenum = ++tapefcount;
- sp->tapelabel = current_tape->label;
+ if (sp->filenum == 0) {
+ sp->filenum = ++tapefcount;
+ sp->tapelabel = current_tape->label;
+ }
sp->totpart = totpart;
tapedisks[level] +=1;
stats[i].tapedisks +=1;
sp->totpart = totpart;
tapedisks[level] +=1;
stats[i].tapedisks +=1;