With FEATURE_VERBOSE off, practically no size change. With it on: function old new delta remove_file 493 556 +63 install_main 719 765 +46 bb_make_directory 383 419 +36 rmdir_main 162 191 +29 copy_file 1516 1544 +28 mv_main 502 525 +23 cmp_main 677 693 +16 bbconfig_config_bz2 5264 5279 +15 mkdir_main 158 168 +10 install_longopts 66 76 +10 rm_main 167 175 +8 nexpr 840 846 +6 scan_tree 275 280 +5 fsck_main 1807 1811 +4 ed_main 2541 2545 +4 expand_one_var 1574 1575 +1 swap_on_off_main 420 418 -2 parse_command 1443 1440 -3 redirect 1279 1274 -5 do_load 946 918 -28 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 16/4 up/down: 304/-38) Total: 266 bytes Based on the patch by Igor Živković. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
		
			
				
	
	
		
			94 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* vi: set sw=4 ts=4: */
 | 
						|
/*
 | 
						|
 * rmdir implementation for busybox
 | 
						|
 *
 | 
						|
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 | 
						|
 *
 | 
						|
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 | 
						|
 */
 | 
						|
 | 
						|
/* BB_AUDIT SUSv3 compliant */
 | 
						|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 | 
						|
 | 
						|
//usage:#define rmdir_trivial_usage
 | 
						|
//usage:       "[OPTIONS] DIRECTORY..."
 | 
						|
//usage:#define rmdir_full_usage "\n\n"
 | 
						|
//usage:       "Remove DIRECTORY if it is empty\n"
 | 
						|
//usage:	IF_FEATURE_RMDIR_LONG_OPTIONS(
 | 
						|
//usage:     "\n	-p|--parents	Include parents"
 | 
						|
//usage:     "\n	--ignore-fail-on-non-empty"
 | 
						|
//usage:	)
 | 
						|
//usage:	IF_NOT_FEATURE_RMDIR_LONG_OPTIONS(
 | 
						|
//usage:     "\n	-p	Include parents"
 | 
						|
//usage:	)
 | 
						|
//usage:
 | 
						|
//usage:#define rmdir_example_usage
 | 
						|
//usage:       "# rmdir /tmp/foo\n"
 | 
						|
 | 
						|
#include "libbb.h"
 | 
						|
 | 
						|
/* This is a NOFORK applet. Be very careful! */
 | 
						|
 | 
						|
 | 
						|
#define PARENTS          (1 << 0)
 | 
						|
#define VERBOSE          ((1 << 1) * ENABLE_FEATURE_VERBOSE)
 | 
						|
#define IGNORE_NON_EMPTY (1 << 2)
 | 
						|
 | 
						|
int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 | 
						|
int rmdir_main(int argc UNUSED_PARAM, char **argv)
 | 
						|
{
 | 
						|
	int status = EXIT_SUCCESS;
 | 
						|
	int flags;
 | 
						|
	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"
 | 
						|
		IF_FEATURE_VERBOSE(
 | 
						|
		"verbose\0"                  No_argument "v"
 | 
						|
		)
 | 
						|
		;
 | 
						|
	applet_long_options = rmdir_longopts;
 | 
						|
#endif
 | 
						|
	flags = getopt32(argv, "pv");
 | 
						|
	argv += optind;
 | 
						|
 | 
						|
	if (!*argv) {
 | 
						|
		bb_show_usage();
 | 
						|
	}
 | 
						|
 | 
						|
	do {
 | 
						|
		path = *argv;
 | 
						|
 | 
						|
		while (1) {
 | 
						|
			if (flags & VERBOSE) {
 | 
						|
				printf("rmdir: removing directory, '%s'\n", path);
 | 
						|
			}
 | 
						|
 | 
						|
			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. */
 | 
						|
				status = EXIT_FAILURE;
 | 
						|
			} else if (flags & PARENTS) {
 | 
						|
				/* Note: path was not "" since rmdir succeeded. */
 | 
						|
				path = dirname(path);
 | 
						|
				/* Path is now just the parent component.  Dirname
 | 
						|
				 * returns "." if there are no parents.
 | 
						|
				 */
 | 
						|
				if (NOT_LONE_CHAR(path, '.')) {
 | 
						|
					continue;
 | 
						|
				}
 | 
						|
			}
 | 
						|
			break;
 | 
						|
		}
 | 
						|
	} while (*++argv);
 | 
						|
 | 
						|
	return status;
 | 
						|
}
 |