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>
		
			
				
	
	
		
			111 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			111 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* vi: set sw=4 ts=4: */
 | 
						|
/*
 | 
						|
 * Mini remove_file implementation for busybox
 | 
						|
 *
 | 
						|
 * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
 | 
						|
 *
 | 
						|
 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 | 
						|
 */
 | 
						|
 | 
						|
#include "libbb.h"
 | 
						|
 | 
						|
/* Used from NOFORK applets. Must not allocate anything */
 | 
						|
 | 
						|
int FAST_FUNC remove_file(const char *path, int flags)
 | 
						|
{
 | 
						|
	struct stat path_stat;
 | 
						|
 | 
						|
	if (lstat(path, &path_stat) < 0) {
 | 
						|
		if (errno != ENOENT) {
 | 
						|
			bb_perror_msg("can't stat '%s'", path);
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
		if (!(flags & FILEUTILS_FORCE)) {
 | 
						|
			bb_perror_msg("can't remove '%s'", path);
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
		return 0;
 | 
						|
	}
 | 
						|
 | 
						|
	if (S_ISDIR(path_stat.st_mode)) {
 | 
						|
		DIR *dp;
 | 
						|
		struct dirent *d;
 | 
						|
		int status = 0;
 | 
						|
 | 
						|
		if (!(flags & FILEUTILS_RECUR)) {
 | 
						|
			bb_error_msg("'%s' is a directory", path);
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
 | 
						|
		if ((!(flags & FILEUTILS_FORCE) && access(path, W_OK) < 0 && isatty(0))
 | 
						|
		 || (flags & FILEUTILS_INTERACTIVE)
 | 
						|
		) {
 | 
						|
			fprintf(stderr, "%s: descend into directory '%s'? ", applet_name,
 | 
						|
					path);
 | 
						|
			if (!bb_ask_confirmation())
 | 
						|
				return 0;
 | 
						|
		}
 | 
						|
 | 
						|
		dp = opendir(path);
 | 
						|
		if (dp == NULL) {
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
 | 
						|
		while ((d = readdir(dp)) != NULL) {
 | 
						|
			char *new_path;
 | 
						|
 | 
						|
			new_path = concat_subpath_file(path, d->d_name);
 | 
						|
			if (new_path == NULL)
 | 
						|
				continue;
 | 
						|
			if (remove_file(new_path, flags) < 0)
 | 
						|
				status = -1;
 | 
						|
			free(new_path);
 | 
						|
		}
 | 
						|
 | 
						|
		if (closedir(dp) < 0) {
 | 
						|
			bb_perror_msg("can't close '%s'", path);
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
 | 
						|
		if (flags & FILEUTILS_INTERACTIVE) {
 | 
						|
			fprintf(stderr, "%s: remove directory '%s'? ", applet_name, path);
 | 
						|
			if (!bb_ask_confirmation())
 | 
						|
				return status;
 | 
						|
		}
 | 
						|
 | 
						|
		if (rmdir(path) < 0) {
 | 
						|
			bb_perror_msg("can't remove '%s'", path);
 | 
						|
			return -1;
 | 
						|
		}
 | 
						|
 | 
						|
		if (flags & FILEUTILS_VERBOSE) {
 | 
						|
			printf("removed directory: '%s'\n", path);
 | 
						|
		}
 | 
						|
 | 
						|
		return status;
 | 
						|
	}
 | 
						|
 | 
						|
	/* !ISDIR */
 | 
						|
	if ((!(flags & FILEUTILS_FORCE)
 | 
						|
	     && access(path, W_OK) < 0
 | 
						|
	     && !S_ISLNK(path_stat.st_mode)
 | 
						|
	     && isatty(0))
 | 
						|
	 || (flags & FILEUTILS_INTERACTIVE)
 | 
						|
	) {
 | 
						|
		fprintf(stderr, "%s: remove '%s'? ", applet_name, path);
 | 
						|
		if (!bb_ask_confirmation())
 | 
						|
			return 0;
 | 
						|
	}
 | 
						|
 | 
						|
	if (unlink(path) < 0) {
 | 
						|
		bb_perror_msg("can't remove '%s'", path);
 | 
						|
		return -1;
 | 
						|
	}
 | 
						|
 | 
						|
	if (flags & FILEUTILS_VERBOSE) {
 | 
						|
		printf("removed '%s'\n", path);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 |