← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/dpth.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/dpth.c
8
8
#include "dpth.h"
9
9
#include "find.h"
10
10
 
11
 
static void mk_dpth(struct dpth *dpth, struct config *cconf)
 
11
void mk_dpth(struct dpth *dpth, struct config *cconf, char cmd)
12
12
{
13
13
        // file data
14
14
        snprintf(dpth->path, sizeof(dpth->path), "%04X/%04X/%04X%s",
15
 
          dpth->prim, dpth->seco, dpth->tert, cconf->compression?".gz":"");
 
15
          dpth->prim, dpth->seco, dpth->tert,
 
16
          /* Because of the way EFS works, it cannot be compressed. */
 
17
          (cconf->compression && cmd!=CMD_EFS_FILE)?".gz":"");
16
18
}
17
19
 
18
20
static void mk_dpth_prim(struct dpth *dpth)
60
62
        {
61
63
                // Could not open directory. Set all zeros.
62
64
                dpth->prim=0;
63
 
                mk_dpth(dpth, cconf);
 
65
//              mk_dpth(dpth, cconf);
64
66
                return 0;
65
67
        }
66
68
        mk_dpth_prim(dpth);
73
75
        {
74
76
                // Could not open directory. Set zero.
75
77
                dpth->seco=0;
76
 
                mk_dpth(dpth, cconf);
 
78
//              mk_dpth(dpth, cconf);
77
79
                free(tmp);
78
80
                return 0;
79
81
        }
88
90
        {
89
91
                // Could not open directory. Set zero.
90
92
                dpth->tert=0;
91
 
                mk_dpth(dpth, cconf);
 
93
//              mk_dpth(dpth, cconf);
92
94
                free(tmp);
93
95
                return 0;
94
96
        }
128
130
                }
129
131
        }
130
132
        //printf("before incr_dpth: %s %04X/%04X/%04X\n", dpth->path, dpth->prim, dpth->seco, dpth->tert);
131
 
        mk_dpth(dpth, cconf);
 
133
//      mk_dpth(dpth, cconf);
132
134
        //printf("after incr_dpth: %s\n", dpth->path);
133
135
        return 0;
134
136
}
151
153
        dpth->prim=a;
152
154
        dpth->seco=b;
153
155
        dpth->tert=c;
154
 
        mk_dpth(dpth, cconf);
 
156
//      mk_dpth(dpth, cconf);
155
157
        return 0;
156
158
}