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 9e5eb60377f0c7b5e01851894ce52f10a9bd20ce..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@iinet.net.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.
- *
+ * 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 <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h> /* struct option */
-
 #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,17 +21,19 @@
 #define INSTALL_OPT_MODE  32
 #define INSTALL_OPT_OWNER  64
 
+#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' },
+       { "mode",       0,      NULL,   'm' },
        { "owner",      0,      NULL,   'o' },
        { 0,    0,      0,      0 }
 };
+#endif
 
-extern int install_main(int argc, char **argv)
+int install_main(int argc, char **argv)
 {
        mode_t mode;
        uid_t uid;
@@ -60,9 +44,11 @@ extern int install_main(int argc, char **argv)
        int copy_flags = FILEUTILS_DEREFERENCE | FILEUTILS_FORCE;
        int ret = EXIT_SUCCESS, flags, i, isdir;
 
+#if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
        bb_applet_long_options = install_long_options;
-       bb_opt_complementally = "?s~d:d~s";
-       /* -c exists for backwards compatability, its needed */
+#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 */
 
        /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
@@ -115,7 +101,7 @@ extern int install_main(int argc, char **argv)
                                        ? 0 : S_ISDIR(statbuf.st_mode);
        }
        for (i = optind; i < argc - 1; i++) {
-               unsigned char *dest;
+               char *dest;
 
                dest = argv[argc - 1];
                if (isdir) dest = concat_path_file(argv[argc - 1], basename(argv[i]));