summaryrefslogtreecommitdiff
path: root/src/remove.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/remove.h')
-rw-r--r--src/remove.h27
1 files changed, 14 insertions, 13 deletions
diff --git a/src/remove.h b/src/remove.h
index ae01e3c..ae2331f 100644
--- a/src/remove.h
+++ b/src/remove.h
@@ -1,12 +1,11 @@
/* Remove directory entries.
- Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free
- Software Foundation, Inc.
+ Copyright (C) 1998-2016 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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.
+ the Free Software Foundation, either version 3 of the License, 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
@@ -14,8 +13,7 @@
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. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef REMOVE_H
# define REMOVE_H
@@ -39,6 +37,7 @@ struct rm_options
/* If true, query the user about whether to remove each file. */
enum rm_interactive interactive;
+ // FIXME: remove
/* If true, do not traverse into (or remove) any directory that is
on a file system (i.e., that has a different device number) other
than that of the corresponding command line argument. Note that
@@ -50,8 +49,11 @@ struct rm_options
/* If true, recursively remove directories. */
bool recursive;
- /* Pointer to the device and inode numbers of `/', when --recursive
- and preserving `/'. Otherwise NULL. */
+ /* If true, remove empty directories. */
+ bool remove_empty_directories;
+
+ /* Pointer to the device and inode numbers of '/', when --recursive
+ and preserving '/'. Otherwise NULL. */
struct dev_ino *root_dev_ino;
/* If nonzero, stdin is a tty. */
@@ -85,12 +87,11 @@ enum RM_status
do \
{ \
if ((New_value) == RM_ERROR \
- || ((New_value) == RM_USER_DECLINED && (S) == RM_OK)) \
- (S) = (New_value); \
+ || ((New_value) == RM_USER_DECLINED && (S) == RM_OK)) \
+ (S) = (New_value); \
} \
while (0)
-enum RM_status rm (size_t n_files, char const *const *file,
- struct rm_options const *x);
+extern enum RM_status rm (char *const *file, struct rm_options const *x);
#endif