X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fincremen.c;h=facc751c4bc20dbc9fb7a05d2055f9d62087d31c;hb=7add6e4274e340257433bfba38018b97c32c5321;hp=31672a34a6f63fabf7cb3f23d9c7640d5ffeaaf1;hpb=df7792b5d8f07d3fbebaee4ea4a6fb86cc117b78;p=chaz%2Ftar

diff --git a/src/incremen.c b/src/incremen.c
index 31672a3..facc751 100644
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -1,7 +1,7 @@
 /* GNU dump extensions to tar.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
-   2003 Free Software Foundation, Inc.
+   2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -127,7 +127,7 @@ scan_path (struct obstack *stk, char *path, dev_t device)
   char *name_buffer;		/* directory, `/', and directory member */
   size_t name_buffer_size;	/* allocated size of name_buffer, minus 2 */
   size_t name_length;		/* used length in name_buffer */
-  struct directory *directory; /* for checking if already already seen */
+  struct directory *directory;  /* for checking if already seen */
   enum children children;
 
   if (! dirp)
@@ -176,7 +176,7 @@ scan_path (struct obstack *stk, char *path, dev_t device)
 	      {
 		bool nfs = NFS_FILE_STAT (stat_data);
 		
-		if (directory = find_directory (name_buffer), directory)
+		if ((directory = find_directory (name_buffer)) != NULL)
 		  {
 		    /* With NFS, the same file can have two different devices
 		       if an NFS directory is mounted in multiple locations,
@@ -257,7 +257,7 @@ scan_path (struct obstack *stk, char *path, dev_t device)
     free (dirp);
 }
 
-/* Sort the contents of the obstack, anr convert it to the char * */
+/* Sort the contents of the obstack, and convert it to the char * */
 static char *
 sort_obstack (struct obstack *stk)
 {
@@ -308,7 +308,7 @@ get_directory_contents (char *path, dev_t device)
   scan_path (&stk, path, device);
   buffer = sort_obstack (&stk);
   obstack_free (&stk, NULL);
-  return buffer;;
+  return buffer;
 }
 
 
@@ -453,9 +453,13 @@ write_directory_file (void)
   if (fclose (fp) != 0)
     close_error (listed_incremental_option);
 }
+
 
 /* Restoration of incremental dumps.  */
 
+/* Examine the directories under directory_name and delete any
+   files that were not there at the time of the back-up.
+   FIXME: The function name is obviously a misnomer */
 void
 gnu_restore (char const *directory_name)
 {