* src/c99-to-c89.diff: Update to reflect new offsets.

diff --git a/ChangeLog b/ChangeLog
index 434c96c564c15b2ba1ee1d3bed288f28b7298d4d..3bb20d7bae9c000f46442a53939f50987aa10f92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-03  Jim Meyering  <jim@meyering.net>
 
+       * src/c99-to-c89.diff: Update to reflect new offsets.
+
        * src/remove.c (remove_entry): With -f, exit successfully in spite
        of a missing file under some very unusual conditions (with errno
        being any of ENOENT, ENOTDIR, ENAMETOOLONG).

diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index d05515b31a2041e585730de1ebfa2d81dcd1e554..556711c6e18225db1145f78c10d549d2039a5566 100644 (file)
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -47,7 +47,7 @@ diff -u -p -u -r1.158 remove.c
  }
 
  /* Mark FILENAME (in current directory) as unremovable.  */
-@@ -1097,6 +1100,7 @@ fd_to_subdirp (int fd_cwd, char const *f
+@@ -1126,6 +1129,7 @@ fd_to_subdirp (int fd_cwd, char const *f
        return NULL;
      }
 
@@ -55,7 +55,7 @@ diff -u -p -u -r1.158 remove.c
    DIR *subdir_dirp = fdopendir (fd_sub);
    if (subdir_dirp == NULL)
      {
-@@ -1105,6 +1109,7 @@ fd_to_subdirp (int fd_cwd, char const *f
+@@ -1134,6 +1138,7 @@ fd_to_subdirp (int fd_cwd, char const *f
      }
 
    return subdir_dirp;
@@ -63,7 +63,7 @@ diff -u -p -u -r1.158 remove.c
  }
 
  /* Remove entries in the directory open on DIRP
-@@ -1340,9 +1345,10 @@ remove_dir (int fd_cwd, Dirstack_state *
+@@ -1369,9 +1374,10 @@ remove_dir (int fd_cwd, Dirstack_state *
        /* The name of the directory that we have just processed,
           nominally removing all of its contents.  */
        char *empty_dir;
@@ -75,7 +75,7 @@ diff -u -p -u -r1.158 remove.c
        assert (dirp != NULL || AD_stack_height (ds) == 1);
 
        /* Try to remove EMPTY_DIR only if remove_cwd_entries succeeded.  */
-@@ -1420,6 +1426,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1449,6 +1455,7 @@ rm_1 (Dirstack_state *ds, char const *fi
        return RM_ERROR;
      }
 
@@ -83,7 +83,7 @@ diff -u -p -u -r1.158 remove.c
    struct stat st;
    cache_stat_init (&st);
    if (x->root_dev_ino)
-@@ -1441,6 +1448,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1470,6 +1477,7 @@ rm_1 (Dirstack_state *ds, char const *fi
    AD_push_initial (ds);
    AD_INIT_OTHER_MEMBERS ();
 
@@ -91,7 +91,7 @@ diff -u -p -u -r1.158 remove.c
    int fd_cwd = AT_FDCWD;
    enum RM_status status = remove_entry (fd_cwd, ds, filename, &st, x, NULL);
    if (status == RM_NONEMPTY_DIR)
-@@ -1459,6 +1467,8 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1488,6 +1496,8 @@ rm_1 (Dirstack_state *ds, char const *fi
    ds_clear (ds);
 
    return status;
@@ -100,7 +100,7 @@ diff -u -p -u -r1.158 remove.c
  }
 
  /* Remove all files and/or directories specified by N_FILES and FILE.
-@@ -1481,9 +1491,11 @@ rm (size_t n_files, char const *const *f
+@@ -1510,9 +1520,11 @@ rm (size_t n_files, char const *const *f
        }
 
        cycle_check_init (&ds->cycle_check_state);