mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-08-05 08:10:15 +02:00
* 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>
This commit is contained in:
committed by
Jim Meyering
parent
5891b7ce21
commit
02e24f2593
@@ -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.
|
||||
|
||||
+2
-3
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user