about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/hist.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f6250b694..20b57a802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-10  Peter Stephenson  <pws@csr.com>
 
+	* 26708: Src/hist.c: print message if we give up trying to
+	create a lock file with hard links.
+
 	* 26705: Src/subst.c, Test/D07multibyte.ztst: still problems
 	with multibyte characters with Meta in prompt expansion within
 	parameter expansion.
@@ -11367,5 +11370,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4607 $                         
+* $Revision: 1.4608 $                         
 *****************************************************
diff --git a/Src/hist.c b/Src/hist.c
index dbe1d98a4..38ceac30a 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2433,13 +2433,16 @@ lockhistfile(char *fn, int keep_trying)
 	    } else
 		close(fd);
 	    while (link(tmpfile, lockfile) < 0) {
-		if (errno != EEXIST || !keep_trying)
+		if (errno != EEXIST)
+		    zerr("failed to create hard link as lock file %s: %e",
+			 lockfile, errno);
+		else if (!keep_trying)
 		    ;
 		else if (stat(lockfile, &sb) < 0) {
 		    if (errno == ENOENT)
 			continue;
-		}
-		else {
+		    zerr("failed to stat lock file %s: %e", lockfile, errno);
+		} else {
 		    if (time(NULL) - sb.st_mtime < 10)
 			sleep(1);
 		    else