PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-05-19 05:01:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

* src/c99-to-c89.diff: Adjust remove.c offsets.

Browse Source
This commit is contained in:
Jim Meyering
2008-01-30 16:15:18 +01:00
parent ed5c4e770a
commit afeeea66f3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -1,5 +1,7 @@
2008-01-30 Jim Meyering <meyering@redhat.com>
* src/c99-to-c89.diff: Adjust remove.c offsets.
Improve "rmdir --ignore-fail-on-non-empty"
* src/rmdir.c (remove_parents, main): With --ignore-fail-on-non-empty,
suppress a diagnostic also for other errno values, which can arise
src/c99-to-c89.diff
+5 -5
View File
@@ -26,7 +26,7 @@ diff -upr src/remove.c src/remove.c
if (top->unremovable)
hash_free (top->unremovable);
obstack_blank (&ds->Active_dir, -(int) sizeof (struct AD_ent));
@@ -907,6 +909,7 @@ prompt (int fd_cwd, Dirstack_state const
@@ -877,6 +879,7 @@ prompt (int fd_cwd, Dirstack_state const
break;
}
@@ -34,7 +34,7 @@ diff -upr src/remove.c src/remove.c
char const *quoted_name = quote (full_filename (filename));
if (0 < write_protected)
@@ -946,6 +949,7 @@ prompt (int fd_cwd, Dirstack_state const
@@ -916,6 +919,7 @@ prompt (int fd_cwd, Dirstack_state const
: _("%s: remove %s %s? ")),
program_name, file_type (sbuf), quoted_name);
}
@@ -42,7 +42,7 @@ diff -upr src/remove.c src/remove.c
if (!yesno ())
return RM_USER_DECLINED;
@@ -1565,6 +1569,7 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1535,6 +1539,7 @@ rm_1 (Dirstack_state *ds, char const *fi
return RM_ERROR;
}
@@ -50,7 +50,7 @@ diff -upr src/remove.c src/remove.c
struct stat st;
cache_stat_init (&st);
cycle_check_init (&ds->cycle_check_state);
@@ -1587,6 +1592,7 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1557,6 +1562,7 @@ rm_1 (Dirstack_state *ds, char const *fi
AD_push_initial (ds);
AD_INIT_OTHER_MEMBERS ();
@@ -58,7 +58,7 @@ diff -upr src/remove.c src/remove.c
enum RM_status status = remove_entry (AT_FDCWD, ds, filename,
DT_UNKNOWN, &st, x);
if (status == RM_NONEMPTY_DIR)
@@ -1605,6 +1611,8 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1575,6 +1581,8 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);
return status;
}