d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vendor/libarchive/dist to git commit f48d99b

Browse Source 
Integrates my pull requests #701, #702 and #703
This commit is contained in:
Martin Matuska 2016-05-12 16:03:55 +00:00
parent 4e579f6c94
commit cf8cc1c884
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cat/bsdcat.c
View File

@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
#define BYTES_PER_BLOCK (20*512)
struct archive *a;
struct archive_entry *ae;
char *bsdcat_current_path;
int exit_status = 0;
static struct archive *a;
static struct archive_entry *ae;
static const char *bsdcat_current_path;
static int exit_status = 0;
void
@ -68,7 +68,7 @@ version(void)
}
void
bsdcat_next()
bsdcat_next(void)
{
a = archive_read_new();
archive_read_support_filter_all(a);
@ -85,7 +85,7 @@ bsdcat_print_error(void)
}
void
bsdcat_read_to_stdout(char* filename)
bsdcat_read_to_stdout(const char* filename)
{
int r;

2
cat/bsdcat.h
View File

@ -53,4 +53,4 @@ int bsdcat_getopt(struct bsdcat *);
void usage(FILE *stream, int eval);
void bsdcat_next(void);
void bsdcat_print_error(void);
void bsdcat_read_to_stdout(char* filename);
void bsdcat_read_to_stdout(const char* filename);

2
libarchive/archive_read_support_format_mtree.c
View File

@ -1342,7 +1342,7 @@ parse_line(struct archive_read *a, struct archive_entry *entry,
/* strsep() is not in C90, but strcspn() is. */
/* Taken from http://unixpapa.com/incnote/string.html */
static char *
la_strsep(char **sp, char *sep)
la_strsep(char **sp, const char *sep)
{
char *p, *s;
if (sp == NULL || *sp == NULL || **sp == '\0')

2
libarchive_fe/err.c
View File

@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
static void lafe_vwarnc(int, const char *, va_list) __LA_PRINTFLIKE(2, 0);
const char *lafe_progname;
static const char *lafe_progname;
const char *
lafe_getprogname(void)