diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-11-25 10:55:32 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-11-26 17:38:09 +0100 |
| commit | 02e24f25939824e5292549c7d90e018e6efad01f (patch) | |
| tree | 27a452fa2b30d4deb0467f137a71bab2cfb92ae6 | |
| parent | 5891b7ce2143bb137922621d1d52bb1a89a021cb (diff) | |
| download | coreutils-02e24f25939824e5292549c7d90e018e6efad01f.tar.xz | |
* src/remove.c (rm_1): Remove decl of local, fd_cwd.
Replace each of two uses with literal AT_FDCWD.
Signed-off-by: Paul Eggert <eggert@cs.ucla.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/remove.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2006-11-25 Paul Eggert <eggert@cs.ucla.edu> + + * src/remove.c (rm_1): Remove decl of local, fd_cwd. + Replace each of two uses with literal AT_FDCWD. + 2006-11-25 Jim Meyering <jim@meyering.net> * Makefile.am (EXTRA_DIST): Remove announce-gen from here, too. diff --git a/src/remove.c b/src/remove.c index add85dd7b..1b4c4c4f8 100644 --- a/src/remove.c +++ b/src/remove.c @@ -1490,8 +1490,7 @@ rm_1 (Dirstack_state *ds, char const *filename, AD_push_initial (ds); AD_INIT_OTHER_MEMBERS (); - int fd_cwd = AT_FDCWD; - enum RM_status status = remove_entry (fd_cwd, ds, filename, &st, x, NULL); + enum RM_status status = remove_entry (AT_FDCWD, ds, filename, &st, x, NULL); if (status == RM_NONEMPTY_DIR) { /* In the event that remove_dir->remove_cwd_entries detects @@ -1500,7 +1499,7 @@ rm_1 (Dirstack_state *ds, char const *filename, if (setjmp (ds->current_arg_jumpbuf)) status = RM_ERROR; else - status = remove_dir (fd_cwd, ds, filename, &st, x, cwd_errno); + status = remove_dir (AT_FDCWD, ds, filename, &st, x, cwd_errno); AD_stack_clear (ds); } |