Changeset 1237

Timestamp:

07/20/08 20:39:38 (4 months ago)

Author:

ahu

Message:

remove use of possibly buggy 'chomp' from arguments.cc and move to trim_right(). Solves issue reported by Tyler Hall

Files:

• trunk/pdns/pdns/arguments.cc (modified) (6 diffs)

trunk/pdns/pdns/arguments.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-6
+8
-
-    This program is free software; you can redistribute it and/or modify
@@ -16 +16 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-
-
-#include "arguments.hh"
+#include <boost/algorithm/string.hpp>
+using namespace boost;
-
-const ArgvMap::param_t::const_iterator ArgvMap::begin()
@@ -260 +259 @@
-
-  while(getline(f,pline)) {
-chomp(pline," \t\r\n");   // strip trailing white spaces
-
+trim_right(pline);
+
-    if(pline[pline.size()-1]=='\\') {
-      line+=pline.substr(0,pline.length()-1);
@@ -274 +273 @@
-
-    // strip trailing spaces
-chomp(line," \t"
+trim_right(line
-
-    // strip leading spaces
@@ -302 +301 @@
-
-  while(getline(f,pline)) {
-chomp(pline," \t\r\n");   // strip trailing white spaces
+trim_right(pline);
-    if(pline.empty())
-      continue;
@@ -319 +318 @@
-
-    // strip trailing spaces
-
-
+
-    // strip leading spaces
-    if((pos=line.find_first_not_of(" \t\r\n"))!=string::npos)