1 files changed, 28 insertions, 62 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 5f48580..70f7d54 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -2,6 +2,8 @@
  * @file llstring.h
  * @brief String utility functions and LLString class.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,22 +26,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLSTRING_H
 #define LL_LLSTRING_H
 
-#include "stdtypes.h"
-#include "llerror.h"
-#include "llfile.h"
-#include <algorithm>
-#include <map>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <math.h>
-#include <stdarg.h> /* for vsnprintf */
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
 #include <wchar.h>
@@ -280,9 +272,6 @@ public:
          */
         static void _makeASCII(std::basic_string<T>& string);
 
-        static BOOL     read(std::basic_string<T>& string, const char* filename);        /*Flawfinder: ignore*/
-        static BOOL     write(std::basic_string<T>& string, const char* filename);
-
         // Conversion to other data types
         static BOOL     convertToBOOL(const std::basic_string<T>& string, BOOL& value);
         static BOOL     convertToU8(const std::basic_string<T>& string, U8& value);
@@ -332,6 +321,18 @@ template<class T> LLStringBase<T> LLStringBase<T>::null;
 typedef LLStringBase<char> LLString;
 typedef LLStringBase<llwchar> LLWString;
 
+//@ Use this where we want to disallow input in the form of "foo"
+//  This is used to catch places where english text is embedded in the code
+//  instead of in a translatable XUI file.
+class LLStringExplicit : public LLString
+{
+public:
+        explicit LLStringExplicit(const char* s) : LLString(s) {}
+        LLStringExplicit(const LLString& s) : LLString(s) {}
+        LLStringExplicit(const std::string& s) : LLString(s) {}
+        LLStringExplicit(const std::string& s, size_type pos, size_type n = std::string::npos) : LLString(s, pos, n) {}
+};
+
 struct LLDictionaryLess
 {
 public:
@@ -347,7 +348,7 @@ public:
  */
 
 /**
- * @breif chop off the trailing characters in a string.
+ * @brief chop off the trailing characters in a string.
  *
  * This function works on bytes rather than glyphs, so this will
  * incorrectly truncate non-single byte strings.
@@ -373,6 +374,16 @@ std::string ll_safe_string(const char* in);
  */
 U8 hex_as_nybble(char hex);
 
+/**
+ * @brief read the contents of a file into a string.
+ *
+ * Since this function has no concept of character encoding, most
+ * anything you do with this method ill-advised. Please avoid.
+ * @param str [out] The string which will have.
+ * @param filename The full name of the file to read.
+ * @return Returns true on success. If false, str is unmodified.
+ */
+bool _read_file_into_string(std::string& str, const char* filename);
 
 /**
  * Unicode support
@@ -933,8 +944,6 @@ void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T r
 template<class T> 
 void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
 {
-        llassert( spaces_per_tab >= 0 );
-
         const T TAB = '\t';
         const T SPACE = ' ';
 
@@ -1037,11 +1046,10 @@ void LLStringBase<T>::copy( T* dst, const T* src, size_type dst_size )
 template<class T> 
 void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset)
 {
-        llassert( offset <= dst.length() );
-
-        // special case - append to end of string and avoid expensive (when strings are large) string manipulations
         if ( offset == dst.length() )
         {
+                // special case - append to end of string and avoid expensive
+                // (when strings are large) string manipulations
                 dst += src;
         }
         else
@@ -1070,48 +1078,6 @@ BOOL LLStringBase<T>::isHead( const std::basic_string<T>& string, const T* s )
         }
 }
 
-//static
-template<class T> 
-BOOL LLStringBase<T>::read(std::basic_string<T>& string, const char* filename)   /*Flawfinder: ignore*/
-{
-        llifstream ifs(filename, llifstream::binary);
-        if (!ifs.is_open())
-        {
-                llinfos << "Unable to open file" << filename << llendl;
-                return FALSE;
-        }
-
-        std::basic_ostringstream<T> oss;
-
-        oss << ifs.rdbuf();
-
-        string = oss.str();
-
-        ifs.close();
-        return TRUE;
-}
-
-//static
-template<class T> 
-BOOL LLStringBase<T>::write(std::basic_string<T>& string, const char* filename)
-{
-#if LL_LINUX  || LL_SOLARIS
-    printf("STUBBED: LLStringBase<T>::write at %s:%d\n", __FILE__, __LINE__);
-#else
-        llofstream ofs(filename, llofstream::binary);
-        if (!ofs.is_open())
-        {
-                llinfos << "Unable to open file" << filename << llendl;
-                return FALSE;
-        }
-
-        ofs << string;
-
-        ofs.close();
-#endif
-        return TRUE;
-}
-
 template<class T> 
 BOOL LLStringBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& value)
 {