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

Fix a bug, ignore the source path when installing to a directory.

Browse Source 
We may be installing symlinks, so use lstat/lchown.
Make use of bb_getopt_ulflags and cp_mv_stat2, save 100 bytes.
This commit is contained in:
Glenn L McGrath 2003-11-27 22:40:08 +00:00
parent e39ee01821
commit 11e69471be
1 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
coreutils/install.c
View File

@ -18,8 +18,6 @@
* *
* TODO: -d option, need a way of recursively making directories and changing * TODO: -d option, need a way of recursively making directories and changing
* owner/group, will probably modify bb_make_directory(...) * owner/group, will probably modify bb_make_directory(...)
* Use bb_getopt_ulflags(...) ?
*
*/ */
#include <sys/stat.h> #include <sys/stat.h>
@ -30,50 +28,51 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "libbb.h" #include "busybox.h"
#include "libcoreutils/coreutils.h"
#define INSTALL_OPT_CMD 1
#define INSTALL_OPT_DIRECTORY 2
#define INSTALL_OPT_PRESERVE_TIME 4
#define INSTALL_OPT_STRIP 8
#define INSTALL_OPT_GROUP 16
#define INSTALL_OPT_MODE 32
#define INSTALL_OPT_OWNER 64
extern int install_main(int argc, char **argv) extern int install_main(int argc, char **argv)
{ {
struct stat statbuf; struct stat statbuf;
int i; mode_t mode = 0755;
int ret = EXIT_SUCCESS;
uid_t uid = -1; uid_t uid = -1;
gid_t gid = -1; gid_t gid = -1;
int copy_flags = 0; char *gid_str;
int strip_flag = 0; char *uid_str;
int dir_flag = 0; char *mode_str;
mode_t mode = 0755; int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
int ret = EXIT_SUCCESS;
int flags;
int i;
/* -c exists for backwards compatability, its needed */ /* -c exists for backwards compatability, its needed */
while ((i = getopt(argc, argv, "cdg:m:o:ps")) != -1) { flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */
switch (i) {
case 'd': /* Create directories */ /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
dir_flag = 1; if (flags & INSTALL_OPT_PRESERVE_TIME) {
break; copy_flags |= FILEUTILS_PRESERVE_STATUS;
case 'g': /* group */ }
gid = get_ug_id(optarg, my_getgrnam); if (flags & INSTALL_OPT_GROUP) {
break; gid = get_ug_id(gid_str, my_getgrnam);
case 'm': /* mode */ }
bb_parse_mode(optarg, &mode); if (flags & INSTALL_OPT_MODE) {
break; bb_parse_mode(mode_str, &mode);
case 'o': /* owner */ }
uid = get_ug_id(optarg, my_getpwnam); if (flags & INSTALL_OPT_OWNER) {
break; uid = get_ug_id(uid_str, my_getpwnam);
case 'p': /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
copy_flags |= FILEUTILS_PRESERVE_STATUS;
break;
case 's': /* Strip binaries */
strip_flag = 1;
/* Fall through */
case 'c':
/* do nothing */
break;
default:
bb_show_usage();
}
} }
if (dir_flag) { /* Create directories */
if (flags & INSTALL_OPT_DIRECTORY) {
for (argv += optind; *argv; argv++) { for (argv += optind; *argv; argv++) {
unsigned char *dir_name = *argv; unsigned char *dir_name = *argv;
unsigned char *argv_ptr; unsigned char *argv_ptr;
@ -86,7 +85,7 @@ extern int install_main(int argc, char **argv)
if ((dir_name[0] == '.') && ((dir_name[1] == '\0') || ((dir_name[1] == '.') && (dir_name[2] == '\0')))) { if ((dir_name[0] == '.') && ((dir_name[1] == '\0') || ((dir_name[1] == '.') && (dir_name[2] == '\0')))) {
break; break;
} }
if (chown(dir_name, uid, gid) == -1) { if (lchown(dir_name, uid, gid) == -1) {
bb_perror_msg("cannot change ownership of %s", argv_ptr); bb_perror_msg("cannot change ownership of %s", argv_ptr);
ret |= EXIT_FAILURE; ret |= EXIT_FAILURE;
} }
@ -97,16 +96,13 @@ extern int install_main(int argc, char **argv)
} }
return(ret); return(ret);
} }
if ((stat(argv[argc - 1], &statbuf) == -1) && (errno != ENOENT)) { cp_mv_stat2(argv[argc - 1], &statbuf, lstat);
bb_perror_msg_and_die("stat failed for %s: ", argv[argc - 1]);
}
for (i = optind; i < argc - 1; i++) { for (i = optind; i < argc - 1; i++) {
unsigned char *dest; unsigned char *dest;
if (S_ISDIR(statbuf.st_mode)) { if (S_ISDIR(statbuf.st_mode)) {
dest = concat_path_file(argv[argc - 1], argv[i]); dest = concat_path_file(argv[argc - 1], basename(argv[i]));
} else { } else {
dest = argv[argc - 1]; dest = argv[argc - 1];
} }
@ -119,11 +115,11 @@ extern int install_main(int argc, char **argv)
} }
/* Set the user and group id */ /* Set the user and group id */
if (chown(dest, uid, gid) == -1) { if (lchown(dest, uid, gid) == -1) {
bb_perror_msg("cannot change ownership of %s", dest); bb_perror_msg("cannot change ownership of %s", dest);
ret |= EXIT_FAILURE; ret |= EXIT_FAILURE;
} }
if (strip_flag) { if (flags & INSTALL_OPT_STRIP) {
if (execlp("strip", "strip", dest, NULL) == -1) { if (execlp("strip", "strip", dest, NULL) == -1) {
bb_error_msg("strip failed"); bb_error_msg("strip failed");
ret |= EXIT_FAILURE; ret |= EXIT_FAILURE;