Add the "install" applet, move get_ug_id to libbb as its used by chown,
chgrp and install.
diff --git a/coreutils/Config.in b/coreutils/Config.in
index 074312b..c2ae399 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -218,6 +218,12 @@
help
id displays the current user and group ID names.
+config CONFIG_INSTALL
+ bool "install"
+ default n
+ help
+ Copy files and set attributes.
+
config CONFIG_LENGTH
bool "length"
default n
diff --git a/coreutils/Makefile.in b/coreutils/Makefile.in
index 95eda1a..b672f08 100644
--- a/coreutils/Makefile.in
+++ b/coreutils/Makefile.in
@@ -47,6 +47,7 @@
COREUTILS-$(CONFIG_HEAD) += head.o
COREUTILS-$(CONFIG_HOSTID) += hostid.o
COREUTILS-$(CONFIG_ID) += id.o
+COREUTILS-$(CONFIG_INSTALL) += install.o
COREUTILS-$(CONFIG_LENGTH) += length.o
COREUTILS-$(CONFIG_LN) += ln.o
COREUTILS-$(CONFIG_LOGNAME) += logname.o
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 2f3fa41..8c969d7 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -59,10 +59,7 @@
argv += optind;
/* Find the selected group */
- gid = strtoul(*argv, &p, 10); /* maybe it's already numeric */
- if (*p || (p == *argv)) { /* trailing chars or nonnumeric */
- gid = my_getgrnam(*argv);
- }
+ gid = get_ug_id(*argv, my_getgrnam);
++argv;
/* Ok, ready to do the deed now */
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 02b7524..07d673f 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -53,19 +53,6 @@
#define FLAG_R 1
#define FLAG_h 2
-static unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *))
-{
- unsigned long r;
- char *p;
-
- r = strtoul(s, &p, 10);
- if (*p || (s == p)) {
- r = my_getxxnam(s);
- }
-
- return r;
-}
-
int chown_main(int argc, char **argv)
{
int flags;
diff --git a/coreutils/install.c b/coreutils/install.c
new file mode 100644
index 0000000..b235817
--- /dev/null
+++ b/coreutils/install.c
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ *
+ *
+ * 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>
+#include <sys/types.h>
+#include <errno.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "libbb.h"
+
+extern int install_main(int argc, char **argv)
+{
+ struct stat statbuf;
+ int i;
+ int ret = EXIT_SUCCESS;
+ uid_t uid = -1;
+ gid_t gid = -1;
+ int copy_flags = 0;
+ int strip_flag = 0;
+ mode_t mode = 0755;
+
+ /* -c exists for backwards compatability, its needed */
+ while ((i = getopt(argc, argv, "cg:m:o:ps")) != -1) {
+ switch (i) {
+ 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;
+ break;
+ default:
+ bb_show_usage();
+ }
+ }
+
+ if ((stat(argv[argc - 1], &statbuf) == -1) && (errno != ENOENT)) {
+ bb_perror_msg_and_die("stat failed for %s: ", argv[argc - 1]);
+ }
+
+ 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]);
+ } else {
+ dest = argv[argc - 1];
+ }
+ ret |= copy_file(argv[i], dest, copy_flags);
+
+ /* Set the file mode */
+ if (chmod(dest, mode) == -1) {
+ bb_perror_msg("cannot change permissions of %s", dest);
+ ret |= EXIT_FAILURE;
+ }
+
+ /* Set the user and group id */
+ if (chown(dest, uid, gid) == -1) {
+ bb_perror_msg("cannot change ownership of %s", dest);
+ ret |= EXIT_FAILURE;
+ }
+ if (strip_flag) {
+ if (execlp("strip", "strip", dest, NULL) == -1) {
+ bb_error_msg("strip failed");
+ ret |= EXIT_FAILURE;
+ }
+ }
+ }
+
+ return(ret);
+}
diff --git a/include/applets.h b/include/applets.h
index 0b65266..b1425fa 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -283,6 +283,9 @@
#ifdef CONFIG_INSMOD
APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
#endif
+#ifdef CONFIG_INSTALL
+ APPLET(install, install_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
+#endif
#ifdef CONFIG_IP
APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif
diff --git a/include/libbb.h b/include/libbb.h
index a6ccff4..2bb5ce0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -467,5 +467,6 @@
extern void vfork_daemon_rexec(int argc, char **argv, char *foreground_opt);
extern void get_terminal_width_height(int fd, int *width, int *height);
+extern unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *));
#endif /* __LIBCONFIG_H__ */
diff --git a/include/usage.h b/include/usage.h
index ba8fdde..ba808d3 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1239,6 +1239,18 @@
USAGE_INSMOD_MAP("\t-m\tOutput load map to stdout") \
"\t-x\tdo not export externs\n"
+#define install_trivial_usage \
+ "[cgmops] [sources] <dest|directory>"
+#define install_full_usage \
+ "copy files and set attributes\n\n" \
+ "Options:\n" \
+ "\t-c\tcopy the file, default\n" \
+ "\t-g\tset group ownership\n" \
+ "\t-m\tset permission modes\n" \
+ "\t-o\tset ownership\n" \
+ "\t-p\tpreserve date\n" \
+ "\t-s\tstrip symbol tables\n"
+
#define ip_trivial_usage \
"[ OPTIONS ] { address | link | route | tunnel } { COMMAND | help }"
#define ip_full_usage \
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 9da0f3a..854bfc3 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -30,7 +30,7 @@
create_icmp6_socket.c device_open.c dump.c error_msg.c \
error_msg_and_die.c find_mount_point.c find_pid_by_name.c \
find_root_device.c fgets_str.c full_read.c full_write.c get_console.c \
- get_last_path_component.c get_line_from_file.c \
+ get_last_path_component.c get_line_from_file.c get_ug_id.c \
get_terminal_width_height.c herror_msg.c herror_msg_and_die.c \
human_readable.c inet_common.c inode_hash.c interface.c isdirectory.c \
kernel_version.c last_char_is.c llist_add_to.c login.c loop.c \
diff --git a/libbb/get_ug_id.c b/libbb/get_ug_id.c
new file mode 100644
index 0000000..24ed136
--- /dev/null
+++ b/libbb/get_ug_id.c
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+extern unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *))
+{
+ unsigned long r;
+ char *p;
+
+ r = strtoul(s, &p, 10);
+ if (*p || (s == p)) {
+ r = my_getxxnam(s);
+ }
+
+ return r;
+}