|
@@ -409,8 +409,6 @@ void process_archive(const char *filename) {
|
|
|
* we unwind the stack before processing the cleanup list, and these
|
|
* we unwind the stack before processing the cleanup list, and these
|
|
|
* variables had better still exist ... */
|
|
* variables had better still exist ... */
|
|
|
static int p1[2];
|
|
static int p1[2];
|
|
|
- static char *cidir = NULL;
|
|
|
|
|
- static struct fileinlist *newconffiles, *newfileslist;
|
|
|
|
|
static enum pkgstatus oldversionstatus;
|
|
static enum pkgstatus oldversionstatus;
|
|
|
static struct varbuf depprobwhy;
|
|
static struct varbuf depprobwhy;
|
|
|
static struct tarcontext tc;
|
|
static struct tarcontext tc;
|
|
@@ -422,10 +420,13 @@ void process_archive(const char *filename) {
|
|
|
struct pkgiterator *it;
|
|
struct pkgiterator *it;
|
|
|
struct pkginfo *pkg, *otherpkg;
|
|
struct pkginfo *pkg, *otherpkg;
|
|
|
struct pkg_list *conflictor_iter;
|
|
struct pkg_list *conflictor_iter;
|
|
|
|
|
+ char *cidir = NULL;
|
|
|
char *cidirrest, *p;
|
|
char *cidirrest, *p;
|
|
|
char conffilenamebuf[MAXCONFFILENAME];
|
|
char conffilenamebuf[MAXCONFFILENAME];
|
|
|
char *psize;
|
|
char *psize;
|
|
|
const char *pfilename;
|
|
const char *pfilename;
|
|
|
|
|
+ struct fileinlist *newfileslist;
|
|
|
|
|
+ struct fileinlist *newconffiles;
|
|
|
struct fileinlist *newconff, **newconffileslastp;
|
|
struct fileinlist *newconff, **newconffileslastp;
|
|
|
struct fileinlist *cfile;
|
|
struct fileinlist *cfile;
|
|
|
struct reversefilelistiter rlistit;
|
|
struct reversefilelistiter rlistit;
|