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

Add a --version option to bsdtar that prints the versions of

Browse Source 
both bsdtar and libarchive.  Of course, this requires that bsdtar
have a version number.  Let's call this 1.00, shall we? ;-)
This commit is contained in:
Tim Kientzle 2004-07-26 03:21:41 +00:00
parent e791a7a913
commit 556d6e605e
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/tar/Makefile
View File

@ -1,10 +1,12 @@
# $FreeBSD$ # $FreeBSD$
PROG= bsdtar PROG= bsdtar
VERSION= 1.00
SRCS= bsdtar.c matching.c read.c util.c write.c SRCS= bsdtar.c matching.c read.c util.c write.c
WARNS?= 6 WARNS?= 6
DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
LDADD= -larchive -lbz2 -lz LDADD= -larchive -lbz2 -lz
CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\"
.if !defined(WITH_GTAR) .if !defined(WITH_GTAR)
SYMLINKS= ${BINDIR}/bsdtar ${BINDIR}/tar SYMLINKS= ${BINDIR}/bsdtar ${BINDIR}/tar

23
usr.bin/tar/bsdtar.c
View File

@ -67,6 +67,7 @@ static void only_mode(struct bsdtar *, char mode, const char *opt,
static char ** rewrite_argv(struct bsdtar *, static char ** rewrite_argv(struct bsdtar *,
int *argc, char ** src_argv, int *argc, char ** src_argv,
const char *optstring); const char *optstring);
static void version(void);
/* /*
* The leading '+' here forces the GNU version of getopt() (as well as * The leading '+' here forces the GNU version of getopt() (as well as
@ -99,6 +100,7 @@ static const char *tar_opts = "+Bb:C:cF:f:HhjkLlmnOoPprtT:UuvW:wX:xyZz";
#define OPTION_NO_SAME_PERMISSIONS 6 #define OPTION_NO_SAME_PERMISSIONS 6
#define OPTION_NULL 7 #define OPTION_NULL 7
#define OPTION_ONE_FILE_SYSTEM 8 #define OPTION_ONE_FILE_SYSTEM 8
#define OPTION_VERSION 9
static const struct option tar_longopts[] = { static const struct option tar_longopts[] = {
{ "absolute-paths", no_argument, NULL, 'P' }, { "absolute-paths", no_argument, NULL, 'P' },
@ -141,6 +143,7 @@ static const struct option tar_longopts[] = {
{ "unlink-first", no_argument, NULL, 'U' }, { "unlink-first", no_argument, NULL, 'U' },
{ "update", no_argument, NULL, 'u' }, { "update", no_argument, NULL, 'u' },
{ "verbose", no_argument, NULL, 'v' }, { "verbose", no_argument, NULL, 'v' },
{ "version", no_argument, NULL, OPTION_VERSION },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -355,6 +358,9 @@ main(int argc, char **argv)
case 'v': /* SUSv2 */ case 'v': /* SUSv2 */
bsdtar->verbose++; bsdtar->verbose++;
break; break;
case OPTION_VERSION:
version();
break;
case 'w': /* SUSv2 */ case 'w': /* SUSv2 */
bsdtar->option_interactive = 1; bsdtar->option_interactive = 1;
break; break;
@ -573,6 +579,15 @@ usage(struct bsdtar *bsdtar)
exit(1); exit(1);
} }
static void
version(void)
{
printf("bsdtar %s, ", PACKAGE_VERSION);
printf("%s\n", archive_version());
printf("Copyright (C) 2003-2004 Tim Kientzle\n");
exit(1);
}
static const char *long_help_msg = static const char *long_help_msg =
"First option must be a mode specifier:\n" "First option must be a mode specifier:\n"
" -c Create -r Add/Replace -t List -u Update -x Extract\n" " -c Create -r Add/Replace -t List -u Update -x Extract\n"
@ -622,8 +637,8 @@ long_help(struct bsdtar *bsdtar)
fflush(stderr); fflush(stderr);
p = (strcmp(prog,"bsdtar")!=0) ? "(bsdtar)" : ""; p = (strcmp(prog,"bsdtar") != 0) ? "(bsdtar)" : "";
fprintf(stdout, "%s%s: manipulate archive files\n", prog, p); printf("%s%s: manipulate archive files\n", prog, p);
for (p = long_help_msg; *p != '\0'; p++) { for (p = long_help_msg; *p != '\0'; p++) {
if (*p == '%') { if (*p == '%') {
@ -635,8 +650,8 @@ long_help(struct bsdtar *bsdtar)
} else } else
putchar(*p); putchar(*p);
} }
fprintf(stdout, "\n%s\n", archive_version()); printf("\n");
fflush(stderr); version();
} }
static int static int