Changeset 1234

Timestamp:

07/15/08 23:51:16 (4 months ago)

Author:

ahu

Message:

fix two more Shawn bugs: don't trip up over a line consisting of nothing but comments and leading whitespace, plus deal with "$ORIGIN ." correctly

Files:

• trunk/pdns/pdns/misc.hh (modified) (1 diff)
• trunk/pdns/pdns/zoneparser-tng.cc (modified) (4 diffs)

trunk/pdns/pdns/misc.hh

@@ -385 +385 @@
-  string ret=domain;
-  ret.append(1,'.');
-
+
+
-  return ret;
-}

trunk/pdns/pdns/zoneparser-tng.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-7
+8
-
-    This program is free software; you can redistribute it and/or modify
@@ -235 +235 @@
-    goto retry;
-
+  if(parts[0].first != parts[0].second && makeString(d_line, parts[0])[0]==';') // line consisting of nothing but comments
+    goto retry;
+
-  if(d_line[0]=='$') { 
-    string command=makeString(d_line, parts[0]);
@@ -331 +334 @@
-  }
-  if(!haveQTYPE) 
-'
+"+lexical_cast<string>(d_filestates.top().d_lineno)+" of '"+d_filestates.top().d_filename+"': 
-
-  rr.content=d_line.substr(range.first);
@@ -344 +347 @@
-    if(!findAndElide(rr.content, ')')) {
-      while(getLine()) {
-
+t\
-        chopComment(d_line);
-        trim(d_line);