projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/3.3.2'
[debian/amanda]
/
server-src
/
xfer-source-holding.c
diff --git
a/server-src/xfer-source-holding.c
b/server-src/xfer-source-holding.c
index a53c512d8f866a331d2a6049bb06a631470568fd..4776acc5c0c77d0f56c49928441ef0114011f257 100644
(file)
--- a/
server-src/xfer-source-holding.c
+++ b/
server-src/xfer-source-holding.c
@@
-1,6
+1,6
@@
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 2009 Zmanda, Inc. All Rights Reserved.
+ * Copyright (c) 2009
-2012
Zmanda, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@
-49,6
+49,7
@@
typedef struct XferSourceHolding {
int fd;
char *next_filename;
int fd;
char *next_filename;
+ guint64 bytes_read;
XferElement *dest_taper;
} XferSourceHolding;
XferElement *dest_taper;
} XferSourceHolding;
@@
-195,6
+196,7
@@
pull_buffer_impl(
bytes_read = full_read(self->fd, buf, HOLDING_BLOCK_SIZE);
if (bytes_read > 0) {
*size = bytes_read;
bytes_read = full_read(self->fd, buf, HOLDING_BLOCK_SIZE);
if (bytes_read > 0) {
*size = bytes_read;
+ self->bytes_read += bytes_read;
return buf;
}
return buf;
}
@@
-296,7
+298,17
@@
xfer_source_holding(
XferElement *elt = XFER_ELEMENT(self);
self->next_filename = g_strdup(filename);
XferElement *elt = XFER_ELEMENT(self);
self->next_filename = g_strdup(filename);
+ self->bytes_read = 0;
return elt;
}
return elt;
}
+guint64
+xfer_source_holding_get_bytes_read(
+ XferElement *elt)
+{
+ XferSourceHolding *self = (XferSourceHolding *)elt;
+
+ return self->bytes_read;
+}
+