Adapt to new version of gnulib-tool.

* gl/modules/root-dev-ino: New file.
* lib/root-dev-ino.c, lib/root-dev-ino.h: Move these files ...
* gl/lib/root-dev-ino.c, gl/lib/root-dev-ino.h: ... to here.
* m4/root-dev-ino.m4: Move this file ...
* gl/m4/root-dev-ino.m4: ... to here.
* bootstrap.conf (gnulib_modules): Add root-dev-ino.

2 files changed, 86 insertions, 0 deletions

diff --git a/gl/lib/root-dev-ino.c b/gl/lib/root-dev-ino.c
new file mode 100644
index 000000000..a78541212
--- /dev/null
+++ b/gl/lib/root-dev-ino.c
@@ -0,0 +1,38 @@
+/* root-dev-ino.c -- get the device and inode numbers for `/'.
+   Copyright (C) 2003, 2005, 2006 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Jim Meyering. */
+
+#include <config.h>
+
+#include "root-dev-ino.h"
+
+#include <stdlib.h>
+
+/* Call lstat to get the device and inode numbers for `/'.
+   Upon failure, return NULL.  Otherwise, set the members of
+   *ROOT_D_I accordingly and return ROOT_D_I.  */
+struct dev_ino *
+get_root_dev_ino (struct dev_ino *root_d_i)
+{
+  struct stat statbuf;
+  if (lstat ("/", &statbuf))
+    return NULL;
+  root_d_i->st_ino = statbuf.st_ino;
+  root_d_i->st_dev = statbuf.st_dev;
+  return root_d_i;
+}
diff --git a/gl/lib/root-dev-ino.h b/gl/lib/root-dev-ino.h
new file mode 100644
index 000000000..ad38f7635
--- /dev/null
+++ b/gl/lib/root-dev-ino.h
@@ -0,0 +1,48 @@
+/* Root device and inode number checking.
+
+   Copyright (C) 2003, 2006 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef ROOT_DEV_INO_H
+# define ROOT_DEV_INO_H 1
+
+# include "dev-ino.h"
+# include "same-inode.h"
+
+struct dev_ino *
+get_root_dev_ino (struct dev_ino *root_d_i);
+
+/* These macros are common to the programs that support the
+   --preserve-root and --no-preserve-root options.  */
+
+# define ROOT_DEV_INO_CHECK(Root_dev_ino, Dir_statbuf) \
+    (Root_dev_ino && SAME_INODE (*Dir_statbuf, *Root_dev_ino))
+
+# define ROOT_DEV_INO_WARN(Dirname)					\
+  do									\
+    {									\
+      if (STREQ (Dirname, "/"))						\
+	error (0, 0, _("it is dangerous to operate recursively on %s"),	\
+	       quote (Dirname));					\
+      else								\
+	error (0, 0,							\
+	       _("it is dangerous to operate recursively on %s (same as %s)"), \
+	       quote_n (0, Dirname), quote_n (1, "/"));			\
+      error (0, 0, _("use --no-preserve-root to override this failsafe")); \
+    }									\
+  while (0)
+
+#endif