#
#
# patch "hybrid_map.hh"
#  from [2f538b4bd091d63a8b83d92025d60cc5c293d630]
#    to [fe63fa2bb750db88df486a71e1eb492839e76118]
# 
# patch "roster.cc"
#  from [fd381ef1c78d29509d150aab9229c86609266abe]
#    to [48f5189daf2fed1db746b3bd3b0de2e56dd8097e]
# 
# patch "vocab_hash.hh"
#  from [19693ab649648e77ea6fa4fe241566c55d30960f]
#    to [1bf71979cd58adf60349d0fb28459176c92f287b]
#
============================================================
--- hybrid_map.hh	2f538b4bd091d63a8b83d92025d60cc5c293d630
+++ hybrid_map.hh	fe63fa2bb750db88df486a71e1eb492839e76118
@@ -1,6 +1,16 @@
 #ifndef __HYBRID_MAP_HH__
 #define __HYBRID_MAP_HH__
 
+// Copyright 2007 Timothy Brownawell <address@hidden>
+//
+// This program is made available under the GNU GPL version 2.0 or
+// greater. See the accompanying file COPYING for details.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the
+// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE.
+
+
 #include "hash_map.hh"
 #include <map>
 
============================================================
--- roster.cc	fd381ef1c78d29509d150aab9229c86609266abe
+++ roster.cc	48f5189daf2fed1db746b3bd3b0de2e56dd8097e
@@ -2824,6 +2824,18 @@ do_testing_on_one_roster(roster_t const 
     ++dfs_counted;
   I(n == dfs_counted);
 
+  // Test dfs_iter's path calculations.
+  for (dfs_iter i(downcast_to_dir_t(r.get_node(root_name)), true);
+       !i.finished(); ++i)
+    {
+      file_path from_iter = file_path_internal(i.path());
+      split_path sp;
+      node_t curr = *i;
+      r.get_name(curr->self, sp);
+      file_path from_getname(sp);
+      I(from_iter == from_getname);
+    }
+
   // do a read/write spin
   roster_data r_dat; MM(r_dat);
   marking_map fm;
============================================================
--- vocab_hash.hh	19693ab649648e77ea6fa4fe241566c55d30960f
+++ vocab_hash.hh	1bf71979cd58adf60349d0fb28459176c92f287b
@@ -1,6 +1,15 @@
 #ifndef __VOCAB_HASH_HH__
 #define __VOCAB_HASH_HH__
 
+// Copyright 2007 Timothy Brownawell <address@hidden>
+//
+// This program is made available under the GNU GPL version 2.0 or
+// greater. See the accompanying file COPYING for details.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the
+// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE.
+
 #include "vocab.hh"
 #include "hash_map.hh"