Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-23 05:29:58 +00:00
Code Issues Projects Releases Wiki Activity

install: fix bug in "install -c file dir" (tries to copy dir into dir too)

Browse Source 
install: 'support' (ignore) -v and -b
This commit is contained in:
Denis Vlasenko 2007-09-26 10:34:54 +00:00
parent 6a5377ac14
commit 4dd4e6d6b9
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
coreutils/install.c
View File

@ -23,6 +23,8 @@ static const char install_longopts[] ALIGN1 =
"group\0" No_argument "g" "group\0" No_argument "g"
"mode\0" No_argument "m" "mode\0" No_argument "m"
"owner\0" No_argument "o" "owner\0" No_argument "o"
/* autofs build insists of using -b --suffix=.orig */
/* TODO? (short option for --suffix is -S) */
#if ENABLE_SELINUX #if ENABLE_SELINUX
"context\0" Required_argument "Z" "context\0" Required_argument "Z"
"preserve_context\0" No_argument "\xff" "preserve_context\0" No_argument "\xff"
@ -33,8 +35,6 @@ static const char install_longopts[] ALIGN1 =
#if ENABLE_SELINUX #if ENABLE_SELINUX
static bool use_default_selinux_context = 1;
static void setdefaultfilecon(const char *path) static void setdefaultfilecon(const char *path)
{ {
struct stat s; struct stat s;
@ -83,18 +83,21 @@ int install_main(int argc, char **argv)
int isdir; int isdir;
#if ENABLE_SELINUX #if ENABLE_SELINUX
security_context_t scontext; security_context_t scontext;
bool use_default_selinux_context = 1;
#endif #endif
enum { enum {
OPT_CMD = 0x1, OPT_c = 1 << 0,
OPT_DIRECTORY = 0x2, OPT_v = 1 << 1,
OPT_PRESERVE_TIME = 0x4, OPT_b = 1 << 2,
OPT_STRIP = 0x8, OPT_DIRECTORY = 1 << 3,
OPT_GROUP = 0x10, OPT_PRESERVE_TIME = 1 << 4,
OPT_MODE = 0x20, OPT_STRIP = 1 << 5,
OPT_OWNER = 0x40, OPT_GROUP = 1 << 6,
OPT_MODE = 1 << 7,
OPT_OWNER = 1 << 8,
#if ENABLE_SELINUX #if ENABLE_SELINUX
OPT_SET_SECURITY_CONTEXT = 0x80, OPT_SET_SECURITY_CONTEXT = 1 << 9,
OPT_PRESERVE_SECURITY_CONTEXT = 0x100, OPT_PRESERVE_SECURITY_CONTEXT = 1 << 10,
#endif #endif
}; };
@ -103,24 +106,25 @@ int install_main(int argc, char **argv)
#endif #endif
opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z"); opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z");
/* -c exists for backwards compatibility, it's needed */ /* -c exists for backwards compatibility, it's needed */
/* -v is ignored ("print name of each created directory") */
flags = getopt32(argv, "cdpsg:m:o:" USE_SELINUX("Z:"), /* -b is ignored ("make a backup of each existing destination file") */
flags = getopt32(argv, "cvb" "dpsg:m:o:" USE_SELINUX("Z:"),
&gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext)); &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext));
argc -= optind; argc -= optind;
argv += optind; argv += optind;
#if ENABLE_SELINUX #if ENABLE_SELINUX
if (flags & OPT_PRESERVE_SECURITY_CONTEXT) { if (flags & (OPT_PRESERVE_SECURITY_CONTEXT|OPT_SET_SECURITY_CONTEXT)) {
use_default_selinux_context = 0;
copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
selinux_or_die(); selinux_or_die();
use_default_selinux_context = 0;
if (flags & OPT_PRESERVE_SECURITY_CONTEXT) {
copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
} }
if (flags & OPT_SET_SECURITY_CONTEXT) { if (flags & OPT_SET_SECURITY_CONTEXT) {
selinux_or_die();
setfscreatecon_or_die(scontext); setfscreatecon_or_die(scontext);
use_default_selinux_context = 0;
copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT; copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT;
} }
}
#endif #endif
/* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */ /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
@ -172,6 +176,7 @@ int install_main(int argc, char **argv)
bb_show_usage(); bb_show_usage();
last = argv[argc - 1]; last = argv[argc - 1];
argv[argc - 1] = NULL;
/* coreutils install resolves link in this case, don't use lstat */ /* coreutils install resolves link in this case, don't use lstat */
isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode); isdir = stat(last, &statbuf) < 0 ? 0 : S_ISDIR(statbuf.st_mode);