summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant>2004-06-26 13:30:59 +0000
committergrant <grant>2004-06-26 13:30:59 +0000
commit754f35ccbc7ce6fff8959dc9b2191b8b0920fccb (patch)
treeea24723feb1b41a8b905dda58e6b10d7e63c72d1
parent126e807e56a5650bb446e5d61da589a511ed8344 (diff)
downloadpkgsrc-754f35ccbc7ce6fff8959dc9b2191b8b0920fccb.tar.gz
sync with src:
break out of the loop and avoid the infinite loop if attempts to create, unlink and create all fail.
-rw-r--r--archivers/pax/files/file_subs.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/archivers/pax/files/file_subs.c b/archivers/pax/files/file_subs.c
index 5fc12c81346..32869e90d5a 100644
--- a/archivers/pax/files/file_subs.c
+++ b/archivers/pax/files/file_subs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: file_subs.c,v 1.6 2004/06/26 12:42:02 grant Exp $ */
+/* $NetBSD: file_subs.c,v 1.7 2004/06/26 13:30:59 grant Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: file_subs.c,v 1.6 2004/06/26 12:42:02 grant Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.7 2004/06/26 13:30:59 grant Exp $");
#endif
#endif /* not lint */
@@ -519,6 +519,12 @@ badlink:
syswarn(1, oerrno, "Cannot create %s", nm);
return(-1);
}
+
+ /*
+ * it must be a file that exists but we can't create or
+ * remove, but we must avoid the infinite loop.
+ */
+ break;
}
/*