summaryrefslogtreecommitdiff
path: root/sysutils/radmind/files/patch-lapply.c
diff options
context:
space:
mode:
authorSofian Brabez <sbz@FreeBSD.org>2012-04-20 22:14:34 +0000
committerSofian Brabez <sbz@FreeBSD.org>2012-04-20 22:14:34 +0000
commit8f100ec53fde110ede80b7b58cfe1aecb01d7e06 (patch)
tree4795367d2998306042be26abb7084c37553bf23a /sysutils/radmind/files/patch-lapply.c
parent- Unbreak SNORTSAM support (diff)
- Update PORTREVISION to 2012032001
- Add IGNORE_TIMESTAMPS OPTIONS - Install sample configuration file PR: ports/166587 Submitted by: Michael Graziano <mikeg at bsd-box.net>
Diffstat (limited to '')
-rw-r--r--sysutils/radmind/files/patch-lapply.c52
1 files changed, 52 insertions, 0 deletions
diff --git a/sysutils/radmind/files/patch-lapply.c b/sysutils/radmind/files/patch-lapply.c
new file mode 100644
index 000000000000..63113803d7d9
--- /dev/null
+++ b/sysutils/radmind/files/patch-lapply.c
@@ -0,0 +1,52 @@
+--- ./lapply.c.orig 2010-12-12 22:42:49.000000000 -0500
++++ ./lapply.c 2012-03-20 14:37:54.000000000 -0400
+@@ -651,27 +651,37 @@
+ filechecklist:
+ if ( head == NULL ) {
+ if ( unlink( path ) != 0 ) {
+- perror( path );
+- goto error2;
+- }
+- if ( !quiet && !showprogress ) {
+- printf( "%s: deleted\n", path );
+- }
+- if ( showprogress ) {
+- progressupdate( PROGRESSUNIT, path );
+- }
+- } else {
+- if ( ischildcase( path, head->path, case_sensitive )) {
+- if ( unlink( path ) != 0 ) {
++ if ( !force || errno != ENOENT ) {
+ perror( path );
+ goto error2;
+ }
++ fprintf( stderr, "Warning: failed to remove %s: %s\n",
++ path, strerror( errno ));
++ } else {
+ if ( !quiet && !showprogress ) {
+ printf( "%s: deleted\n", path );
+ }
+ if ( showprogress ) {
+ progressupdate( PROGRESSUNIT, path );
+ }
++ }
++ } else {
++ if ( ischildcase( path, head->path, case_sensitive )) {
++ if ( unlink( path ) != 0 ) {
++ if ( !force || errno != ENOENT ) {
++ perror( path );
++ goto error2;
++ }
++ fprintf( stderr, "Warning: failed to remove %s: "
++ "%s\n", path, strerror( errno ));
++ } else {
++ if ( !quiet && !showprogress ) {
++ printf( "%s: deleted\n", path );
++ }
++ if ( showprogress ) {
++ progressupdate( PROGRESSUNIT, path );
++ }
++ }
+ } else {
+ /* remove head */
+ if ( rmdir( head->path ) != 0 ) {