Deleted Added
full compact
cpio.h (228761) cpio.h (229592)
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.7 2008/12/06 07:30:40 kientzle Exp $
25 * $FreeBSD: stable/9/contrib/libarchive/cpio/cpio.h 229592 2012-01-05 12:06:54Z mm $
26 */
27
28#ifndef CPIO_H_INCLUDED
29#define CPIO_H_INCLUDED
30
31#include "cpio_platform.h"
32#include <stdio.h>
33

--- 29 unchanged lines hidden (view full) ---

63 int option_list; /* -t */
64 char option_null; /* --null */
65 int option_numeric_uid_gid; /* -n */
66 int option_rename; /* -r */
67 char *destdir;
68 size_t pass_destpath_alloc;
69 char *pass_destpath;
70 int uid_override;
26 */
27
28#ifndef CPIO_H_INCLUDED
29#define CPIO_H_INCLUDED
30
31#include "cpio_platform.h"
32#include <stdio.h>
33

--- 29 unchanged lines hidden (view full) ---

63 int option_list; /* -t */
64 char option_null; /* --null */
65 int option_numeric_uid_gid; /* -n */
66 int option_rename; /* -r */
67 char *destdir;
68 size_t pass_destpath_alloc;
69 char *pass_destpath;
70 int uid_override;
71 char *uname_override;
71 int gid_override;
72 int gid_override;
73 char *gname_override;
72 int day_first; /* true if locale prefers day/mon */
73
74 /* If >= 0, then close this when done. */
75 int fd;
76
77 /* Miscellaneous state information */
78 struct archive *archive;
79 struct archive *archive_read_disk;

--- 30 unchanged lines hidden ---
74 int day_first; /* true if locale prefers day/mon */
75
76 /* If >= 0, then close this when done. */
77 int fd;
78
79 /* Miscellaneous state information */
80 struct archive *archive;
81 struct archive *archive_read_disk;

--- 30 unchanged lines hidden ---