summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-10-03 13:40:36 +0000
committerJim Meyering <jim@meyering.net>2006-10-03 13:40:36 +0000
commit2f7025ad2aef419d266ee1d5e084577a4546e6d7 (patch)
treec1fd7eeb074f78ecd9d47c236f6dcef4f77a49e9 /src
parent9ac369c2bdea688a5147215440587b03da992535 (diff)
downloadcoreutils-2f7025ad2aef419d266ee1d5e084577a4546e6d7.tar.xz
* src/c99-to-c89.diff: Update to reflect new offsets.
Diffstat (limited to 'src')
-rw-r--r--src/c99-to-c89.diff14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index d05515b31..556711c6e 100644
--- 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);