[spellcheck] Updated Hunspell to 1.5.4

third_party/hunspell/src/hunspell/filemgr.cxx

Index: third_party/hunspell/src/hunspell/filemgr.cxx
diff --git a/third_party/hunspell/src/hunspell/filemgr.cxx b/third_party/hunspell/src/hunspell/filemgr.cxx
index 05fc3077896f2bf965e3acc13716e0ebe330b522..aef6dbade033a3066e524243f75fda7d410b2b98 100644
--- a/third_party/hunspell/src/hunspell/filemgr.cxx
+++ b/third_party/hunspell/src/hunspell/filemgr.cxx
@@ -1,11 +1,82 @@
-#include "license.hunspell"
-#include "license.myspell"
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Hunspell, based on MySpell.
+ *
+ * The Initial Developers of the Original Code are
+ * Kevin Hendricks (MySpell) and Németh László (Hunspell).
+ * Portions created by the Initial Developers are Copyright (C) 2002-2005
+ * the Initial Developers. All Rights Reserved.
+ *
+ * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
+ * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
+ * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
+ * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
+ * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+/*
+ * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
+ * And Contributors.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. All modifications to the source code must be clearly marked as
+ *    such.  Binary redistributions based on modified source code
+ *    must be clearly marked as modified versions in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "filemgr.hxx"
+#include "csutil.hxx"
 
 #ifdef HUNSPELL_CHROME_CLIENT
 #include "third_party/hunspell/google/bdict_reader.h"
@@ -16,13 +87,13 @@ FileMgr::FileMgr(hunspell::LineIterator* iterator) : iterator_(iterator) {
 FileMgr::~FileMgr() {
 }
 
-char * FileMgr::getline() {
-  // Read one line from a BDICT file and store the line to our line buffer.
-  // To emulate the original FileMgr::getline(), this function returns
-  // the pointer to our line buffer if we can read a line without errors.
-  // Otherwise, this function returns NULL.
+bool FileMgr::getline(std::string& line) {
+  // Read one line from a BDICT file and return it, if we can read a line
+  // without errors.
   bool result = iterator_->AdvanceAndCopy(line_, BUFSIZE - 1);
-  return result ? line_ : NULL;
+  if (result)
+    line = line_;
+  return result;
 }
 
 int FileMgr::getlinenum() {
@@ -33,44 +104,44 @@ int FileMgr::getlinenum() {
   return 0;
 }
 #else
-int FileMgr::fail(const char * err, const char * par) {
-    fprintf(stderr, err, par);
-    return -1;
+int FileMgr::fail(const char* err, const char* par) {
+  fprintf(stderr, err, par);
+  return -1;
 }
 
-FileMgr::FileMgr(const char * file, const char * key) {
-    linenum = 0;
-    hin = NULL;
-    fin = fopen(file, "r");
-    if (!fin) {
-        // check hzipped file
-        char * st = (char *) malloc(strlen(file) + strlen(HZIP_EXTENSION) + 1);
-        if (st) {
-            strcpy(st, file);
-            strcat(st, HZIP_EXTENSION);
-            hin = new Hunzip(st, key);
-            free(st);
-        }
-    }    
-    if (!fin && !hin) fail(MSG_OPEN, file);
+FileMgr::FileMgr(const char* file, const char* key) : hin(NULL), linenum(0) {
+  in[0] = '\0';
+
+  myopen(fin, file, std::ios_base::in);
+  if (!fin.is_open()) {
+    // check hzipped file
+    std::string st(file);
+    st.append(HZIP_EXTENSION);
+    hin = new Hunzip(st.c_str(), key);
+  }
+  if (!fin.is_open() && !hin->is_open())
+    fail(MSG_OPEN, file);
 }
 
-FileMgr::~FileMgr()
-{
-    if (fin) fclose(fin);
-    if (hin) delete hin;
+FileMgr::~FileMgr() {
+  delete hin;
 }
 
-char * FileMgr::getline() {
-    const char * l;
-    linenum++;
-    if (fin) return fgets(in, BUFSIZE - 1, fin);
-    if (hin && ((l = hin->getline()) != NULL)) return strcpy(in, l);
-    linenum--;
-    return NULL;
+bool FileMgr::getline(std::string& dest) {
+  bool ret = false;
+  ++linenum;
+  if (fin.is_open()) {
+    ret = static_cast<bool>(std::getline(fin, dest));
+  } else if (hin->is_open()) {
+    ret = hin->getline(dest);
+  }
+  if (!ret) {
+    --linenum;
+  }
+  return ret;
 }
 
 int FileMgr::getlinenum() {
-    return linenum;
+  return linenum;
 }
 #endif