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

We may be installing symlinks, so use lstat/lchown.
Make use of bb_getopt_ulflags and cp_mv_stat2, save 100 bytes.

diff --git a/coreutils/install.c b/coreutils/install.c
index 95bb59463c94a92d1cbd26364b7968d8eb55a941..9a1306746662b6355a6bc665481e69757f2c9417 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -18,8 +18,6 @@
  *
  * TODO: -d option, need a way of recursively making directories and changing
  *           owner/group, will probably modify bb_make_directory(...)
- *       Use bb_getopt_ulflags(...) ?
- *
  */
 
 #include <sys/stat.h>
@@ -30,50 +28,51 @@
 #include <string.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)
 {
        struct stat statbuf;
-       int i;
-       int ret = EXIT_SUCCESS;
+       mode_t mode = 0755;
        uid_t uid = -1;
        gid_t gid = -1;
-       int copy_flags = 0;
-       int strip_flag = 0;
-       int dir_flag = 0;
-       mode_t mode = 0755;
+       char *gid_str;
+       char *uid_str;
+       char *mode_str;
+       int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
+       int ret = EXIT_SUCCESS;
+       int flags;
+       int i;
 
        /* -c exists for backwards compatability, its needed */
-       while ((i = getopt(argc, argv, "cdg:m:o:ps")) != -1) {
-               switch (i) {
-               case 'd':       /* Create directories */
-                       dir_flag = 1;
-                       break;
-               case 'g':       /* group */
-                       gid = get_ug_id(optarg, my_getgrnam);
-                       break;
-               case 'm':       /* mode */
-                       bb_parse_mode(optarg, &mode);
-                       break;
-               case 'o':       /* owner */
-                       uid = get_ug_id(optarg, my_getpwnam);
-                       break;
-               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();
-               }
+       flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str);     /* 'a' must be 2nd */
+
+       /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
+       if (flags & INSTALL_OPT_PRESERVE_TIME) {
+               copy_flags |= FILEUTILS_PRESERVE_STATUS;
+       }
+       if (flags & INSTALL_OPT_GROUP) {
+               gid = get_ug_id(gid_str, my_getgrnam);
+       }
+       if (flags & INSTALL_OPT_MODE) {
+               bb_parse_mode(mode_str, &mode);
+       }
+       if (flags & INSTALL_OPT_OWNER) {
+               uid = get_ug_id(uid_str, my_getpwnam);
        }
 
-       if (dir_flag) {
+       /* Create directories */
+       if (flags & INSTALL_OPT_DIRECTORY) {
+       
                for (argv += optind; *argv; argv++) {
                        unsigned char *dir_name = *argv;
                        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')))) {
                                        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);
                                        ret |= EXIT_FAILURE;
                                }
@@ -97,16 +96,13 @@ extern int install_main(int argc, char **argv)
                }
                return(ret);
        }
-
-       if ((stat(argv[argc - 1], &statbuf) == -1) && (errno != ENOENT)) {
-               bb_perror_msg_and_die("stat failed for %s: ", argv[argc - 1]);
-       }
-
+       
+       cp_mv_stat2(argv[argc - 1], &statbuf, lstat);
        for (i = optind; i < argc - 1; i++) {
                unsigned char *dest;
 
                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 {
                        dest = argv[argc - 1];
                }
@@ -119,11 +115,11 @@ extern int install_main(int argc, char **argv)
                }
 
                /* 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);
                        ret |= EXIT_FAILURE;                    
                }
-               if (strip_flag) {
+               if (flags & INSTALL_OPT_STRIP) {
                        if (execlp("strip", "strip", dest, NULL) == -1) {
                                bb_error_msg("strip failed");
                                ret |= EXIT_FAILURE;