projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for tar -z option for uncompressing only
[oweals/busybox.git]
/
rm.c
diff --git
a/rm.c
b/rm.c
index 41afedaf9010be196c5f47b5bb7ce3238a2a3100..a9501ec7f004c23277b5c913c0657c5f1c8da1d2 100644
(file)
--- a/
rm.c
+++ b/
rm.c
@@
-3,7
+3,7
@@
* Mini rm implementation for busybox
*
*
* Mini rm implementation for busybox
*
*
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999
,2000
by Lineo, inc.
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
* Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
@@
-22,39
+22,36
@@
*
*/
*
*/
-#include "
internal
.h"
+#include "
busybox
.h"
#include <stdio.h>
#include <time.h>
#include <utime.h>
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
#include <time.h>
#include <utime.h>
#include <dirent.h>
#include <errno.h>
-static const char *rm_usage = "rm [OPTION]... FILE...\n\n"
- "Remove (unlink) the FILE(s).\n\n"
- "Options:\n"
-
- "\t-f\t\tremove existing destinations, never prompt\n"
- "\t-r or -R\tremove the contents of directories recursively\n";
-
-
static int recursiveFlag = FALSE;
static int forceFlag = FALSE;
static const char *srcName;
static int recursiveFlag = FALSE;
static int forceFlag = FALSE;
static const char *srcName;
-static int fileAction(const char *fileName, struct stat *statbuf)
+static int fileAction(const char *fileName, struct stat *statbuf
, void* junk
)
{
if (unlink(fileName) < 0) {
{
if (unlink(fileName) < 0) {
- perror
(
fileName);
+ perror
_msg("%s",
fileName);
return (FALSE);
}
return (TRUE);
}
return (FALSE);
}
return (TRUE);
}
-static int dirAction(const char *fileName, struct stat *statbuf)
+static int dirAction(const char *fileName, struct stat *statbuf
, void* junk
)
{
{
+ if (recursiveFlag == FALSE) {
+ errno = EISDIR;
+ perror_msg("%s", fileName);
+ return (FALSE);
+ }
if (rmdir(fileName) < 0) {
if (rmdir(fileName) < 0) {
- perror
(
fileName);
+ perror
_msg("%s",
fileName);
return (FALSE);
}
return (TRUE);
return (FALSE);
}
return (TRUE);
@@
-62,30
+59,40
@@
static int dirAction(const char *fileName, struct stat *statbuf)
extern int rm_main(int argc, char **argv)
{
extern int rm_main(int argc, char **argv)
{
+ int status = EXIT_SUCCESS;
+ int stopIt=FALSE;
struct stat statbuf;
struct stat statbuf;
- if (argc < 2) {
- usage(rm_usage);
- }
argc--;
argv++;
/* Parse any options */
argc--;
argv++;
/* Parse any options */
- while (**argv == '-') {
- while (*++(*argv))
- switch (**argv) {
- case 'R':
- case 'r':
- recursiveFlag = TRUE;
- break;
- case 'f':
- forceFlag = TRUE;
- break;
- default:
- usage(rm_usage);
- }
- argc--;
- argv++;
+ while (argc > 0 && stopIt == FALSE) {
+ if (**argv == '-') {
+ while (*++(*argv))
+ switch (**argv) {
+ case 'R':
+ case 'r':
+ recursiveFlag = TRUE;
+ break;
+ case 'f':
+ forceFlag = TRUE;
+ break;
+ case '-':
+ stopIt = TRUE;
+ break;
+ default:
+ usage(rm_usage);
+ }
+ argc--;
+ argv++;
+ }
+ else
+ break;
+ }
+
+ if (argc < 1 && forceFlag == FALSE) {
+ usage(rm_usage);
}
while (argc-- > 0) {
}
while (argc-- > 0) {
@@
-94,11
+101,11
@@
extern int rm_main(int argc, char **argv)
&& errno == ENOENT) {
/* do not reports errors for non-existent files if -f, just skip them */
} else {
&& errno == ENOENT) {
/* do not reports errors for non-existent files if -f, just skip them */
} else {
- if (recursive
A
ction(srcName, recursiveFlag, FALSE,
- TRUE, fileAction, dirAction) == FALSE) {
-
exit(FALSE)
;
+ if (recursive
_a
ction(srcName, recursiveFlag, FALSE,
+ TRUE, fileAction, dirAction
, NULL
) == FALSE) {
+
status = EXIT_FAILURE
;
}
}
}
}
}
}
-
exit(TRUE)
;
+
return status
;
}
}