* 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.
+2006-11-14 Jim Meyering <jim@meyering.net>
+
+ 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.
+
2006-11-13 Jim Meyering <jim@meyering.net>
* src/sort.c (insertkey): Use xmemdup, rather than xmalloc+assignment.
memrchr mkancesdirs mkdir mkdir-p mkstemp mktime modechange
mountlist obstack pathmax perl physmem posixtm posixver putenv
quote quotearg raise readlink readtokens readtokens0 readutmp
- realloc regex rename-dest-slash rmdir rmdir-errno rpmatch
+ realloc regex rename-dest-slash rmdir rmdir-errno
+ root-dev-ino
+ rpmatch
safe-read same
save-cwd savedir savewd settime sha1 sig2str ssize_t stat-macros
stat-time stdbool stdlib-safer stpcpy strcase strftime
--- /dev/null
+/* 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;
+}
--- /dev/null
+/* 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
--- /dev/null
+#serial 2
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ROOT_DEV_INO],
+[
+ AC_LIBSOURCES([root-dev-ino.c, root-dev-ino.h, dev-ino.h, same-inode.h])
+ AC_LIBOBJ([root-dev-ino])
+
+ dnl Prerequisites
+ AC_REQUIRE([AC_FUNC_LSTAT])
+ :
+])
--- /dev/null
+Description:
+Root device and inode number checking.
+
+Files:
+lib/root-dev-ino.h
+lib/root-dev-ino.c
+m4/root-dev-ino.m4
+
+Depends-on:
+dev-ino
+same-inode
+
+configure.ac:
+gl_ROOT_DEV_INO
+
+Makefile.am:
+
+Include:
+"root-dev-ino.h"
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
+++ /dev/null
-/* 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;
-}
+++ /dev/null
-/* 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
+++ /dev/null
-#serial 2
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_ROOT_DEV_INO],
-[
- AC_LIBSOURCES([root-dev-ino.c, root-dev-ino.h, dev-ino.h, same-inode.h])
- AC_LIBOBJ([root-dev-ino])
-
- dnl Prerequisites
- AC_REQUIRE([AC_FUNC_LSTAT])
- :
-])