Sync llcommon with Alchemy a bit.

llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.

indra/llcommon/llbase64.cpp

@@ -3,31 +3,25 @@
  * @brief Wrapper for apr base64 encoding that returns a std::string
  * @author James Cook
  *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -36,32 +30,72 @@
 #include "llbase64.h"
 
 #include <string>
-
 #include "apr_base64.h"
 
-
 // static
 std::string LLBase64::encode(const U8* input, size_t input_size)
 {
-	std::string output;
-	if (input
-		&& input_size > 0)
-	{
-		// Yes, it returns int.
-		int b64_buffer_length = apr_base64_encode_len(input_size);
-		char* b64_buffer = new char[b64_buffer_length];
-		
-		// This is faster than apr_base64_encode() if you know
-		// you're not on an EBCDIC machine.  Also, the output is
-		// null terminated, even though the documentation doesn't
-		// specify.  See apr_base64.c for details. JC
-		b64_buffer_length = apr_base64_encode_binary(
-			b64_buffer,
-			input,
-			input_size);
-		output.assign(b64_buffer);
-		delete[] b64_buffer;
-	}
-	return output;
+	if (!(input && input_size > 0)) return LLStringUtil::null;
+
+	// Yes, it returns int.
+	int b64_buffer_length = apr_base64_encode_len(input_size);
+	char* b64_buffer = new char[b64_buffer_length];
+	
+	// This is faster than apr_base64_encode() if you know
+	// you're not on an EBCDIC machine.  Also, the output is
+	// null terminated, even though the documentation doesn't
+	// specify.  See apr_base64.c for details. JC
+	b64_buffer_length = apr_base64_encode_binary(
+		b64_buffer,
+		input,
+		input_size);
+	std::string result;
+	result.assign(b64_buffer);
+	delete[] b64_buffer;
+
+	return result;
+}
+
+// static
+std::string LLBase64::encode(const std::string& in_str)
+{
+	size_t data_size = in_str.size();
+	std::vector<U8> data;
+	data.resize(data_size);
+	memcpy(&data[0], in_str.c_str(), data_size);
+	return encode(&data[0], data_size);
+}
+
+// static
+size_t LLBase64::decode(const std::string& input, U8 * buffer, size_t buffer_size)
+{
+	if (input.empty()) return 0;
+
+	size_t bytes_written = apr_base64_decode_binary(buffer, input.data());
+
+	return bytes_written;
+}
+
+std::string LLBase64::decode(const std::string& input)
+{
+	U32 buffer_len = LLBase64::requiredDecryptionSpace(input);
+	std::vector<U8> buffer(buffer_len);
+	buffer_len = LLBase64::decode(input, &buffer[0], buffer_len);
+	buffer.resize(buffer_len);
+	return std::string(reinterpret_cast<const char*>(&buffer[0]), buffer_len);
+}
+
+// static
+size_t LLBase64::requiredDecryptionSpace(const std::string& str)
+{
+	size_t len = str.length();
+	U32 padding = 0;
+ 
+	if (str[len - 1] == '=' && str[len - 2] == '=') //last two chars are =
+		padding = 2;
+	else if (str[len - 1] == '=') //last char is =
+		padding = 1;
+
+	return len * 0.75 - padding;
 }