CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 10:51:48 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Meyering
2008-01-30 19:37:07 +01:00
parent 839f321fde
commit 62b7b422a2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2008-01-30 Jim Meyering <meyering@redhat.com>
* src/c99-to-c89.diff: Adjust remove.c offsets, again.
Now that system.h defines is_empty_dir, include "openat.h".
* src/system.h: Include "openat.h" here, ...
* src/chcon.c: ... not here.

14
src/c99-to-c89.diff
View File

@@ -1,7 +1,7 @@
diff -upr src/remove.c src/remove.c
--- src/remove.c 2007-07-23 12:56:20.000000000 +0200
+++ src/remove.c 2007-07-23 13:03:12.000000000 +0200
@@ -262,9 +262,10 @@ pop_dir (Dirstack_state *ds)
@@ -261,9 +261,10 @@ pop_dir (Dirstack_state *ds)
{
size_t n_lengths = obstack_object_size (&ds->len_stack) / sizeof (size_t);
size_t *length = obstack_base (&ds->len_stack);
@@ -13,7 +13,7 @@ diff -upr src/remove.c src/remove.c
assert (top_len >= 2);
/* Pop the specified length of file name. */
@@ -422,10 +423,11 @@ AD_stack_top (Dirstack_state const *ds)
@@ -421,10 +422,11 @@ AD_stack_top (Dirstack_state const *ds)
static void
AD_stack_pop (Dirstack_state *ds)
{
@@ -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));
@@ -877,6 +879,7 @@ prompt (int fd_cwd, Dirstack_state const
@@ -876,6 +878,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)
@@ -916,6 +919,7 @@ prompt (int fd_cwd, Dirstack_state const
@@ -915,6 +918,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;
@@ -1535,6 +1539,7 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1534,6 +1538,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);
@@ -1557,6 +1562,7 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1556,6 +1561,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)
@@ -1575,6 +1581,8 @@ rm_1 (Dirstack_state *ds, char const *fi
@@ -1574,6 +1580,8 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);
return status;
}