From: Bdale Garbee <bdale@gag.com>
Date: Mon, 11 Aug 2008 20:51:53 +0000 (-0300)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/20090728-1~21
X-Git-Url: https://git.gag.com/?p=debian%2Fpax;a=commitdiff_plain;h=a547751988577b94d9cefd260173ec7e69b8669c

Merge branch 'upstream'

Conflicts:

	Makefile
	ar_io.c
	cpio.1
	options.c
	pat_rep.c
	pax.1
	pax.c
	tar.1
	tar.c
---

a547751988577b94d9cefd260173ec7e69b8669c
diff --cc ar_io.c
index 4cc4a97,2a833bb..6679547
--- a/ar_io.c
+++ b/ar_io.c
@@@ -1305,21 -1248,14 +1248,15 @@@ ar_next(void
  
  /*
   * ar_start_gzip()
 - * starts the gzip compression/decompression process as a child, using magic
 - * to keep the fd the same in the calling function (parent).
 + * starts the compress, gzip or bzip2 compression/decompression process
 + * as a child, using magic to keep the fd the same in the calling function
 + * (parent).
   */
  void
- #ifdef __STDC__
- ar_start_gzip(int fd)
- #else
- ar_start_gzip(fd)
- 	int fd;
- #endif
+ ar_start_gzip(int fd, const char *gzip_program, int wr)
  {
- 	pid_t pid;
  	int fds[2];
- 	char *gzip_flags;
+ 	const char *gzip_flags;
  
  	if (pipe(fds) < 0)
  		err(1, "could not pipe");
diff --cc sel_subs.c
index d11b50c,55d3a00..b12c3ed
--- a/sel_subs.c
+++ b/sel_subs.c
@@@ -48,15 -44,16 +44,17 @@@ static const char rcsid[] = "$OpenBSD: 
  
  #include <sys/types.h>
  #include <sys/time.h>
 +#include <time.h>
  #include <sys/stat.h>
  #include <sys/param.h>
- #include <pwd.h>
+ #include <ctype.h>
  #include <grp.h>
+ #include <pwd.h>
  #include <stdio.h>
+ #include <stdlib.h>
  #include <string.h>
+ #include <tzfile.h>
  #include <unistd.h>
- #include <stdlib.h>
  #include "pax.h"
  #include "sel_subs.h"
  #include "extern.h"