Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-02 21:41:40 +00:00
Code Issues Projects Releases Wiki Activity

kbd_mode: fix non-ASCII letters in comments

Browse Source 
install: support -D
This commit is contained in:
Denis Vlasenko 2008-09-03 21:54:46 +00:00
parent a2e1eea189
commit d4b719878f
3 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-tools/kbd_mode.c
View File

@ -2,7 +2,7 @@
/* /*
* Mini kbd_mode implementation for busybox * Mini kbd_mode implementation for busybox
* *
* Copyright (C) 2007 Loïc Grenié <loic.grenie@gmail.com> * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com>
* written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from * written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
* console-utils v0.2.3, licensed under GNU GPLv2 * console-utils v0.2.3, licensed under GNU GPLv2
* *

64
coreutils/install.c
View File

@ -4,9 +4,6 @@
* SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp> * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*
* TODO: -d option, need a way of recursively making directories and changing
* owner/group, will probably modify bb_make_directory(...)
*/ */
#include "libbb.h" #include "libbb.h"
@ -53,7 +50,8 @@ static void setdefaultfilecon(const char *path)
if (lsetfilecon(path, scontext) < 0) { if (lsetfilecon(path, scontext) < 0) {
if (errno != ENOTSUP) { if (errno != ENOTSUP) {
bb_perror_msg("warning: failed to change context of %s to %s", path, scontext); bb_perror_msg("warning: failed to change context"
" of %s to %s", path, scontext);
} }
} }
@ -75,7 +73,7 @@ int install_main(int argc, char **argv)
const char *uid_str; const char *uid_str;
const char *mode_str; const char *mode_str;
int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE; int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
int flags; int opts;
int min_args = 1; int min_args = 1;
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
int isdir = 0; int isdir = 0;
@ -87,15 +85,16 @@ int install_main(int argc, char **argv)
OPT_c = 1 << 0, OPT_c = 1 << 0,
OPT_v = 1 << 1, OPT_v = 1 << 1,
OPT_b = 1 << 2, OPT_b = 1 << 2,
OPT_DIRECTORY = 1 << 3, OPT_MKDIR_LEADING = 1 << 3,
OPT_PRESERVE_TIME = 1 << 4, OPT_DIRECTORY = 1 << 4,
OPT_STRIP = 1 << 5, OPT_PRESERVE_TIME = 1 << 5,
OPT_GROUP = 1 << 6, OPT_STRIP = 1 << 6,
OPT_MODE = 1 << 7, OPT_GROUP = 1 << 7,
OPT_OWNER = 1 << 8, OPT_MODE = 1 << 8,
OPT_OWNER = 1 << 9,
#if ENABLE_SELINUX #if ENABLE_SELINUX
OPT_SET_SECURITY_CONTEXT = 1 << 9, OPT_SET_SECURITY_CONTEXT = 1 << 10,
OPT_PRESERVE_SECURITY_CONTEXT = 1 << 10, OPT_PRESERVE_SECURITY_CONTEXT = 1 << 11,
#endif #endif
}; };
@ -106,37 +105,38 @@ int install_main(int argc, char **argv)
/* -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") */ /* -v is ignored ("print name of each created directory") */
/* -b is ignored ("make a backup of each existing destination file") */ /* -b is ignored ("make a backup of each existing destination file") */
flags = getopt32(argv, "cvb" "dpsg:m:o:" USE_SELINUX("Z:"), opts = getopt32(argv, "cvb" "Ddpsg: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|OPT_SET_SECURITY_CONTEXT)) { if (opts & (OPT_PRESERVE_SECURITY_CONTEXT|OPT_SET_SECURITY_CONTEXT)) {
selinux_or_die(); selinux_or_die();
use_default_selinux_context = 0; use_default_selinux_context = 0;
if (flags & OPT_PRESERVE_SECURITY_CONTEXT) { if (opts & OPT_PRESERVE_SECURITY_CONTEXT) {
copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT; copy_flags |= FILEUTILS_PRESERVE_SECURITY_CONTEXT;
} }
if (flags & OPT_SET_SECURITY_CONTEXT) { if (opts & OPT_SET_SECURITY_CONTEXT) {
setfscreatecon_or_die(scontext); setfscreatecon_or_die(scontext);
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,
if (flags & OPT_PRESERVE_TIME) { * BSD only preserves modification time */
if (opts & OPT_PRESERVE_TIME) {
copy_flags |= FILEUTILS_PRESERVE_STATUS; copy_flags |= FILEUTILS_PRESERVE_STATUS;
} }
mode = 0666; mode = 0666;
if (flags & OPT_MODE) if (opts & OPT_MODE)
bb_parse_mode(mode_str, &mode); bb_parse_mode(mode_str, &mode);
uid = (flags & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid(); uid = (opts & OPT_OWNER) ? get_ug_id(uid_str, xuname2uid) : getuid();
gid = (flags & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid(); gid = (opts & OPT_GROUP) ? get_ug_id(gid_str, xgroup2gid) : getgid();
last = argv[argc - 1]; last = argv[argc - 1];
if (!(flags & OPT_DIRECTORY)) { if (!(opts & OPT_DIRECTORY)) {
argv[argc - 1] = NULL; argv[argc - 1] = NULL;
min_args++; min_args++;
@ -149,7 +149,7 @@ int install_main(int argc, char **argv)
while ((arg = *argv++) != NULL) { while ((arg = *argv++) != NULL) {
char *dest = last; char *dest = last;
if (flags & OPT_DIRECTORY) { if (opts & OPT_DIRECTORY) {
dest = arg; dest = arg;
/* GNU coreutils 6.9 does not set uid:gid /* GNU coreutils 6.9 does not set uid:gid
* on intermediate created directories * on intermediate created directories
@ -161,6 +161,16 @@ int install_main(int argc, char **argv)
} else { } else {
if (isdir) if (isdir)
dest = concat_path_file(last, basename(arg)); dest = concat_path_file(last, basename(arg));
if (opts & OPT_MKDIR_LEADING) {
char *slash = strrchr(dest, '/');
if (slash) {
*slash = '\0';
bb_make_directory(dest, 0755, FILEUTILS_RECUR);
/* errors are not checked. copy_file
* will fail if dir is not created. */
*slash = '/';
}
}
if (copy_file(arg, dest, copy_flags)) { if (copy_file(arg, dest, copy_flags)) {
/* copy is not made */ /* copy is not made */
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
@ -169,7 +179,7 @@ int install_main(int argc, char **argv)
} }
/* Set the file mode */ /* Set the file mode */
if ((flags & OPT_MODE) && chmod(dest, mode) == -1) { if ((opts & OPT_MODE) && chmod(dest, mode) == -1) {
bb_perror_msg("can't change %s of %s", "permissions", dest); bb_perror_msg("can't change %s of %s", "permissions", dest);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
@ -178,13 +188,13 @@ int install_main(int argc, char **argv)
setdefaultfilecon(dest); setdefaultfilecon(dest);
#endif #endif
/* Set the user and group id */ /* Set the user and group id */
if ((flags & (OPT_OWNER|OPT_GROUP)) if ((opts & (OPT_OWNER|OPT_GROUP))
&& lchown(dest, uid, gid) == -1 && lchown(dest, uid, gid) == -1
) { ) {
bb_perror_msg("can't change %s of %s", "ownership", dest); bb_perror_msg("can't change %s of %s", "ownership", dest);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
if (flags & OPT_STRIP) { if (opts & OPT_STRIP) {
char *args[3]; char *args[3];
args[0] = (char*)"strip"; args[0] = (char*)"strip";
args[1] = dest; args[1] = dest;

15
include/usage.h
View File

@ -1873,19 +1873,20 @@
) )
#define install_trivial_usage \ #define install_trivial_usage \
"[-cgmops] [sources] dest|directory" "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [source] dest|directory"
#define install_full_usage "\n\n" \ #define install_full_usage "\n\n" \
"Copy files and set attributes\n" \ "Copy files and set attributes\n" \
"\nOptions:" \ "\nOptions:" \
"\n -c Copy the file, default" \ "\n -c Just copy (default)" \
"\n -d Create directories" \ "\n -d Create directories" \
"\n -g Set group ownership" \ "\n -D Create leading directories" \
"\n -m Set permissions" \ "\n -s Strip symbol table" \
"\n -o Set ownership" \
"\n -p Preserve date" \ "\n -p Preserve date" \
"\n -s Strip symbol tables" \ "\n -o USER Set ownership" \
"\n -g GRP Set group ownership" \
"\n -m MODE Set permissions" \
USE_SELINUX( \ USE_SELINUX( \
"\n -Z Set security context of copy" \ "\n -Z Set security context" \
) )
/* would need to make the " | " optional depending on more than one selected: */ /* would need to make the " | " optional depending on more than one selected: */