From: Jim Meyering <jim@meyering.net>
Date: Wed, 10 Jan 2001 11:54:53 +0000 (+0000)
Subject: [struct entry] (node): Describe how it's used,
X-Git-Tag: FILEUTILS-4_0_36~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6e29912beb5343916d20e21fa1bb45628a0dfbf;p=platform%2Fupstream%2Fcoreutils.git

[struct entry] (node): Describe how it's used,
now that we've overloaded it a little, in order to detect and diagnose
the copying-directory-into-self problem.
(new_file): Remove global.
(htab): Declare global to be static.
(remember_created): Insert file name instead of dummy pointer, so
that copy.c can use the just-created directory name to detect
the copying-directory-into-self problem.
---

diff --git a/src/cp-hash.c b/src/cp-hash.c
index 6658ca169..a064efcae 100644
--- a/src/cp-hash.c
+++ b/src/cp-hash.c
@@ -1,5 +1,5 @@
 /* cp-hash.c  -- file copying (hash search routines)
-   Copyright (C) 89, 90, 91, 1995-2000 Free Software Foundation.
+   Copyright (C) 89, 90, 91, 1995-2001 Free Software Foundation.
 
    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
@@ -33,7 +33,11 @@ struct entry
 {
   ino_t ino;
   dev_t dev;
-  char *node;			/* Path name, or &new_file for new inodes.  */
+  /* Destination path name (of non-directory or pre-existing directory)
+     corresponding to the dev/ino of a copied file, or the destination path
+     name corresponding to a dev/ino pair for a newly-created directory. */
+  char *node;
+
   struct entry *coll_link;	/* 0 = entry not occupied.  */
 };
 
@@ -46,8 +50,7 @@ struct htab
   struct entry *hash[1];	/* Vector of pointers in `entry_tab'.  */
 };
 
-struct htab *htab;
-char new_file;
+static struct htab *htab;
 
 static char *cph_hash_insert PARAMS ((ino_t ino, dev_t dev, const char *node));
 
@@ -65,7 +68,7 @@ remember_created (const char *path)
       return 1;
     }
 
-  cph_hash_insert (sb.st_ino, sb.st_dev, &new_file);
+  cph_hash_insert (sb.st_ino, sb.st_dev, path);
   return 0;
 }