emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -p support.

Browse Source
This commit is contained in:
Matt Kraai 2001-08-29 21:18:47 +00:00
parent 5171bf6d40
commit 1350666498
2 changed files with 122 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
coreutils/rmdir.c
View File

@ -22,24 +22,76 @@
* *
*/ */
#include <stdio.h> #include <getopt.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
extern int rmdir_main(int argc, char **argv)
/* Return true if a path is composed of multiple components. */
static int
multiple_components_p (const char *path)
{
const char *s = path;
while (s[0] != '\0' && s[0] != '/')
s++;
while (s[0] == '/')
s++;
return (s[0] != '\0');
}
/* Remove a directory. Returns 0 if successful, -1 on error. */
static int
remove_directory (char *path, int flags)
{
if (!(flags & FILEUTILS_RECUR)) {
if (rmdir (path) < 0) {
perror_msg ("unable to remove `%s'", path);
return -1;
}
} else {
if (remove_directory (path, 0) < 0)
return -1;
if (multiple_components_p (path))
if (remove_directory (dirname (path), flags) < 0)
return -1;
}
return 0;
}
extern int
rmdir_main (int argc, char **argv)
{ {
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
int flags = 0;
int i, opt;
if (argc == 1 || **(argv + 1) == '-') while ((opt = getopt (argc, argv, "p")) != -1)
switch (opt) {
case 'p':
flags |= FILEUTILS_RECUR;
break;
default:
show_usage ();
}
if (optind == argc)
show_usage(); show_usage();
while (--argc > 0) { for (i = optind; i < argc; i++)
if (rmdir(*(++argv)) == -1) { if (remove_directory (argv[i], flags) < 0)
perror_msg("%s", *argv);
status = EXIT_FAILURE; status = EXIT_FAILURE;
}
}
return status; return status;
} }

70
rmdir.c
View File

@ -22,24 +22,76 @@
* *
*/ */
#include <stdio.h> #include <getopt.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
extern int rmdir_main(int argc, char **argv)
/* Return true if a path is composed of multiple components. */
static int
multiple_components_p (const char *path)
{
const char *s = path;
while (s[0] != '\0' && s[0] != '/')
s++;
while (s[0] == '/')
s++;
return (s[0] != '\0');
}
/* Remove a directory. Returns 0 if successful, -1 on error. */
static int
remove_directory (char *path, int flags)
{
if (!(flags & FILEUTILS_RECUR)) {
if (rmdir (path) < 0) {
perror_msg ("unable to remove `%s'", path);
return -1;
}
} else {
if (remove_directory (path, 0) < 0)
return -1;
if (multiple_components_p (path))
if (remove_directory (dirname (path), flags) < 0)
return -1;
}
return 0;
}
extern int
rmdir_main (int argc, char **argv)
{ {
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
int flags = 0;
int i, opt;
if (argc == 1 || **(argv + 1) == '-') while ((opt = getopt (argc, argv, "p")) != -1)
switch (opt) {
case 'p':
flags |= FILEUTILS_RECUR;
break;
default:
show_usage ();
}
if (optind == argc)
show_usage(); show_usage();
while (--argc > 0) { for (i = optind; i < argc; i++)
if (rmdir(*(++argv)) == -1) { if (remove_directory (argv[i], flags) < 0)
perror_msg("%s", *argv);
status = EXIT_FAILURE; status = EXIT_FAILURE;
}
}
return status; return status;
} }