From: Jim Meyering <jim@meyering.net>
Date: Thu, 18 Jan 2007 09:18:02 +0000 (+0100)
Subject: * src/c99-to-c89.diff: Adjust remove.c offsets.
X-Git-Tag: COREUTILS-6_8~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03b1e07ae02d06d27a18836fa29ac2149bf08601;p=thirdparty%2Fcoreutils.git

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

diff --git a/ChangeLog b/ChangeLog
index 7a80dbf91b..629ad5be8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-18  Jim Meyering  <jim@meyering.net>
+
+	* src/c99-to-c89.diff: Adjust remove.c offsets.
+
 2007-01-17  Jim Meyering  <jim@meyering.net>
 
 	Make "rm --interactive=never ..." never prompt.
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index 68513f50ba..04db772c46 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -31,7 +31,7 @@ index 4728bdd..7477da5 100644
    if (top->unremovable)
      hash_free (top->unremovable);
    obstack_blank (&ds->Active_dir, -(int) sizeof (struct AD_ent));
-@@ -1477,6 +1479,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1481,6 +1483,7 @@ rm_1 (Dirstack_state *ds, char const *fi
        return RM_ERROR;
      }
 
@@ -39,7 +39,7 @@ index 4728bdd..7477da5 100644
    struct stat st;
    cache_stat_init (&st);
    cycle_check_init (&ds->cycle_check_state);
-@@ -1499,6 +1502,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1503,6 +1506,7 @@ rm_1 (Dirstack_state *ds, char const *fi
    AD_push_initial (ds);
    AD_INIT_OTHER_MEMBERS ();
 
@@ -47,7 +47,7 @@ index 4728bdd..7477da5 100644
    enum RM_status status = remove_entry (AT_FDCWD, ds, filename, &st, x, NULL);
    if (status == RM_NONEMPTY_DIR)
      {
-@@ -1515,6 +1519,8 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1519,6 +1523,8 @@ rm_1 (Dirstack_state *ds, char const *fi
 
    ds_clear (ds);
    return status;