Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

rmdir: optional long options support for Debian users. +68 bytes.

Browse Source 
By Roberto Gordo Saez <roberto.gordo AT gmail.com>
This commit is contained in:
Denis Vlasenko 2008-02-24 14:56:10 +00:00
parent 28b29916cb
commit 52feee9b1f
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
coreutils/rmdir.c
View File

@ -10,20 +10,30 @@
/* BB_AUDIT SUSv3 compliant */ /* BB_AUDIT SUSv3 compliant */
/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
#include <libgen.h>
#include "libbb.h" #include "libbb.h"
/* This is a NOFORK applet. Be very careful! */ /* This is a NOFORK applet. Be very careful! */
#define PARENTS 0x01
#define IGNORE_NON_EMPTY 0x02
int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rmdir_main(int argc, char **argv) int rmdir_main(int argc, char **argv)
{ {
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
int flags; int flags;
int do_dot;
char *path; char *path;
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
static const char rmdir_longopts[] ALIGN1 =
"parents\0" No_argument "p"
/* Debian etch: many packages fail to be purged or installed
* because they desperately want this option: */
"ignore-fail-on-non-empty\0" No_argument "\xff"
;
applet_long_options = rmdir_longopts;
#endif
flags = getopt32(argv, "p"); flags = getopt32(argv, "p");
argv += optind; argv += optind;
@ -34,27 +44,26 @@ int rmdir_main(int argc, char **argv)
do { do {
path = *argv; path = *argv;
/* Record if the first char was a '.' so we can use dirname later. */
do_dot = (*path == '.');
while (1) { while (1) {
if (rmdir(path) < 0) { if (rmdir(path) < 0) {
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
break;
#endif
bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */
status = EXIT_FAILURE; status = EXIT_FAILURE;
} else if (flags) { } else if (flags & PARENTS) {
/* Note: path was not empty or null since rmdir succeeded. */ /* Note: path was not "" since rmdir succeeded. */
path = dirname(path); path = dirname(path);
/* Path is now just the parent component. Note that dirname /* Path is now just the parent component. Dirname
* returns "." if there are no parents. We must distinguish * returns "." if there are no parents.
* this from the case of the original path starting with '.'.
*/ */
if (do_dot || (*path != '.') || path[1]) { if (NOT_LONE_CHAR(path, '.')) {
continue; continue;
} }
} }
break; break;
} }
} while (*++argv); } while (*++argv);
return status; return status;