summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-09-11 13:56:15 +0000
committerJim Meyering <jim@meyering.net>2006-09-11 13:56:15 +0000
commitfb15bc880ae64ac6ca046021221f53a83f66727f (patch)
tree3da55da298d98c01c84429939fcd3eb6468e5e9f /src
parent75b99e8f20be498c1e87ea57a8db0a8afafb9eb6 (diff)
downloadcoreutils-fb15bc880ae64ac6ca046021221f53a83f66727f.tar.xz
* src/c99-to-c89.diff: Add another set of curly braces.
Diffstat (limited to 'src')
-rw-r--r--src/c99-to-c89.diff15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index fd433bbe0..696b6b262 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -75,7 +75,15 @@ 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. */
-@@ -1434,6 +1440,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1414,6 +1420,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+ return RM_ERROR;
+ }
+
++ {
+ struct stat st;
+ cache_stat_init (&st);
+ if (x->root_dev_ino)
+@@ -1435,6 +1442,7 @@ rm_1 (Dirstack_state *ds, char const *fi
AD_push_initial (ds);
AD_INIT_OTHER_MEMBERS ();
@@ -83,15 +91,16 @@ 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)
-@@ -1452,6 +1459,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1453,6 +1461,8 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);
return status;
+ }
++ }
}
/* Remove all files and/or directories specified by N_FILES and FILE.
-@@ -1474,9 +1482,11 @@ rm (size_t n_files, char const *const *f
+@@ -1475,9 +1485,11 @@ rm (size_t n_files, char const *const *f
}
cycle_check_init (&ds->cycle_check_state);