From: Jim Meyering <jim@meyering.net>
Date: Fri, 8 Mar 2002 16:46:11 +0000 (+0000)
Subject: (main): Call lstat `.' to get the device/inode numbers
X-Git-Tag: FILEUTILS-4_1_7~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c38cd6901d2a041251914f8c43c807769058d6d;p=thirdparty%2Fcoreutils.git

(main): Call lstat `.' to get the device/inode numbers
now required for rm.
---

diff --git a/src/rm.c b/src/rm.c
index 9c105efe2a..73370963a3 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -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
@@ -187,17 +187,31 @@ main (int argc, char **argv)
 
   remove_init ();
 
-  for (; optind < argc; optind++)
-    {
-      struct File_spec fs;
-      enum RM_status status;
-
-      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;
+
+	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 ();