Merge branch 'branch_2.7.x'

doc/Tutorial.html

@@ -95,7 +95,7 @@ <h2>The FULL backup</h2>
 	  you need an Internet access to read it.
 	</p>
 	<p>
-	  This make the free space on the first usb key floppy a bit smaller, I let
+	  This make the free space on the first usb key a bit smaller, I let
 	  you make the substraction because this is subject to change from system
 	  to system, but let's assume dar_static is less than 5 MiB, thus the
 	  initial slice should not exceed 95 MB:
@@ -315,7 +315,7 @@ <h3>Check the backup content</h3>
       verify that all expected files are present in the output:
     </p>
     <code class=block>
-      dar -l /mnt/usb key/linux_full
+      dar -l /mnt/usb/linux_full
     </code>
     <h3>Testing the backup</h3>
     <p>
@@ -326,7 +326,7 @@ <h3>Testing the backup</h3>
       backup process):
     </p>
     <code class=block>
-      dar -t /mnt/usb key/linux_full
+      dar -t /mnt/usb/linux_full
     </code>
     <p>
       If using removable media of poor quality, it is
@@ -552,7 +552,7 @@ <h2>Recovering after a disk crash</h2>
 	<p>
 	  If you have a lot of file to restore, you can activate the swap
 	  on the partition of your new hard drive:
-	  <code>swapon /dev/hda2</code>
+	  <code>swapon /dev/sda2</code>
 	</p>
       </li>
       <li>

src/build/ChangeLog

@@ -48,7 +48,9 @@ from 2.7.15 to 2.7.16
   more than the half of kept entries...
 - adding kdf support for repairing operation instead of using the values of the
   archive/backup under reparation.
-
+- fixing bug in thread_cancellation class that led a cancelled thread kept
+  being recorded as cancelled forever, leading libdar to abort immediately when
+  run in a new thread having the the same tid.
 
 from 2.7.14 to 2.7.15
 - updating libdar about CURLINFO_CONTENT_LENGTH_DOWNLOAD symbol which is

src/libdar/thread_cancellation.cpp

@@ -81,7 +81,7 @@ namespace libdar
 		status.cancellation = false;
 		status.flag = 0;
 	    }
-	    else // pending cancellation for that thread
+	    else // pending cancellation information for that thread
 	    {
 		status = *it;
 		preborn.erase(it);
@@ -118,11 +118,7 @@ namespace libdar
 	    if(*ptr == nullptr)
 		bug = true;
 	    else
-	    {
-		if((*ptr)->status.cancellation) // cancellation for that thread
-		    preborn.push_back((*ptr)->status);
 		info.erase(ptr);
-	    }
 	CRITICAL_END;
 
 	if(bug)