--- fileutils-4.1/src/remove.c.rm 2001-02-18 16:17:32.000000000 +0000 +++ fileutils-4.1/src/remove.c 2003-01-17 15:12:07.000000000 +0000 @@ -433,10 +433,13 @@ /* Recursively remove all of the entries in the current directory. - Return an indication of the success of the operation. */ + Return an indication of the success of the operation. + CWD_DEV_INO must store the device and inode numbers of the + current working directory. */ static enum RM_status -remove_cwd_entries (const struct rm_options *x) +remove_cwd_entries (const struct rm_options *x, + struct dev_ino const *cwd_dev_ino) { /* NOTE: this is static. */ static DIR *dirp = NULL; @@ -549,7 +552,7 @@ /* CAUTION: after this call to rm, DP may not be valid -- it may have been freed due to a close in a recursive call (through rm and remove_dir) to this function. */ - tmp_status = rm (&fs, 0, x); + tmp_status = rm (&fs, 0, x, cwd_dev_ino); /* Update status. */ if (tmp_status > status) @@ -664,12 +667,14 @@ FIXME: describe need_save_cwd parameter. */ static enum RM_status -remove_dir (struct File_spec *fs, int need_save_cwd, const struct rm_options *x) +remove_dir (struct File_spec *fs, int need_save_cwd, + struct rm_options const *x, struct dev_ino const *cwd_dev_ino) { enum RM_status status; struct saved_cwd cwd; char *dir_name = fs->filename; const char *fmt = NULL; + struct dev_ino tmp_cwd_dev_ino; if (!x->recursive) { @@ -738,6 +743,9 @@ (unsigned long)(sb.st_dev), (unsigned long)(sb.st_ino)); } + + tmp_cwd_dev_ino.st_dev = sb.st_dev; + tmp_cwd_dev_ino.st_ino = sb.st_ino; } push_dir (dir_name); @@ -747,7 +755,7 @@ remove_cwd_entries may close the directory. */ ASSIGN_STRDUPA (dir_name, dir_name); - status = remove_cwd_entries (x); + status = remove_cwd_entries (x, &tmp_cwd_dev_ino); pop_dir (); @@ -761,11 +769,34 @@ } free_cwd (&cwd); } - else if (chdir ("..") < 0) + else { - error (0, errno, _("cannot change back to directory %s via `..'"), - quote (full_filename (dir_name))); - return RM_ERROR; + struct stat sb; + if (chdir ("..") < 0) + { + error (0, errno, _("cannot change back to directory %s via `..'"), + quote (full_filename (dir_name))); + return RM_ERROR; + } + + if (lstat (".", &sb)) + error (EXIT_FAILURE, errno, + _("cannot lstat `.' in %s"), quote (full_filename ("."))); + + if (!SAME_INODE (sb, *cwd_dev_ino)) + { + error (EXIT_FAILURE, 0, + _("ERROR: the directory %s initially had device/inode\n\ +numbers %lu/%lu, but now (after changing into at least one subdirectory\n\ +and changing back via `..'), the numbers for `.' are %lu/%lu.\n\ +That means that while rm was running, a partially-removed subdirectory\n\ +was moved to a different position in the file system hierarchy."), + quote (full_filename (".")), + (unsigned long)(cwd_dev_ino->st_dev), + (unsigned long)(cwd_dev_ino->st_ino), + (unsigned long)(sb.st_dev), + (unsigned long)(sb.st_ino)); + } } if (x->interactive) @@ -814,10 +845,13 @@ things. Return RM_OK if it is removed, and RM_ERROR or RM_USER_DECLINED if not. If USER_SPECIFIED_NAME is non-zero, then the name part of FS may be `.', `..', or may contain slashes. Otherwise, it must be a simple file - name (and hence must specify a file in the current directory). */ + name (and hence must specify a file in the current directory). + CWD_DEV_INO must store the device and inode numbers of the + current working directory. */ enum RM_status -rm (struct File_spec *fs, int user_specified_name, const struct rm_options *x) +rm (struct File_spec *fs, int user_specified_name, + struct rm_options const *x, struct dev_ino const *cwd_dev_ino) { mode_t filetype_mode; @@ -899,7 +933,7 @@ if (need_save_cwd) need_save_cwd = (strchr (fs->filename, '/') != NULL); - status = remove_dir (fs, need_save_cwd, x); + status = remove_dir (fs, need_save_cwd, x, cwd_dev_ino); #ifdef ENABLE_CYCLE_CHECK { --- fileutils-4.1/src/rm.c.rm 2001-04-29 07:56:24.000000000 +0100 +++ fileutils-4.1/src/rm.c 2003-01-17 15:22:28.000000000 +0000 @@ -1,5 +1,5 @@ /* `rm' file deletion utility for GNU. - Copyright (C) 88, 90, 91, 1994-2001 Free Software Foundation, Inc. + Copyright (C) 88, 90, 91, 1994-2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -184,20 +184,34 @@ remove_init (); - for (; optind < argc; optind++) - { - struct File_spec fs; - enum RM_status status; - - /* Stripping slashes is harmless for rmdir; - if the arg is not a directory, it will fail with ENOTDIR. */ - strip_trailing_slashes (argv[optind]); - fspec_init_file (&fs, argv[optind]); - status = rm (&fs, 1, &x); - assert (VALID_STATUS (status)); - if (status == RM_ERROR) - fail = 1; - } + { + struct stat cwd_sb; + struct dev_ino cwd_dev_ino; + + /* FIXME: this lstat is not always necessary -- e.g., if there are no + directories, or if all directories arguments are specified via + absolute names. */ + if (lstat (".", &cwd_sb)) + error (EXIT_FAILURE, errno, _("cannot lstat `.'")); + + cwd_dev_ino.st_dev = cwd_sb.st_dev; + cwd_dev_ino.st_ino = cwd_sb.st_ino; + + for (; optind < argc; optind++) + { + struct File_spec fs; + enum RM_status status; + + /* Stripping slashes is harmless for rmdir; + if the arg is not a directory, it will fail with ENOTDIR. */ + strip_trailing_slashes (argv[optind]); + fspec_init_file (&fs, argv[optind]); + status = rm (&fs, 1, &x, &cwd_dev_ino); + assert (VALID_STATUS (status)); + if (status == RM_ERROR) + fail = 1; + } + } remove_fini (); --- fileutils-4.1/src/mv.c.rm 2001-02-03 16:48:34.000000000 +0000 +++ fileutils-4.1/src/mv.c 2003-01-17 15:12:07.000000000 +0000 @@ -1,5 +1,5 @@ /* mv -- move or rename files - Copyright (C) 86, 89, 90, 91, 1995-2001 Free Software Foundation, Inc. + Copyright (C) 86, 89, 90, 91, 1995-2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -235,6 +235,19 @@ struct rm_options rm_options; struct File_spec fs; enum RM_status status; + static int first_rm = 1; + static struct dev_ino cwd_dev_ino; + + if (first_rm) + { + struct stat cwd_sb; + if (lstat (".", &cwd_sb)) + error (EXIT_FAILURE, errno, _("cannot lstat `.'")); + + first_rm = 0; + cwd_dev_ino.st_dev = cwd_sb.st_dev; + cwd_dev_ino.st_ino = cwd_sb.st_ino; + } rm_option_init (&rm_options); rm_options.verbose = x->verbose; @@ -247,7 +260,7 @@ took the else branch of movefile. */ strip_trailing_slashes_2 (fs.filename); - status = rm (&fs, 1, &rm_options); + status = rm (&fs, 1, &rm_options, &cwd_dev_ino); assert (VALID_STATUS (status)); if (status == RM_ERROR) fail = 1; --- fileutils-4.1/src/remove.h.rm 2000-10-16 15:32:03.000000000 +0100 +++ fileutils-4.1/src/remove.h 2003-01-17 15:12:07.000000000 +0000 @@ -44,8 +44,16 @@ dev_t st_dev; }; -enum RM_status rm PARAMS ((struct File_spec *fs, int user_specified_name, - const struct rm_options *x)); +struct dev_ino +{ + ino_t st_ino; + dev_t st_dev; +}; + +enum RM_status rm PARAMS ((struct File_spec *fs, + int user_specified_name, + struct rm_options const *x, + struct dev_ino const *cwd_dev_ino)); void fspec_init_file PARAMS ((struct File_spec *fs, const char *filename)); void remove_init PARAMS ((void)); void remove_fini PARAMS ((void));