From e41c0b1a2d6da32896b61dfce2da6d217c612f5b Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Tue, 13 Jul 2010 21:35:58 +0000 Subject: [PATCH] Replace paxtar with bsdtar --- commands/Makefile | 4 ++-- commands/pax/Makefile | 3 +-- commands/{bsdtar => tar}/Makefile | 3 +++ commands/{bsdtar => tar}/bsdtar.1 | 0 commands/{bsdtar => tar}/bsdtar.c | 0 commands/{bsdtar => tar}/bsdtar.h | 0 commands/{bsdtar => tar}/bsdtar_platform.h | 0 commands/{bsdtar => tar}/cmdline.c | 0 commands/{bsdtar => tar}/config.h | 0 commands/{bsdtar => tar}/getdate.c | 0 commands/{bsdtar => tar}/libarchive_fe/Makefile.inc | 0 commands/{bsdtar => tar}/libarchive_fe/err.c | 0 commands/{bsdtar => tar}/libarchive_fe/err.h | 0 commands/{bsdtar => tar}/libarchive_fe/lafe_platform.h | 0 commands/{bsdtar => tar}/libarchive_fe/line_reader.c | 0 commands/{bsdtar => tar}/libarchive_fe/line_reader.h | 0 commands/{bsdtar => tar}/libarchive_fe/matching.c | 0 commands/{bsdtar => tar}/libarchive_fe/matching.h | 0 commands/{bsdtar => tar}/libarchive_fe/pathmatch.c | 0 commands/{bsdtar => tar}/libarchive_fe/pathmatch.h | 0 commands/{bsdtar => tar}/read.c | 0 commands/{bsdtar => tar}/subst.c | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-main.Po | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_0.Po | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_basic.Po | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_copy.Po | 0 .../test/.deps/bsdtar_test-test_empty_mtree.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_getdate.Po | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_help.Po | 0 .../test/.deps/bsdtar_test-test_option_T_upper.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_option_q.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_option_r.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_option_s.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_patterns.Po | 0 commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_stdio.Po | 0 .../test/.deps/bsdtar_test-test_strip_components.Po | 0 .../test/.deps/bsdtar_test-test_symlink_dir.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_version.Po | 0 .../{bsdtar => tar}/test/.deps/bsdtar_test-test_windows.Po | 0 commands/{bsdtar => tar}/test/CMakeLists.txt | 0 commands/{bsdtar => tar}/test/config.sh | 0 commands/{bsdtar => tar}/test/list.h | 0 commands/{bsdtar => tar}/test/main.c | 0 commands/{bsdtar => tar}/test/test-acl.sh | 0 commands/{bsdtar => tar}/test/test-basic.sh | 0 commands/{bsdtar => tar}/test/test-deep-dir.sh | 0 commands/{bsdtar => tar}/test/test-flags.sh | 0 commands/{bsdtar => tar}/test/test-nodump.sh | 0 commands/{bsdtar => tar}/test/test-overwrite.sh | 0 commands/{bsdtar => tar}/test/test-utf8.sh | 0 commands/{bsdtar => tar}/test/test.h | 0 commands/{bsdtar => tar}/test/test_0.c | 0 commands/{bsdtar => tar}/test/test_basic.c | 0 commands/{bsdtar => tar}/test/test_copy.c | 0 commands/{bsdtar => tar}/test/test_empty_mtree.c | 0 commands/{bsdtar => tar}/test/test_getdate.c | 0 commands/{bsdtar => tar}/test/test_help.c | 0 commands/{bsdtar => tar}/test/test_option_T_upper.c | 0 commands/{bsdtar => tar}/test/test_option_q.c | 0 commands/{bsdtar => tar}/test/test_option_r.c | 0 commands/{bsdtar => tar}/test/test_option_s.c | 0 commands/{bsdtar => tar}/test/test_patterns.c | 0 commands/{bsdtar => tar}/test/test_patterns_2.tar.uu | 0 commands/{bsdtar => tar}/test/test_patterns_3.tar.uu | 0 commands/{bsdtar => tar}/test/test_patterns_4.tar.uu | 0 commands/{bsdtar => tar}/test/test_stdio.c | 0 commands/{bsdtar => tar}/test/test_strip_components.c | 0 commands/{bsdtar => tar}/test/test_symlink_dir.c | 0 commands/{bsdtar => tar}/test/test_version.c | 0 commands/{bsdtar => tar}/test/test_windows.c | 0 commands/{bsdtar => tar}/tree.c | 0 commands/{bsdtar => tar}/tree.h | 0 commands/{bsdtar => tar}/util.c | 0 commands/{bsdtar => tar}/write.c | 0 74 files changed, 6 insertions(+), 4 deletions(-) rename commands/{bsdtar => tar}/Makefile (84%) rename commands/{bsdtar => tar}/bsdtar.1 (100%) rename commands/{bsdtar => tar}/bsdtar.c (100%) rename commands/{bsdtar => tar}/bsdtar.h (100%) rename commands/{bsdtar => tar}/bsdtar_platform.h (100%) rename commands/{bsdtar => tar}/cmdline.c (100%) rename commands/{bsdtar => tar}/config.h (100%) rename commands/{bsdtar => tar}/getdate.c (100%) rename commands/{bsdtar => tar}/libarchive_fe/Makefile.inc (100%) rename commands/{bsdtar => tar}/libarchive_fe/err.c (100%) rename commands/{bsdtar => tar}/libarchive_fe/err.h (100%) rename commands/{bsdtar => tar}/libarchive_fe/lafe_platform.h (100%) rename commands/{bsdtar => tar}/libarchive_fe/line_reader.c (100%) rename commands/{bsdtar => tar}/libarchive_fe/line_reader.h (100%) rename commands/{bsdtar => tar}/libarchive_fe/matching.c (100%) rename commands/{bsdtar => tar}/libarchive_fe/matching.h (100%) rename commands/{bsdtar => tar}/libarchive_fe/pathmatch.c (100%) rename commands/{bsdtar => tar}/libarchive_fe/pathmatch.h (100%) rename commands/{bsdtar => tar}/read.c (100%) rename commands/{bsdtar => tar}/subst.c (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-main.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_0.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_basic.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_copy.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_empty_mtree.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_getdate.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_help.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_option_T_upper.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_option_q.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_option_r.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_option_s.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_patterns.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_stdio.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_strip_components.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_symlink_dir.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_version.Po (100%) rename commands/{bsdtar => tar}/test/.deps/bsdtar_test-test_windows.Po (100%) rename commands/{bsdtar => tar}/test/CMakeLists.txt (100%) rename commands/{bsdtar => tar}/test/config.sh (100%) rename commands/{bsdtar => tar}/test/list.h (100%) rename commands/{bsdtar => tar}/test/main.c (100%) rename commands/{bsdtar => tar}/test/test-acl.sh (100%) rename commands/{bsdtar => tar}/test/test-basic.sh (100%) rename commands/{bsdtar => tar}/test/test-deep-dir.sh (100%) rename commands/{bsdtar => tar}/test/test-flags.sh (100%) rename commands/{bsdtar => tar}/test/test-nodump.sh (100%) rename commands/{bsdtar => tar}/test/test-overwrite.sh (100%) rename commands/{bsdtar => tar}/test/test-utf8.sh (100%) rename commands/{bsdtar => tar}/test/test.h (100%) rename commands/{bsdtar => tar}/test/test_0.c (100%) rename commands/{bsdtar => tar}/test/test_basic.c (100%) rename commands/{bsdtar => tar}/test/test_copy.c (100%) rename commands/{bsdtar => tar}/test/test_empty_mtree.c (100%) rename commands/{bsdtar => tar}/test/test_getdate.c (100%) rename commands/{bsdtar => tar}/test/test_help.c (100%) rename commands/{bsdtar => tar}/test/test_option_T_upper.c (100%) rename commands/{bsdtar => tar}/test/test_option_q.c (100%) rename commands/{bsdtar => tar}/test/test_option_r.c (100%) rename commands/{bsdtar => tar}/test/test_option_s.c (100%) rename commands/{bsdtar => tar}/test/test_patterns.c (100%) rename commands/{bsdtar => tar}/test/test_patterns_2.tar.uu (100%) rename commands/{bsdtar => tar}/test/test_patterns_3.tar.uu (100%) rename commands/{bsdtar => tar}/test/test_patterns_4.tar.uu (100%) rename commands/{bsdtar => tar}/test/test_stdio.c (100%) rename commands/{bsdtar => tar}/test/test_strip_components.c (100%) rename commands/{bsdtar => tar}/test/test_symlink_dir.c (100%) rename commands/{bsdtar => tar}/test/test_version.c (100%) rename commands/{bsdtar => tar}/test/test_windows.c (100%) rename commands/{bsdtar => tar}/tree.c (100%) rename commands/{bsdtar => tar}/tree.h (100%) rename commands/{bsdtar => tar}/util.c (100%) rename commands/{bsdtar => tar}/write.c (100%) diff --git a/commands/Makefile b/commands/Makefile index d8160d52d..393677698 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -4,7 +4,7 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \ backup badblocks banner basename bigmake binpackage \ - binpackages binsizes bsdtar bzip2 bzip2recover cal calendar \ + binpackages binsizes bzip2 bzip2recover cal calendar \ cat cawf cd cdprobe checkhier chmem \ chmod chown chroot ci cksum cleantmp clear cmp co \ comm compress cp crc cron crontab cut datasizes date \ @@ -27,7 +27,7 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \ rotate rsh rshd sed service setup shar size \ sleep slip sort spell split srccrc stat strings strip \ stty su sum svclog swapfs swifi sync synctree sysenv \ - syslogd tail talk talkd tcpd tcpdp tcpstat tee telnet \ + syslogd tail talk talkd tar tcpd tcpdp tcpstat tee telnet \ telnetd term termcap tget time tinyhalt top touch tr \ truncate tsort ttt tty udpstat umount uname unexpand \ uniq unstack update urlget uud uue version vol wc \ diff --git a/commands/pax/Makefile b/commands/pax/Makefile index 53f485238..a8673ee77 100644 --- a/commands/pax/Makefile +++ b/commands/pax/Makefile @@ -30,9 +30,8 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c fgetln.c -MAN= pax.1 tar.1 cpio.1 +MAN= pax.1 cpio.1 -LINKS+= ${BINDIR}/pax ${BINDIR}/tar LINKS+= ${BINDIR}/pax ${BINDIR}/cpio CPPFLAGS+= -DNET2_STAT=1 diff --git a/commands/bsdtar/Makefile b/commands/tar/Makefile similarity index 84% rename from commands/bsdtar/Makefile rename to commands/tar/Makefile index 19c5e4a29..8f5735212 100644 --- a/commands/bsdtar/Makefile +++ b/commands/tar/Makefile @@ -16,4 +16,7 @@ LDADD+= -larchive -lbz2 -lz CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/libarchive_fe +LINKS+= ${BINDIR}/bsdtar ${BINDIR}/tar +MLINKS+= bsdtar.1 tar.1 + .include diff --git a/commands/bsdtar/bsdtar.1 b/commands/tar/bsdtar.1 similarity index 100% rename from commands/bsdtar/bsdtar.1 rename to commands/tar/bsdtar.1 diff --git a/commands/bsdtar/bsdtar.c b/commands/tar/bsdtar.c similarity index 100% rename from commands/bsdtar/bsdtar.c rename to commands/tar/bsdtar.c diff --git a/commands/bsdtar/bsdtar.h b/commands/tar/bsdtar.h similarity index 100% rename from commands/bsdtar/bsdtar.h rename to commands/tar/bsdtar.h diff --git a/commands/bsdtar/bsdtar_platform.h b/commands/tar/bsdtar_platform.h similarity index 100% rename from commands/bsdtar/bsdtar_platform.h rename to commands/tar/bsdtar_platform.h diff --git a/commands/bsdtar/cmdline.c b/commands/tar/cmdline.c similarity index 100% rename from commands/bsdtar/cmdline.c rename to commands/tar/cmdline.c diff --git a/commands/bsdtar/config.h b/commands/tar/config.h similarity index 100% rename from commands/bsdtar/config.h rename to commands/tar/config.h diff --git a/commands/bsdtar/getdate.c b/commands/tar/getdate.c similarity index 100% rename from commands/bsdtar/getdate.c rename to commands/tar/getdate.c diff --git a/commands/bsdtar/libarchive_fe/Makefile.inc b/commands/tar/libarchive_fe/Makefile.inc similarity index 100% rename from commands/bsdtar/libarchive_fe/Makefile.inc rename to commands/tar/libarchive_fe/Makefile.inc diff --git a/commands/bsdtar/libarchive_fe/err.c b/commands/tar/libarchive_fe/err.c similarity index 100% rename from commands/bsdtar/libarchive_fe/err.c rename to commands/tar/libarchive_fe/err.c diff --git a/commands/bsdtar/libarchive_fe/err.h b/commands/tar/libarchive_fe/err.h similarity index 100% rename from commands/bsdtar/libarchive_fe/err.h rename to commands/tar/libarchive_fe/err.h diff --git a/commands/bsdtar/libarchive_fe/lafe_platform.h b/commands/tar/libarchive_fe/lafe_platform.h similarity index 100% rename from commands/bsdtar/libarchive_fe/lafe_platform.h rename to commands/tar/libarchive_fe/lafe_platform.h diff --git a/commands/bsdtar/libarchive_fe/line_reader.c b/commands/tar/libarchive_fe/line_reader.c similarity index 100% rename from commands/bsdtar/libarchive_fe/line_reader.c rename to commands/tar/libarchive_fe/line_reader.c diff --git a/commands/bsdtar/libarchive_fe/line_reader.h b/commands/tar/libarchive_fe/line_reader.h similarity index 100% rename from commands/bsdtar/libarchive_fe/line_reader.h rename to commands/tar/libarchive_fe/line_reader.h diff --git a/commands/bsdtar/libarchive_fe/matching.c b/commands/tar/libarchive_fe/matching.c similarity index 100% rename from commands/bsdtar/libarchive_fe/matching.c rename to commands/tar/libarchive_fe/matching.c diff --git a/commands/bsdtar/libarchive_fe/matching.h b/commands/tar/libarchive_fe/matching.h similarity index 100% rename from commands/bsdtar/libarchive_fe/matching.h rename to commands/tar/libarchive_fe/matching.h diff --git a/commands/bsdtar/libarchive_fe/pathmatch.c b/commands/tar/libarchive_fe/pathmatch.c similarity index 100% rename from commands/bsdtar/libarchive_fe/pathmatch.c rename to commands/tar/libarchive_fe/pathmatch.c diff --git a/commands/bsdtar/libarchive_fe/pathmatch.h b/commands/tar/libarchive_fe/pathmatch.h similarity index 100% rename from commands/bsdtar/libarchive_fe/pathmatch.h rename to commands/tar/libarchive_fe/pathmatch.h diff --git a/commands/bsdtar/read.c b/commands/tar/read.c similarity index 100% rename from commands/bsdtar/read.c rename to commands/tar/read.c diff --git a/commands/bsdtar/subst.c b/commands/tar/subst.c similarity index 100% rename from commands/bsdtar/subst.c rename to commands/tar/subst.c diff --git a/commands/bsdtar/test/.deps/bsdtar_test-main.Po b/commands/tar/test/.deps/bsdtar_test-main.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-main.Po rename to commands/tar/test/.deps/bsdtar_test-main.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_0.Po b/commands/tar/test/.deps/bsdtar_test-test_0.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_0.Po rename to commands/tar/test/.deps/bsdtar_test-test_0.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_basic.Po b/commands/tar/test/.deps/bsdtar_test-test_basic.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_basic.Po rename to commands/tar/test/.deps/bsdtar_test-test_basic.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_copy.Po b/commands/tar/test/.deps/bsdtar_test-test_copy.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_copy.Po rename to commands/tar/test/.deps/bsdtar_test-test_copy.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_empty_mtree.Po b/commands/tar/test/.deps/bsdtar_test-test_empty_mtree.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_empty_mtree.Po rename to commands/tar/test/.deps/bsdtar_test-test_empty_mtree.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_getdate.Po b/commands/tar/test/.deps/bsdtar_test-test_getdate.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_getdate.Po rename to commands/tar/test/.deps/bsdtar_test-test_getdate.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_help.Po b/commands/tar/test/.deps/bsdtar_test-test_help.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_help.Po rename to commands/tar/test/.deps/bsdtar_test-test_help.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_option_T_upper.Po b/commands/tar/test/.deps/bsdtar_test-test_option_T_upper.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_option_T_upper.Po rename to commands/tar/test/.deps/bsdtar_test-test_option_T_upper.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_option_q.Po b/commands/tar/test/.deps/bsdtar_test-test_option_q.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_option_q.Po rename to commands/tar/test/.deps/bsdtar_test-test_option_q.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_option_r.Po b/commands/tar/test/.deps/bsdtar_test-test_option_r.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_option_r.Po rename to commands/tar/test/.deps/bsdtar_test-test_option_r.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_option_s.Po b/commands/tar/test/.deps/bsdtar_test-test_option_s.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_option_s.Po rename to commands/tar/test/.deps/bsdtar_test-test_option_s.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_patterns.Po b/commands/tar/test/.deps/bsdtar_test-test_patterns.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_patterns.Po rename to commands/tar/test/.deps/bsdtar_test-test_patterns.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_stdio.Po b/commands/tar/test/.deps/bsdtar_test-test_stdio.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_stdio.Po rename to commands/tar/test/.deps/bsdtar_test-test_stdio.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_strip_components.Po b/commands/tar/test/.deps/bsdtar_test-test_strip_components.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_strip_components.Po rename to commands/tar/test/.deps/bsdtar_test-test_strip_components.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_symlink_dir.Po b/commands/tar/test/.deps/bsdtar_test-test_symlink_dir.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_symlink_dir.Po rename to commands/tar/test/.deps/bsdtar_test-test_symlink_dir.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_version.Po b/commands/tar/test/.deps/bsdtar_test-test_version.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_version.Po rename to commands/tar/test/.deps/bsdtar_test-test_version.Po diff --git a/commands/bsdtar/test/.deps/bsdtar_test-test_windows.Po b/commands/tar/test/.deps/bsdtar_test-test_windows.Po similarity index 100% rename from commands/bsdtar/test/.deps/bsdtar_test-test_windows.Po rename to commands/tar/test/.deps/bsdtar_test-test_windows.Po diff --git a/commands/bsdtar/test/CMakeLists.txt b/commands/tar/test/CMakeLists.txt similarity index 100% rename from commands/bsdtar/test/CMakeLists.txt rename to commands/tar/test/CMakeLists.txt diff --git a/commands/bsdtar/test/config.sh b/commands/tar/test/config.sh similarity index 100% rename from commands/bsdtar/test/config.sh rename to commands/tar/test/config.sh diff --git a/commands/bsdtar/test/list.h b/commands/tar/test/list.h similarity index 100% rename from commands/bsdtar/test/list.h rename to commands/tar/test/list.h diff --git a/commands/bsdtar/test/main.c b/commands/tar/test/main.c similarity index 100% rename from commands/bsdtar/test/main.c rename to commands/tar/test/main.c diff --git a/commands/bsdtar/test/test-acl.sh b/commands/tar/test/test-acl.sh similarity index 100% rename from commands/bsdtar/test/test-acl.sh rename to commands/tar/test/test-acl.sh diff --git a/commands/bsdtar/test/test-basic.sh b/commands/tar/test/test-basic.sh similarity index 100% rename from commands/bsdtar/test/test-basic.sh rename to commands/tar/test/test-basic.sh diff --git a/commands/bsdtar/test/test-deep-dir.sh b/commands/tar/test/test-deep-dir.sh similarity index 100% rename from commands/bsdtar/test/test-deep-dir.sh rename to commands/tar/test/test-deep-dir.sh diff --git a/commands/bsdtar/test/test-flags.sh b/commands/tar/test/test-flags.sh similarity index 100% rename from commands/bsdtar/test/test-flags.sh rename to commands/tar/test/test-flags.sh diff --git a/commands/bsdtar/test/test-nodump.sh b/commands/tar/test/test-nodump.sh similarity index 100% rename from commands/bsdtar/test/test-nodump.sh rename to commands/tar/test/test-nodump.sh diff --git a/commands/bsdtar/test/test-overwrite.sh b/commands/tar/test/test-overwrite.sh similarity index 100% rename from commands/bsdtar/test/test-overwrite.sh rename to commands/tar/test/test-overwrite.sh diff --git a/commands/bsdtar/test/test-utf8.sh b/commands/tar/test/test-utf8.sh similarity index 100% rename from commands/bsdtar/test/test-utf8.sh rename to commands/tar/test/test-utf8.sh diff --git a/commands/bsdtar/test/test.h b/commands/tar/test/test.h similarity index 100% rename from commands/bsdtar/test/test.h rename to commands/tar/test/test.h diff --git a/commands/bsdtar/test/test_0.c b/commands/tar/test/test_0.c similarity index 100% rename from commands/bsdtar/test/test_0.c rename to commands/tar/test/test_0.c diff --git a/commands/bsdtar/test/test_basic.c b/commands/tar/test/test_basic.c similarity index 100% rename from commands/bsdtar/test/test_basic.c rename to commands/tar/test/test_basic.c diff --git a/commands/bsdtar/test/test_copy.c b/commands/tar/test/test_copy.c similarity index 100% rename from commands/bsdtar/test/test_copy.c rename to commands/tar/test/test_copy.c diff --git a/commands/bsdtar/test/test_empty_mtree.c b/commands/tar/test/test_empty_mtree.c similarity index 100% rename from commands/bsdtar/test/test_empty_mtree.c rename to commands/tar/test/test_empty_mtree.c diff --git a/commands/bsdtar/test/test_getdate.c b/commands/tar/test/test_getdate.c similarity index 100% rename from commands/bsdtar/test/test_getdate.c rename to commands/tar/test/test_getdate.c diff --git a/commands/bsdtar/test/test_help.c b/commands/tar/test/test_help.c similarity index 100% rename from commands/bsdtar/test/test_help.c rename to commands/tar/test/test_help.c diff --git a/commands/bsdtar/test/test_option_T_upper.c b/commands/tar/test/test_option_T_upper.c similarity index 100% rename from commands/bsdtar/test/test_option_T_upper.c rename to commands/tar/test/test_option_T_upper.c diff --git a/commands/bsdtar/test/test_option_q.c b/commands/tar/test/test_option_q.c similarity index 100% rename from commands/bsdtar/test/test_option_q.c rename to commands/tar/test/test_option_q.c diff --git a/commands/bsdtar/test/test_option_r.c b/commands/tar/test/test_option_r.c similarity index 100% rename from commands/bsdtar/test/test_option_r.c rename to commands/tar/test/test_option_r.c diff --git a/commands/bsdtar/test/test_option_s.c b/commands/tar/test/test_option_s.c similarity index 100% rename from commands/bsdtar/test/test_option_s.c rename to commands/tar/test/test_option_s.c diff --git a/commands/bsdtar/test/test_patterns.c b/commands/tar/test/test_patterns.c similarity index 100% rename from commands/bsdtar/test/test_patterns.c rename to commands/tar/test/test_patterns.c diff --git a/commands/bsdtar/test/test_patterns_2.tar.uu b/commands/tar/test/test_patterns_2.tar.uu similarity index 100% rename from commands/bsdtar/test/test_patterns_2.tar.uu rename to commands/tar/test/test_patterns_2.tar.uu diff --git a/commands/bsdtar/test/test_patterns_3.tar.uu b/commands/tar/test/test_patterns_3.tar.uu similarity index 100% rename from commands/bsdtar/test/test_patterns_3.tar.uu rename to commands/tar/test/test_patterns_3.tar.uu diff --git a/commands/bsdtar/test/test_patterns_4.tar.uu b/commands/tar/test/test_patterns_4.tar.uu similarity index 100% rename from commands/bsdtar/test/test_patterns_4.tar.uu rename to commands/tar/test/test_patterns_4.tar.uu diff --git a/commands/bsdtar/test/test_stdio.c b/commands/tar/test/test_stdio.c similarity index 100% rename from commands/bsdtar/test/test_stdio.c rename to commands/tar/test/test_stdio.c diff --git a/commands/bsdtar/test/test_strip_components.c b/commands/tar/test/test_strip_components.c similarity index 100% rename from commands/bsdtar/test/test_strip_components.c rename to commands/tar/test/test_strip_components.c diff --git a/commands/bsdtar/test/test_symlink_dir.c b/commands/tar/test/test_symlink_dir.c similarity index 100% rename from commands/bsdtar/test/test_symlink_dir.c rename to commands/tar/test/test_symlink_dir.c diff --git a/commands/bsdtar/test/test_version.c b/commands/tar/test/test_version.c similarity index 100% rename from commands/bsdtar/test/test_version.c rename to commands/tar/test/test_version.c diff --git a/commands/bsdtar/test/test_windows.c b/commands/tar/test/test_windows.c similarity index 100% rename from commands/bsdtar/test/test_windows.c rename to commands/tar/test/test_windows.c diff --git a/commands/bsdtar/tree.c b/commands/tar/tree.c similarity index 100% rename from commands/bsdtar/tree.c rename to commands/tar/tree.c diff --git a/commands/bsdtar/tree.h b/commands/tar/tree.h similarity index 100% rename from commands/bsdtar/tree.h rename to commands/tar/tree.h diff --git a/commands/bsdtar/util.c b/commands/tar/util.c similarity index 100% rename from commands/bsdtar/util.c rename to commands/tar/util.c diff --git a/commands/bsdtar/write.c b/commands/tar/write.c similarity index 100% rename from commands/bsdtar/write.c rename to commands/tar/write.c