This revision was automatically updated to reflect the committed changes.
Closed by commit rS285844: ar: add -U (unique) option to disable -D
(deterministic) mode (authored by emaste).
CHANGED PRIOR TO COMMIT
https://reviews.freebsd.org/D3175?vs=7235&id=7268#toc
REPOSITORY
rS FreeBSD src repository
CHANGES SINCE LAST UPDATE
https://reviews.freebsd.org/D3175?vs=7235&id=7268
REVISION DETAIL
https://reviews.freebsd.org/D3175
AFFECTED FILES
head/usr.bin/ar/ar.1
head/usr.bin/ar/ar.c
EMAIL PREFERENCES
https://reviews.freebsd.org/settings/panel/emailpreferences/
To: emaste, imp, brooks, bapt
Cc: freebsd-toolchain-list
diff --git a/head/usr.bin/ar/ar.1 b/head/usr.bin/ar/ar.1
--- a/head/usr.bin/ar/ar.1
+++ b/head/usr.bin/ar/ar.1
@@ -23,7 +23,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 22, 2011
+.Dd July 24, 2015
.Dt AR 1
.Os
.Sh NAME
@@ -66,6 +66,7 @@
.Op Fl D
.Op Fl f
.Op Fl s | Fl S
+.Op Fl U
.Op Fl v
.Op Fl z
.Ar archive
@@ -82,6 +83,7 @@
.Op Fl j
.Op Fl s | Fl S
.Op Fl u
+.Op Fl U
.Op Fl v
.Op Fl z
.Ar archive
@@ -112,6 +114,7 @@
.Fl M
.Nm ranlib
.Op Fl D
+.Op Fl U
.Ar archive ...
.Sh DESCRIPTION
The
@@ -207,6 +210,11 @@
.Ar .
This ensures that checksums on the resulting archives are reproducible
when member contents are identical.
+If multiple
+.Fl D
+and
+.Fl U
+options are specified on the command line, the final one takes precedence.
.It Fl f
Synonymous with option
.Fl T .
@@ -316,6 +324,19 @@
.Ar
will be extracted only if they are newer than the corresponding
files in the file system.
+.It Fl U
+When used in combination with the
+.Fl r
+or
+.Fl q
+option, insert the real mtime, uid and gid, and file mode values
+from the members named by arguments
+.Ar .
+If multiple
+.Fl D
+and
+.Fl U
+options are specified on the command line, the final one takes precedence.
.It Fl v
Provide verbose output.
When used with the
diff --git a/head/usr.bin/ar/ar.c b/head/usr.bin/ar/ar.c
--- a/head/usr.bin/ar/ar.c
+++ b/head/usr.bin/ar/ar.c
@@ -113,15 +113,18 @@
len = strlen(bsdar->progname);
if (len >= strlen("ranlib") &&
strcmp(bsdar->progname + len - strlen("ranlib"), "ranlib") == 0) {
- while ((opt = getopt_long(argc, argv, "tDV", longopts,
+ while ((opt = getopt_long(argc, argv, "tDUV", longopts,
NULL)) != -1) {
switch(opt) {
case 't':
/* Ignored. */
break;
case 'D':
bsdar->options |= AR_D;
break;
+ case 'U':
+ bsdar->options &= ~AR_D;
+ break;
case 'V':
ranlib_version();
break;
@@ -157,7 +160,7 @@
}
}
- while ((opt = getopt_long(argc, argv, "abCcdDfijlMmopqrSsTtuVvxz",
+ while ((opt = getopt_long(argc, argv, "abCcdDfijlMmopqrSsTtUuVvxz",
longopts, NULL)) != -1) {
switch(opt) {
case 'a':
@@ -216,6 +219,9 @@
case 't':
set_mode(bsdar, opt);
break;
+ case 'U':
+ bsdar->options &= ~AR_D;
+ break;
case 'u':
bsdar->options |= AR_U;
break;
@@ -364,9 +370,9 @@
(void)fprintf(stderr, "\tar -m [-Tjsvz] archive file ...\n");
(void)fprintf(stderr, "\tar -m [-Tabijsvz] position archive file ...\n");
(void)fprintf(stderr, "\tar -p [-Tv] archive [file ...]\n");
- (void)fprintf(stderr, "\tar -q [-TcDjsvz] archive file ...\n");
- (void)fprintf(stderr, "\tar -r [-TcDjsuvz] archive file ...\n");
- (void)fprintf(stderr, "\tar -r [-TabcDijsuvz] position archive file ...\n");
+ (void)fprintf(stderr, "\tar -q [-TcDjsUvz] archive file ...\n");
+ (void)fprintf(stderr, "\tar -r [-TcDjsUuvz] archive file ...\n");
+ (void)fprintf(stderr, "\tar -r [-TabcDijsUuvz] position archive file ...\n");
(void)fprintf(stderr, "\tar -s [-jz] archive\n");
(void)fprintf(stderr, "\tar -t [-Tv] archive [file ...]\n");
(void)fprintf(stderr, "\tar -x [-CTouv] archive [file ...]\n");
@@ -378,7 +384,7 @@
ranlib_usage(void)
{
- (void)fprintf(stderr, "usage: ranlib [-t] archive ...\n");
+ (void)fprintf(stderr, "usage: ranlib [-DtU] archive ...\n");
(void)fprintf(stderr, "\tranlib -V\n");
exit(EX_USAGE);
}
_______________________________________________
freebsd-toolchain@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-toolchain
To unsubscribe, send any mail to "freebsd-toolchain-unsubscr...@freebsd.org"
