diff options
| author | Matt Kraai <kraai@debian.org> | 2001-04-25 00:04:18 +0400 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-04-25 00:04:18 +0400 |
| commit | 8810bdbba359eb2348cc371f12347dd7f41dda18 (patch) | |
| tree | d1403572448114ecd20030316914f473816f882d /coreutils/mv.c | |
| parent | 9f0fedb8f693829e7869439a2ad43cc1c21a3786 (diff) | |
Rewrote rm.
Diffstat (limited to 'coreutils/mv.c')
| -rw-r--r-- | coreutils/mv.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/coreutils/mv.c b/coreutils/mv.c index efc4ae6d8..b890abf6e 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -32,20 +32,6 @@ static int flags; -static int remove_file(const char *path, struct stat *statbuf, void *junk) -{ - if (unlink(path) < 0) - return FALSE; - return TRUE; -} - -static int remove_directory(const char *path, struct stat *statbuf, void *junk) -{ - if (rmdir(path) < 0) - return FALSE; - return TRUE; -} - static int manual_rename(const char *source, const char *dest) { struct stat source_stat; @@ -92,8 +78,7 @@ static int manual_rename(const char *source, const char *dest) FILEUTILS_PRESERVE_SYMLINKS) < 0) return -1; - if (!recursive_action(source, TRUE, FALSE, TRUE, remove_file, - remove_directory, NULL)) + if (remove_file(source, FILEUTILS_RECUR | FILEUTILS_FORCE) < 0) return -1; return 0; |