forked from Lainports/opnsense-ports
8cb1a96ede
Taken from: https://github.com/freebsd/freebsd-ports.git Commit id: 5070672073b68be364139bc6b3a89100bd17d331
52 lines
1.4 KiB
C
52 lines
1.4 KiB
C
--- ./lapply.c.orig 2010-12-13 04:42:49.000000000 +0100
|
|
+++ ./lapply.c 2014-06-29 12:15:04.246544121 +0200
|
|
@@ -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 ) {
|