diff options
Diffstat (limited to 'cpio')
65 files changed, 12 insertions, 96 deletions
diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1 index 01b508e122f8..c52764a8c4f7 100644 --- a/cpio/bsdcpio.1 +++ b/cpio/bsdcpio.1 @@ -22,8 +22,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd September 16, 2014 .Dt CPIO 1 .Os diff --git a/cpio/cmdline.c b/cpio/cmdline.c index 2683524e4ed0..312d762c8f46 100644 --- a/cpio/cmdline.c +++ b/cpio/cmdline.c @@ -26,7 +26,6 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.5 2008/12/06 07:30:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> diff --git a/cpio/config_freebsd.h b/cpio/config_freebsd.h index 00c4c737f737..1cba09653cb5 100644 --- a/cpio/config_freebsd.h +++ b/cpio/config_freebsd.h @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/usr.bin/cpio/config_freebsd.h,v 1.3 2008/12/06 07:30:40 kientzle Exp $ */ /* A hand-tooled configuration for FreeBSD. */ diff --git a/cpio/cpio.c b/cpio/cpio.c index b02a142f842d..c9af535f6d0a 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -26,7 +26,6 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $"); #include <sys/types.h> #include <archive.h> @@ -108,22 +107,22 @@ static int entry_to_archive(struct cpio *, struct archive_entry *); static int file_to_archive(struct cpio *, const char *); static void free_cache(struct name_cache *cache); static void list_item_verbose(struct cpio *, struct archive_entry *); -static void long_help(void) __LA_DEAD; +static __LA_NORETURN void long_help(void); static const char *lookup_gname(struct cpio *, gid_t gid); static int lookup_gname_helper(struct cpio *, const char **name, id_t gid); static const char *lookup_uname(struct cpio *, uid_t uid); static int lookup_uname_helper(struct cpio *, const char **name, id_t uid); -static void mode_in(struct cpio *) __LA_DEAD; -static void mode_list(struct cpio *) __LA_DEAD; +static __LA_NORETURN void mode_in(struct cpio *); +static __LA_NORETURN void mode_list(struct cpio *); static void mode_out(struct cpio *); static void mode_pass(struct cpio *, const char *); static const char *remove_leading_slash(const char *); static int restore_time(struct cpio *, struct archive_entry *, const char *, int fd); -static void usage(void) __LA_DEAD; -static void version(void) __LA_DEAD; +static __LA_NORETURN void usage(void); +static __LA_NORETURN void version(void); static const char * passphrase_callback(struct archive *, void *); static void passphrase_free(char *); @@ -251,7 +250,7 @@ main(int argc, char *argv[]) break; case 'h': long_help(); - break; + /* NOTREACHED */ case 'I': /* NetBSD/OpenBSD */ cpio->filename = cpio->argument; break; @@ -358,7 +357,7 @@ main(int argc, char *argv[]) break; case OPTION_VERSION: /* GNU convention */ version(); - break; + /* NOTREACHED */ #if 0 /* * cpio_getopt() handles -W specially, so it's not @@ -427,7 +426,7 @@ main(int argc, char *argv[]) mode_list(cpio); else mode_in(cpio); - break; + /* NOTREACHED */ case 'p': if (*cpio->argv == NULL || **cpio->argv == '\0') lafe_errc(1, 0, diff --git a/cpio/cpio.h b/cpio/cpio.h index a71b6649d35f..3e97c0900b73 100644 --- a/cpio/cpio.h +++ b/cpio/cpio.h @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.7 2008/12/06 07:30:40 kientzle Exp $ */ #ifndef CPIO_H_INCLUDED diff --git a/cpio/cpio_platform.h b/cpio/cpio_platform.h index 58d2edbcd7a4..263404b40dab 100644 --- a/cpio/cpio_platform.h +++ b/cpio/cpio_platform.h @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/usr.bin/cpio/cpio_platform.h,v 1.2 2008/12/06 07:15:42 kientzle Exp $ */ /* @@ -46,16 +44,6 @@ #include "cpio_windows.h" #endif -/* Get a real definition for __FBSDID if we can */ -#if HAVE_SYS_CDEFS_H -#include <sys/cdefs.h> -#endif - -/* If not, define it so as to avoid dangling semicolons. */ -#ifndef __FBSDID -#define __FBSDID(a) struct _undefined_hack -#endif - #ifdef HAVE_LIBARCHIVE /* If we're using the platform libarchive, include system headers. */ #include <archive.h> @@ -69,9 +57,11 @@ /* How to mark functions that don't return. */ #if defined(__GNUC__) && (__GNUC__ > 2 || \ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) -#define __LA_DEAD __attribute__((__noreturn__)) +#define __LA_NORETURN __attribute__((__noreturn__)) +#elif defined(_MSC_VER) +#define __LA_NORETURN __declspec(noreturn) #else -#define __LA_DEAD +#define __LA_NORETURN #endif #endif /* !CPIO_PLATFORM_H_INCLUDED */ diff --git a/cpio/cpio_windows.c b/cpio/cpio_windows.c index 2809ca821e2c..c888a3897d56 100644 --- a/cpio/cpio_windows.c +++ b/cpio/cpio_windows.c @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h index 970a63df663d..6b88c389ab40 100644 --- a/cpio/cpio_windows.h +++ b/cpio/cpio_windows.h @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef CPIO_WINDOWS_H #define CPIO_WINDOWS_H 1 diff --git a/cpio/test/test.h b/cpio/test/test.h index 1dadf68890bf..f8f3a4038b57 100644 --- a/cpio/test/test.h +++ b/cpio/test/test.h @@ -21,8 +21,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ /* Every test program should #include "test.h" as the first thing. */ diff --git a/cpio/test/test_0.c b/cpio/test/test_0.c index fa52def7eaf3..c09df5e137c4 100644 --- a/cpio/test/test_0.c +++ b/cpio/test/test_0.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); /* * This first test does basic sanity checks on the environment. For diff --git a/cpio/test/test_basic.c b/cpio/test/test_basic.c index 3d7d86a0ee78..993d555b831c 100644 --- a/cpio/test/test_basic.c +++ b/cpio/test/test_basic.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_basic.c,v 1.4 2008/08/25 06:39:29 kientzle Exp $"); static void verify_files(const char *msg) diff --git a/cpio/test/test_cmdline.c b/cpio/test/test_cmdline.c index 2dd7d651dc57..f4e05ee58599 100644 --- a/cpio/test/test_cmdline.c +++ b/cpio/test/test_cmdline.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); /* * Test the command-line parsing. diff --git a/cpio/test/test_extract_cpio_Z.c b/cpio/test/test_extract_cpio_Z.c index f908fc5b84f5..257d70d04211 100644 --- a/cpio/test/test_extract_cpio_Z.c +++ b/cpio/test/test_extract_cpio_Z.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_Z) { diff --git a/cpio/test/test_extract_cpio_bz2.c b/cpio/test/test_extract_cpio_bz2.c index 9525e63ae906..08fe1fe53468 100644 --- a/cpio/test/test_extract_cpio_bz2.c +++ b/cpio/test/test_extract_cpio_bz2.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_bz2) { diff --git a/cpio/test/test_extract_cpio_grz.c b/cpio/test/test_extract_cpio_grz.c index f1a080597e34..969b30e44de5 100644 --- a/cpio/test/test_extract_cpio_grz.c +++ b/cpio/test/test_extract_cpio_grz.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_grz) { diff --git a/cpio/test/test_extract_cpio_gz.c b/cpio/test/test_extract_cpio_gz.c index 19cee510c857..16296146f87e 100644 --- a/cpio/test/test_extract_cpio_gz.c +++ b/cpio/test/test_extract_cpio_gz.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_gz) { diff --git a/cpio/test/test_extract_cpio_lrz.c b/cpio/test/test_extract_cpio_lrz.c index 67667585e431..7ef213f74aac 100644 --- a/cpio/test/test_extract_cpio_lrz.c +++ b/cpio/test/test_extract_cpio_lrz.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_lrz) { diff --git a/cpio/test/test_extract_cpio_lz.c b/cpio/test/test_extract_cpio_lz.c index 4454e7b191e9..bfdf87869b37 100644 --- a/cpio/test/test_extract_cpio_lz.c +++ b/cpio/test/test_extract_cpio_lz.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_lz) { diff --git a/cpio/test/test_extract_cpio_lz4.c b/cpio/test/test_extract_cpio_lz4.c index c16247be2bef..f8cf5f8fab0d 100644 --- a/cpio/test/test_extract_cpio_lz4.c +++ b/cpio/test/test_extract_cpio_lz4.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_lz4) { diff --git a/cpio/test/test_extract_cpio_lzma.c b/cpio/test/test_extract_cpio_lzma.c index ae630d6119d8..81fc3c236ab5 100644 --- a/cpio/test/test_extract_cpio_lzma.c +++ b/cpio/test/test_extract_cpio_lzma.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_lzma) { diff --git a/cpio/test/test_extract_cpio_lzo.c b/cpio/test/test_extract_cpio_lzo.c index 99476af95318..d54d4f712374 100644 --- a/cpio/test/test_extract_cpio_lzo.c +++ b/cpio/test/test_extract_cpio_lzo.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_lzo) { diff --git a/cpio/test/test_extract_cpio_xz.c b/cpio/test/test_extract_cpio_xz.c index 60f1b5a9de84..faeea202e050 100644 --- a/cpio/test/test_extract_cpio_xz.c +++ b/cpio/test/test_extract_cpio_xz.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_xz) { diff --git a/cpio/test/test_extract_cpio_zstd.c b/cpio/test/test_extract_cpio_zstd.c index 289f33d0583c..31421c3b60d7 100644 --- a/cpio/test/test_extract_cpio_zstd.c +++ b/cpio/test/test_extract_cpio_zstd.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_extract_cpio_zstd) { diff --git a/cpio/test/test_format_newc.c b/cpio/test/test_format_newc.c index 6e3b9e359bbd..ee0087d4ca94 100644 --- a/cpio/test/test_format_newc.c +++ b/cpio/test/test_format_newc.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_format_newc.c,v 1.2 2008/08/22 02:09:10 kientzle Exp $"); /* Number of bytes needed to pad 'n' to multiple of 'block', assuming * that 'block' is a power of two. This trick can be more easily diff --git a/cpio/test/test_gcpio_compat.c b/cpio/test/test_gcpio_compat.c index 9bb988990e4c..82c71ec3cd21 100644 --- a/cpio/test/test_gcpio_compat.c +++ b/cpio/test/test_gcpio_compat.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_gcpio_compat.c,v 1.2 2008/08/22 02:27:06 kientzle Exp $"); static void unpack_test(const char *from, const char *options, const char *se) diff --git a/cpio/test/test_gcpio_compat_ref.bin.uu b/cpio/test/test_gcpio_compat_ref.bin.uu index 745d8ab7851a..f2ffad975644 100644 --- a/cpio/test/test_gcpio_compat_ref.bin.uu +++ b/cpio/test/test_gcpio_compat_ref.bin.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_gcpio_compat_ref.bin MQW%9`*IWI('H`^@#`@````U'=YD%````"@!F:6QE```Q,C,T-38W.#D*QW%9 M`*IWI('H`^@#`@````U'=YD)````"@!L:6YK9FEL90``,3(S-#4V-S@Y"L=Q diff --git a/cpio/test/test_gcpio_compat_ref.crc.uu b/cpio/test/test_gcpio_compat_ref.crc.uu index df8dde05bd82..56ba62c9ed1f 100644 --- a/cpio/test/test_gcpio_compat_ref.crc.uu +++ b/cpio/test/test_gcpio_compat_ref.crc.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_gcpio_compat_ref.crc M,#<P-S`R,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P diff --git a/cpio/test/test_gcpio_compat_ref.newc.uu b/cpio/test/test_gcpio_compat_ref.newc.uu index 1e29ba907bb4..449c083c311c 100644 --- a/cpio/test/test_gcpio_compat_ref.newc.uu +++ b/cpio/test/test_gcpio_compat_ref.newc.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_gcpio_compat_ref.newc M,#<P-S`Q,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P diff --git a/cpio/test/test_gcpio_compat_ref.ustar.uu b/cpio/test/test_gcpio_compat_ref.ustar.uu index 77989f4aed06..2f6a44057eac 100644 --- a/cpio/test/test_gcpio_compat_ref.ustar.uu +++ b/cpio/test/test_gcpio_compat_ref.ustar.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_gcpio_compat_ref.ustar M9FEL90`````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` diff --git a/cpio/test/test_missing_file.c b/cpio/test/test_missing_file.c index a908f5301bc6..784d53cfe141 100644 --- a/cpio/test/test_missing_file.c +++ b/cpio/test/test_missing_file.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_missing_file) { diff --git a/cpio/test/test_option_0.c b/cpio/test/test_option_0.c index bc4aecd2afc2..fbe6f7ac4a85 100644 --- a/cpio/test/test_option_0.c +++ b/cpio/test/test_option_0.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_0) { diff --git a/cpio/test/test_option_B_upper.c b/cpio/test/test_option_B_upper.c index b040354b6053..79dc91efb5ba 100644 --- a/cpio/test/test_option_B_upper.c +++ b/cpio/test/test_option_B_upper.c @@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); - DEFINE_TEST(test_option_B_upper) { diff --git a/cpio/test/test_option_C_upper.c b/cpio/test/test_option_C_upper.c index c8e63fd34fb5..f9fd7e159339 100644 --- a/cpio/test/test_option_C_upper.c +++ b/cpio/test/test_option_C_upper.c @@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); - DEFINE_TEST(test_option_C_upper) { diff --git a/cpio/test/test_option_J_upper.c b/cpio/test/test_option_J_upper.c index e19d599e1ec7..f76d3b236913 100644 --- a/cpio/test/test_option_J_upper.c +++ b/cpio/test/test_option_J_upper.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_J_upper) { diff --git a/cpio/test/test_option_L_upper.c b/cpio/test/test_option_L_upper.c index cab41b61d749..b6fb713f110f 100644 --- a/cpio/test/test_option_L_upper.c +++ b/cpio/test/test_option_L_upper.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_L.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $"); /* This is a little pointless, as Windows doesn't support symlinks * (except for the seriously crippled CreateSymbolicLink API) so these diff --git a/cpio/test/test_option_Z_upper.c b/cpio/test/test_option_Z_upper.c index ff388427e372..aa408e4e548c 100644 --- a/cpio/test/test_option_Z_upper.c +++ b/cpio/test/test_option_Z_upper.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_Z_upper) { diff --git a/cpio/test/test_option_a.c b/cpio/test/test_option_a.c index e96bdf3cab5b..885eb12c80f5 100644 --- a/cpio/test/test_option_a.c +++ b/cpio/test/test_option_a.c @@ -28,7 +28,6 @@ #elif defined(HAVE_SYS_UTIME_H) #include <sys/utime.h> #endif -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_a.c,v 1.3 2008/08/24 06:21:00 kientzle Exp $"); static struct { const char *name; diff --git a/cpio/test/test_option_b64encode.c b/cpio/test/test_option_b64encode.c index 7c15a8230606..501976c202a1 100644 --- a/cpio/test/test_option_b64encode.c +++ b/cpio/test/test_option_b64encode.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_b64encode) { diff --git a/cpio/test/test_option_c.c b/cpio/test/test_option_c.c index dfa62c13b13e..0b6bed2fac93 100644 --- a/cpio/test/test_option_c.c +++ b/cpio/test/test_option_c.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); static int is_octal(const char *p, size_t l) diff --git a/cpio/test/test_option_d.c b/cpio/test/test_option_d.c index 9ff14539698f..b96430e4f37a 100644 --- a/cpio/test/test_option_d.c +++ b/cpio/test/test_option_d.c @@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); - DEFINE_TEST(test_option_d) { diff --git a/cpio/test/test_option_f.c b/cpio/test/test_option_f.c index 784e0858431b..72383884ac1e 100644 --- a/cpio/test/test_option_f.c +++ b/cpio/test/test_option_f.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); /* * Unpack the archive in a new dir. diff --git a/cpio/test/test_option_f.cpio.uu b/cpio/test/test_option_f.cpio.uu index 42c63c39685e..60b74173f413 100644 --- a/cpio/test/test_option_f.cpio.uu +++ b/cpio/test/test_option_f.cpio.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_option_f.cpio M,#<P-S`W,#`P,3,Q-C(Q-38Q,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P M,#`P,3`W,S4Q,3(U,C8P,#`P,#4P,#`P,#`P,#`P,&$Q,C,`,#<P-S`W,#`P diff --git a/cpio/test/test_option_grzip.c b/cpio/test/test_option_grzip.c index 7e7dd2c8e6f3..cd898cd9228f 100644 --- a/cpio/test/test_option_grzip.c +++ b/cpio/test/test_option_grzip.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_grzip) { diff --git a/cpio/test/test_option_help.c b/cpio/test/test_option_help.c index 56234306f539..cf69c76496d5 100644 --- a/cpio/test/test_option_help.c +++ b/cpio/test/test_option_help.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); /* * Test that "--help", "-h", and "-W help" options all work and diff --git a/cpio/test/test_option_l.c b/cpio/test/test_option_l.c index 5c76e688e6e9..3f4390a6ff22 100644 --- a/cpio/test/test_option_l.c +++ b/cpio/test/test_option_l.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_l) { diff --git a/cpio/test/test_option_lrzip.c b/cpio/test/test_option_lrzip.c index 8d9c0d576cc3..4c46f1c65bba 100644 --- a/cpio/test/test_option_lrzip.c +++ b/cpio/test/test_option_lrzip.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_lrzip) { diff --git a/cpio/test/test_option_lz4.c b/cpio/test/test_option_lz4.c index ebd376736f42..4c5186d55ccc 100644 --- a/cpio/test/test_option_lz4.c +++ b/cpio/test/test_option_lz4.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_lz4) { diff --git a/cpio/test/test_option_lzma.c b/cpio/test/test_option_lzma.c index b7cad3d1e99a..3c2648b827cd 100644 --- a/cpio/test/test_option_lzma.c +++ b/cpio/test/test_option_lzma.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_lzma) { diff --git a/cpio/test/test_option_lzop.c b/cpio/test/test_option_lzop.c index aa40ef5b6392..b787b720a878 100644 --- a/cpio/test/test_option_lzop.c +++ b/cpio/test/test_option_lzop.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_lzop) { diff --git a/cpio/test/test_option_m.c b/cpio/test/test_option_m.c index de880b2883e1..f2f297e10572 100644 --- a/cpio/test/test_option_m.c +++ b/cpio/test/test_option_m.c @@ -23,8 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); - DEFINE_TEST(test_option_m) { diff --git a/cpio/test/test_option_m.cpio.uu b/cpio/test/test_option_m.cpio.uu index 3d2002355e55..0c36ac4fdfd5 100644 --- a/cpio/test/test_option_m.cpio.uu +++ b/cpio/test/test_option_m.cpio.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_option_m.cpio M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P diff --git a/cpio/test/test_option_passphrase.c b/cpio/test/test_option_passphrase.c index ae77a23fcb74..d409b30c81cf 100644 --- a/cpio/test/test_option_passphrase.c +++ b/cpio/test/test_option_passphrase.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_passphrase) { diff --git a/cpio/test/test_option_t.c b/cpio/test/test_option_t.c index 9eef0da571c4..953e4a80651e 100644 --- a/cpio/test/test_option_t.c +++ b/cpio/test/test_option_t.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); #ifdef HAVE_LOCALE_H #include <locale.h> diff --git a/cpio/test/test_option_t.cpio.uu b/cpio/test/test_option_t.cpio.uu index 055fe747d06f..d0bf60bf7d9d 100644 --- a/cpio/test/test_option_t.cpio.uu +++ b/cpio/test/test_option_t.cpio.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_option_t.cpio M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P diff --git a/cpio/test/test_option_t.stdout.uu b/cpio/test/test_option_t.stdout.uu index 2457706eceed..c5144bb68029 100644 --- a/cpio/test/test_option_t.stdout.uu +++ b/cpio/test/test_option_t.stdout.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 test_option_t.stdout %9FEL90H` ` diff --git a/cpio/test/test_option_tv.stdout.uu b/cpio/test/test_option_tv.stdout.uu index e28888ac4747..ad9481360f35 100644 --- a/cpio/test/test_option_tv.stdout.uu +++ b/cpio/test/test_option_tv.stdout.uu @@ -1,4 +1,3 @@ -$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.2 2008/11/29 20:22:02 kientzle Exp $ begin 644 test_option_tv.stdout M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C /(#,Q("`Q.38Y(&9I;&4* diff --git a/cpio/test/test_option_u.c b/cpio/test/test_option_u.c index cc790b1c0af2..fe5b863af0e2 100644 --- a/cpio/test/test_option_u.c +++ b/cpio/test/test_option_u.c @@ -28,7 +28,6 @@ #elif defined(HAVE_SYS_UTIME_H) #include <sys/utime.h> #endif -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_u) { diff --git a/cpio/test/test_option_uuencode.c b/cpio/test/test_option_uuencode.c index a42a0e03096f..28662ddfb659 100644 --- a/cpio/test/test_option_uuencode.c +++ b/cpio/test/test_option_uuencode.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_uuencode) { diff --git a/cpio/test/test_option_xz.c b/cpio/test/test_option_xz.c index f0d3b33d45b8..9116ecace3a7 100644 --- a/cpio/test/test_option_xz.c +++ b/cpio/test/test_option_xz.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_xz) { diff --git a/cpio/test/test_option_y.c b/cpio/test/test_option_y.c index 989b5f1aaf6e..a78dff8cf4ea 100644 --- a/cpio/test/test_option_y.c +++ b/cpio/test/test_option_y.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_y.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $"); DEFINE_TEST(test_option_y) { diff --git a/cpio/test/test_option_z.c b/cpio/test/test_option_z.c index 803232d045c2..9a1500d77f32 100644 --- a/cpio/test/test_option_z.c +++ b/cpio/test/test_option_z.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_z) { diff --git a/cpio/test/test_option_zstd.c b/cpio/test/test_option_zstd.c index 29b8c78b94aa..10c3ed9784e8 100644 --- a/cpio/test/test_option_zstd.c +++ b/cpio/test/test_option_zstd.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_zstd) { diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c index bef02da7badf..fc6f18943f5d 100644 --- a/cpio/test/test_owner_parse.c +++ b/cpio/test/test_owner_parse.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD$"); #include "../cpio.h" #include "err.h" diff --git a/cpio/test/test_passthrough_dotdot.c b/cpio/test/test_passthrough_dotdot.c index bb04341a4c79..831c1f81c1cb 100644 --- a/cpio/test/test_passthrough_dotdot.c +++ b/cpio/test/test_passthrough_dotdot.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_passthrough_dotdot.c,v 1.4 2008/08/24 06:21:00 kientzle Exp $"); /* * Verify that "cpio -p .." works. diff --git a/cpio/test/test_passthrough_reverse.c b/cpio/test/test_passthrough_reverse.c index 674e52bc0a18..7ae0e6602a34 100644 --- a/cpio/test/test_passthrough_reverse.c +++ b/cpio/test/test_passthrough_reverse.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_passthrough_reverse.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $"); /* * As reported by Bernd Walter: Some people are in the habit of |