From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 12 Oct 2009 05:29:38 +0000 (-0400)
Subject: Rename Rock Ridge option name from `rock-ridge' to `rockridge' and `Rockridge'.
X-Git-Tag: v2.8.0~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a884177b2a5ff220dd28c07c2f5ec941f1afca59;p=thirdparty%2Flibarchive.git

Rename Rock Ridge option name from `rock-ridge' to `rockridge' and `Rockridge'.

SVN-Revision: 1509
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index de4159d63..0b2c69259 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -476,7 +476,8 @@ archive_read_format_iso9660_options(struct archive_read *a,
 			iso9660->opt_support_joliet = 1;
 		return (ARCHIVE_OK);
 	}
-	if (strcmp(key, "rock-ridge") == 0) {
+	if (strcmp(key, "rockridge") == 0 ||
+	    strcmp(key, "Rockridge") == 0) {
 		iso9660->opt_support_rockridge = val != NULL;
 		return (ARCHIVE_OK);
 	}
diff --git a/tar/bsdtar.1 b/tar/bsdtar.1
index 28d5106e2..67cac1099 100644
--- a/tar/bsdtar.1
+++ b/tar/bsdtar.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/usr.bin/tar/bsdtar.1,v 1.46 2008/12/06 07:37:55 kientzle Exp $
 .\"
-.Dd May 26, 2009
+.Dd Oct 12, 2009
 .Dt BSDTAR 1
 .Os
 .Sh NAME
@@ -336,12 +336,12 @@ This is enabled by default, use
 or
 .Cm iso9660:!joliet
 to disable.
-.It Cm iso9660:rock-ridge
+.It Cm iso9660:rockridge
 Support Rock Ridge extensions.
 This is enabled by default, use
-.Cm !rock-ridge
+.Cm !rockridge
 or
-.Cm iso9660:!rock-ridge
+.Cm iso9660:!rockridge
 to disable.
 .It Cm gzip:compression-level
 A decimal integer from 0 to 9 specifying the gzip compression level.