Changeset 953

Timestamp:

02/18/07 20:39:27 (6 years ago)

Author:

ahu

Message:

add stripDot() for use by bindbackend, spiff up zoneparser-tng.cc to know about the 'relative' directory

Location:

trunk/pdns/pdns

Files:

• misc.cc (modified) (2 diffs)
• misc.hh (modified) (1 diff)
• zoneparser-tng.cc (modified) (2 diffs)
• zoneparser-tng.hh (modified) (2 diffs)

trunk/pdns/pdns/misc.cc

@@ -198 +198 @@
   int ret=Utility::writev(outsock,iov,2);
 
-  if(ret<0)  // "EOF is error" - we can't deal with EAGAIN errors at this stage yet
+  if(ret <= 0)  // "EOF is error" - we can't deal with EAGAIN errors at this stage yet
     return -1;
 
@@ -588 +588 @@
   }
 }
+
+string stripDot(const string& dom)
+{
+  if(dom.empty())
+    return dom;
+
+  if(dom[dom.size()-1]!='.')
+    return dom;
+
+  return dom.substr(0,dom.size()-1);
+}

trunk/pdns/pdns/misc.hh

@@ -384 +384 @@
   return ret;
 }
+
+string stripDot(const string& dom);
+
 #endif

trunk/pdns/pdns/zoneparser-tng.cc

@@ -30 +30 @@
 #include <boost/lexical_cast.hpp>
 
-ZoneParserTNG::ZoneParserTNG(const string& fname, const string& zname) : d_zonename(zname), d_defaultttl(3600)
+ZoneParserTNG::ZoneParserTNG(const string& fname, const string& zname, const string& reldir) : d_reldir(reldir), d_zonename(zname), d_defaultttl(3600)
 {
   stackFile(fname);
@@ -181 +181 @@
       d_defaultttl=makeTTLFromZone(makeString(d_line,parts[1]));
     else if(command=="$INCLUDE" && parts.size() > 1) {
-      stackFile(unquotify(makeString(d_line, parts[1])));
+      string fname=unquotify(makeString(d_line, parts[1]));
+      if(!fname.empty() && fname[0]!='/' && !d_reldir.empty())
+        fname=d_reldir+"/"+fname;
+      stackFile(fname);
     }
     else if(command=="$ORIGIN" && parts.size() > 1) {

trunk/pdns/pdns/zoneparser-tng.hh

@@ -29 +29 @@
 {
 public:
-  ZoneParserTNG(const string& fname, const string& zname="");
+  ZoneParserTNG(const string& fname, const string& zname="", const string& reldir="");
 
   ~ZoneParserTNG();
@@ -41 +41 @@
   void stackFile(const std::string& fname);
   stack<FILE *> d_fps;
+  string d_reldir;
   string d_line;
   string d_prevqname;