Another whack at scripts/individual. Now builds 212 applets.

[oweals/busybox.git] / coreutils / install.c

diff --git a/coreutils/install.c b/coreutils/install.c
index 84e60f93478e1f679e9c7cbfc73ac68a075dad06..d3d6a58a10098f55b302db47f62c49e76a4cc937 100644 (file)
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -1,35 +1,17 @@
+/* vi: set sw=4 ts=4: */
 /*
- *  Copyright (C) 2003 by Glenn McGrath <bug1@optushome.com.au>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Copyright (C) 2003 by Glenn McGrath <bug1@iinet.net.au>
  *
+ * 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 <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "busybox.h"
 #include "libcoreutils/coreutils.h"
+#include <libgen.h>
+#include <getopt.h> /* struct option */
 
 #define INSTALL_OPT_CMD        1
 #define INSTALL_OPT_DIRECTORY  2
@@ -39,9 +21,20 @@
 #define INSTALL_OPT_MODE  32
 #define INSTALL_OPT_OWNER  64
 
-extern int install_main(int argc, char **argv)
+#if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
+static const struct option install_long_options[] = {
+       { "directory",  0,      NULL,   'd' },
+       { "preserve-timestamps",        0,      NULL,   'p' },
+       { "strip",      0,      NULL,   's' },
+       { "group",      0,      NULL,   'g' },
+       { "mode",       0,      NULL,   'm' },
+       { "owner",      0,      NULL,   'o' },
+       { 0,    0,      0,      0 }
+};
+#endif
+
+int install_main(int argc, char **argv)
 {
-       struct stat statbuf;
        mode_t mode;
        uid_t uid;
        gid_t gid;
@@ -49,26 +42,22 @@ extern int install_main(int argc, char **argv)
        char *uid_str = "-1";
        char *mode_str = "0755";
        int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
-       int ret = EXIT_SUCCESS;
-       int flags;
-       int i;
+       int ret = EXIT_SUCCESS, flags, i, isdir;
 
-       /* -c exists for backwards compatability, its needed */
-       bb_opt_complementaly = "s~d:d~s";
+#if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
+       bb_applet_long_options = install_long_options;
+#endif
+       bb_opt_complementally = "?:s--d:d--s";
+       /* -c exists for backwards compatibility, its needed */
        flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str);     /* 'a' must be 2nd */
 
-       /* Check valid options were given */
-       if(flags & 0x80000000UL) {
-               bb_show_usage();
-       }
-
        /* 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;
        }
        bb_parse_mode(mode_str, &mode);
-       gid = get_ug_id(gid_str, my_getgrnam);
-       uid = get_ug_id(uid_str, my_getpwnam);
+       gid = get_ug_id(gid_str, bb_xgetgrnam);
+       uid = get_ug_id(uid_str, bb_xgetpwnam);
        umask(0);
 
        /* Create directories
@@ -105,16 +94,17 @@ extern int install_main(int argc, char **argv)
                }
                return(ret);
        }
-       
-       cp_mv_stat2(argv[argc - 1], &statbuf, lstat);
+
+       {
+               struct stat statbuf;
+               isdir = lstat(argv[argc - 1], &statbuf)<0
+                                       ? 0 : S_ISDIR(statbuf.st_mode);
+       }
        for (i = optind; i < argc - 1; i++) {
-               unsigned char *dest;
+               char *dest;
 
-               if (S_ISDIR(statbuf.st_mode)) {
-                       dest = concat_path_file(argv[argc - 1], basename(argv[i]));
-               } else {
-                       dest = argv[argc - 1];
-               }
+               dest = argv[argc - 1];
+               if (isdir) dest = concat_path_file(argv[argc - 1], basename(argv[i]));
                ret |= copy_file(argv[i], dest, copy_flags);
 
                /* Set the file mode */
@@ -126,15 +116,16 @@ extern int install_main(int argc, char **argv)
                /* Set the user and group id */
                if (lchown(dest, uid, gid) == -1) {
                        bb_perror_msg("cannot change ownership of %s", dest);
-                       ret = EXIT_FAILURE;                     
+                       ret = EXIT_FAILURE;
                }
                if (flags & INSTALL_OPT_STRIP) {
                        if (execlp("strip", "strip", dest, NULL) == -1) {
                                bb_error_msg("strip failed");
-                               ret = EXIT_FAILURE;                     
+                               ret = EXIT_FAILURE;
                        }
                }
+               if(ENABLE_FEATURE_CLEAN_UP && isdir) free(dest);
        }
-       
+
        return(ret);
 }