← Back to branch summary

~ubuntu-branches/ubuntu/vivid/burp/vivid-proposed

« back to all changes in this revision

Viewing changes to src/backup_phase1_server.c

  • Committer: Package Import Robot
  • Author(s): Bastiaan Franciscus van den Dikkenberg
  • Date: 2012-02-27 17:01:35 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120227170135-on2z4842wv2ppmrm
Tags: 1.3.1-1
http://bugs.debian.org/661281
http://bugs.debian.org/661001
http://bugs.debian.org/660964
http://bugs.debian.org/661267
* New upstream release version 1.3.1
  -fixes respect noopt in DEB_BUILD_OPTIONS. (Closes: #661281)
* Switched to Standards-Version 3.9.3 Debian bug: (Closes: #661001)
* Fixed typo in logrotate script Debian bug: (Closes: #660964)
* added debug package Debian bug: (Closes: #661267)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backup_phase1_server.c
58
58
                if(sb.cmd==CMD_FILE
59
59
                  || sb.cmd==CMD_ENC_FILE
60
60
                  || sb.cmd==CMD_METADATA
61
 
                  || sb.cmd==CMD_ENC_METADATA)
 
61
                  || sb.cmd==CMD_ENC_METADATA
 
62
                  || sb.cmd==CMD_EFS_FILE)
62
63
                        do_filecounter_bytes(p1cntr,
63
64
                                (unsigned long long)sb.statp.st_size);
64
65
        }
101
102
                if(p1b.cmd==CMD_FILE
102
103
                  || p1b.cmd==CMD_ENC_FILE
103
104
                  || p1b.cmd==CMD_METADATA
104
 
                  || p1b.cmd==CMD_ENC_METADATA)
 
105
                  || p1b.cmd==CMD_ENC_METADATA
 
106
                  || p1b.cmd==CMD_EFS_FILE)
105
107
                        do_filecounter_bytes(p1cntr,
106
108
                                (unsigned long long)p1b.statp.st_size);
107
109
        }
202
204
        return 0;
203
205
}
204
206
 
205
 
int do_resume(gzFile p1zp, FILE *p2fp, FILE *ucfp, gzFile cmanfp, struct dpth *dpth, struct config *cconf, struct cntr *p1cntr, struct cntr *cntr)
 
207
int do_resume(gzFile p1zp, FILE *p2fp, FILE *ucfp, struct dpth *dpth, struct config *cconf, struct cntr *p1cntr, struct cntr *cntr)
206
208
{
207
209
        int ret=0;
208
210
        struct sbuf p1b;