Merge commit 'origin/master'

Conflicts:

	src/Makefile.am
	src/archives.c
	src/main.c

diff --cc lib/myopt.c
Simple merge

diff --cc src/Makefile.am
index 2092e961587e0074adf006d68b17020ee1e28c4c,80e61e76ba869323b1916841c13c7c945df466b8..5416cebd9e7e71b6df3065f31abfa179c39b4061
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2,9 -2,9 +2,10 @@@
  
  localedir = $(datadir)/locale
  INCLUDES = \
-       -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl \
+       -DLOCALEDIR=\"$(localedir)\" \
        -DADMINDIR=\"$(admindir)\" \
 +      -DCONFIGDIR=\"$(pkgconfdir)\" \
+       -idirafter $(top_srcdir)/libcompat \
        -I$(top_srcdir)/lib
  
  
@@@ -24,10 -24,10 +25,11 @@@ dpkg_SOURCES = 
        processarc.c \
        remove.c \
        select.c \
 -      update.c
 +      update.c \
 +      filters.c filters.h
  
  dpkg_LDADD = \
+       ../libcompat/libcompat.a \
        $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
  
  dpkg_query_SOURCES = \

diff --cc src/archives.c
index 48f1c6df49f1b40b230f864374b0e335c20f5365,9fddb9c641896c2bc9fff0cc3237308c8f07933b..55a64890ff43d0953a0dc864c67c90aa259bc043
--- 1/src/archives.c
--- 2/src/archives.c
+++ b/src/archives.c
@@@ -232,30 -230,6 +232,30 @@@ int tarfileread(void *ud, char *buf, in
    return r;
  }
  
-   *oldnifd = 0;
 +void tarfile_skip_one_forward(struct TarInfo *ti, 
 +                            struct fileinlist **oldnifd,
 +                            struct fileinlist *nifd) {
 +  struct tarcontext *tc= (struct tarcontext*)ti->UserData;
 +  size_t r;
 +  char databuf[TARBLKSZ];
 +
 +  obstack_free(&tar_obs, nifd);
 +  tc->newfilesp= oldnifd;
++  *oldnifd = NULL;
 +
 +  /* We need to advance the tar file to the next object, so read the
 +   * file data and set it to oblivion.
 +   */
 +  if ((ti->Type == NormalFile0) || (ti->Type == NormalFile1)) {
 +    char fnamebuf[256];
 +    fd_null_copy(tc->backendpipe, ti->Size, 
 +               "skipped unpacking file `%.255s' (replaced or excluded?)", 
 +               quote_filename(fnamebuf,256,ti->Name));
 +    r= ti->Size % TARBLKSZ;
 +    if (r > 0) r= safe_read(tc->backendpipe,databuf,TARBLKSZ - r);
 +  }
 +}
 +
  int fnameidlu;
  struct varbuf fnamevb;
  struct varbuf fnametmpvb;

diff --cc src/main.c
index cd7dd606fbe63ee6e7fc39bceaceb441d8c0c41f,b4bd50f463ade38aa5d836d56737b689a5f85e63..aec8af764f77332a2f632612727eb198092d5a0f
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -627,9 -620,7 +621,9 @@@ int main(int argc, const char *const *a
    standard_startup(&ejbuf, argc, &argv, DPKG, 1, cmdinfos);
    if (!cipaction) badusage(_("need an action option"));
  
-   setvbuf(stdout,0,_IONBF,0);
 +  loadfilters();
 +
+   setvbuf(stdout, NULL, _IONBF, 0);
    filesdbinit();
  
    actionfunction= (void (*)(const char* const*))cipaction->farg;