diff options
Diffstat (limited to 'release/src/router/busybox/debianutils')
| -rw-r--r--[-rwxr-xr-x] | release/src/router/busybox/debianutils/Config.in | 54 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/Kbuild | 12 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/Makefile | 30 | ||||
| -rwxr-xr-x | release/src/router/busybox/debianutils/Makefile.in | 37 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/mktemp.c | 86 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/pipe_progress.c | 39 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/readlink.c | 46 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/run_parts.c | 221 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/start_stop_daemon.c | 536 | ||||
| -rw-r--r-- | release/src/router/busybox/debianutils/which.c | 136 |
10 files changed, 717 insertions, 480 deletions
diff --git a/release/src/router/busybox/debianutils/Config.in b/release/src/router/busybox/debianutils/Config.in index 8bdb91f2..8deb38f3 100755..100644 --- a/release/src/router/busybox/debianutils/Config.in +++ b/release/src/router/busybox/debianutils/Config.in @@ -5,20 +5,19 @@ menu "Debian Utilities" -config CONFIG_MKTEMP +config MKTEMP bool "mktemp" default n help mktemp is used to create unique temporary files -config CONFIG_READLINK - bool "readlink" +config PIPE_PROGRESS + bool "pipe_progress" default n help - This program reads a symbolic link and returns the name - of the file it points to + Display a dot to indicate pipe activity. -config CONFIG_RUN_PARTS +config RUN_PARTS bool "run-parts" default n help @@ -27,21 +26,54 @@ config CONFIG_RUN_PARTS It is useful to set up a directory like cron.daily, where you need to execute all the scripts in that directory. - This implementation of run-parts does not accept long options, and - some features (such as report mode) are not implemented. + In this implementation of run-parts some features (such as report + mode) are not implemented. Unless you know that run-parts is used in some of your scripts you can safely say N here. -config CONFIG_START_STOP_DAEMON +config FEATURE_RUN_PARTS_LONG_OPTIONS + bool "Enable long options" + default n + depends on RUN_PARTS && GETOPT_LONG + help + Support long options for the run-parts applet. + +config FEATURE_RUN_PARTS_FANCY + bool "Support additional arguments" + default n + depends on RUN_PARTS + help + Support additional options: + -l --list print the names of the all matching files (not + limited to executables), but don't actually run them. + +config START_STOP_DAEMON bool "start-stop-daemon" - default y + default n help start-stop-daemon is used to control the creation and termination of system-level processes, usually the ones started during the startup of the system. -config CONFIG_WHICH +config FEATURE_START_STOP_DAEMON_FANCY + bool "Support additional arguments" + default n + depends on START_STOP_DAEMON + help + Support additional arguments. + -o|--oknodo ignored since we exit with 0 anyway + -v|--verbose + -N|--nicelevel N + +config FEATURE_START_STOP_DAEMON_LONG_OPTIONS + bool "Enable long options" + default n + depends on START_STOP_DAEMON && GETOPT_LONG + help + Support long options for the start-stop-daemon applet. + +config WHICH bool "which" default n help diff --git a/release/src/router/busybox/debianutils/Kbuild b/release/src/router/busybox/debianutils/Kbuild new file mode 100644 index 00000000..bcf6126a --- /dev/null +++ b/release/src/router/busybox/debianutils/Kbuild @@ -0,0 +1,12 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> +# +# Licensed under the GPL v2, see the file LICENSE in this tarball. + +lib-y:= +lib-$(CONFIG_MKTEMP) += mktemp.o +lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o +lib-$(CONFIG_RUN_PARTS) += run_parts.o +lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o +lib-$(CONFIG_WHICH) += which.o diff --git a/release/src/router/busybox/debianutils/Makefile b/release/src/router/busybox/debianutils/Makefile deleted file mode 100644 index 13181ead..00000000 --- a/release/src/router/busybox/debianutils/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> -# -# 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 -# 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 -# - -TOPDIR:= ../ -DEBIANUTILS_DIR:=./ -include $(TOPDIR).config -include $(TOPDIR)Rules.mak -include Makefile.in -all: $(libraries-y) --include $(TOPDIR).depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/release/src/router/busybox/debianutils/Makefile.in b/release/src/router/busybox/debianutils/Makefile.in deleted file mode 100755 index 8ca05c73..00000000 --- a/release/src/router/busybox/debianutils/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> -# -# 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 -# 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 -# - -DEBIANUTILS_AR:=debianutils.a -ifndef $(DEBIANUTILS_DIR) -DEBIANUTILS_DIR:=$(TOPDIR)debianutils/ -endif - - -DEBIANUTILS-y:= -DEBIANUTILS-$(CONFIG_MKTEMP) += mktemp.o -DEBIANUTILS-$(CONFIG_READLINK) += readlink.o -DEBIANUTILS-$(CONFIG_RUN_PARTS) += run_parts.o -DEBIANUTILS-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o -DEBIANUTILS-$(CONFIG_WHICH) += which.o - -libraries-y+=$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR) - -$(DEBIANUTILS_DIR)$(DEBIANUTILS_AR): $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y)) - $(AR) -ro $@ $(patsubst %,$(DEBIANUTILS_DIR)%, $(DEBIANUTILS-y)) - diff --git a/release/src/router/busybox/debianutils/mktemp.c b/release/src/router/busybox/debianutils/mktemp.c index ecc985fb..0dcb1e82 100644 --- a/release/src/router/busybox/debianutils/mktemp.c +++ b/release/src/router/busybox/debianutils/mktemp.c @@ -6,58 +6,64 @@ * Copyright (C) 2000 by Daniel Jacobowitz * Written by Daniel Jacobowitz <dan@debian.org> * - * 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 - * 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 the GPL v2 or later, see the file LICENSE in this tarball. + */ + +/* Coreutils 6.12 man page says: + * mktemp [OPTION]... [TEMPLATE] + * Create a temporary file or directory, safely, and print its name. If + * TEMPLATE is not specified, use tmp.XXXXXXXXXX. + * -d, --directory + * create a directory, not a file + * -q, --quiet + * suppress diagnostics about file/dir-creation failure + * -u, --dry-run + * do not create anything; merely print a name (unsafe) + * --tmpdir[=DIR] + * interpret TEMPLATE relative to DIR. If DIR is not specified, + * use $TMPDIR if set, else /tmp. With this option, TEMPLATE must + * not be an absolute name. Unlike with -t, TEMPLATE may contain + * slashes, but even here, mktemp still creates only the final com- + * ponent. + * -p DIR use DIR as a prefix; implies -t [deprecated] + * -t interpret TEMPLATE as a single file name component, relative to + * a directory: $TMPDIR, if set; else the directory specified via + * -p; else /tmp [deprecated] */ -#include <stdio.h> -#include <errno.h> -#include <string.h> -#include <unistd.h> -#include <stdlib.h> -#include "busybox.h" -extern int mktemp_main(int argc, char **argv) +#include "libbb.h" + +int mktemp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int mktemp_main(int argc UNUSED_PARAM, char **argv) { - unsigned char dir_flag = 0; - int opt; - - while ((opt = getopt(argc, argv, "qd")) != -1) { - if (opt == 'd') { - dir_flag = 1; - } - else if (opt != 'q') { - bb_show_usage(); - } - } + const char *path; + char *chp; + unsigned opt; + + opt_complementary = "?1"; /* 1 argument max */ + opt = getopt32(argv, "dqtp:", &path); + chp = argv[optind] ? argv[optind] : xstrdup("tmp.XXXXXX"); - if (optind + 1 != argc) { - bb_show_usage(); + if (opt & (4|8)) { /* -t and/or -p */ + const char *dir = getenv("TMPDIR"); + if (dir && *dir != '\0') + path = dir; + else if (!(opt & 8)) /* no -p */ + path = "/tmp/"; + /* else path comes from -p DIR */ + chp = concat_path_file(path, chp); } - if (dir_flag) { - if (mkdtemp(argv[argc-1]) == NULL) { + if (opt & 1) { /* -d */ + if (mkdtemp(chp) == NULL) return EXIT_FAILURE; - } } else { - if (mkstemp(argv[argc-1]) < 0) { + if (mkstemp(chp) < 0) return EXIT_FAILURE; - } } - (void) puts(argv[argc-1]); + puts(chp); return EXIT_SUCCESS; } diff --git a/release/src/router/busybox/debianutils/pipe_progress.c b/release/src/router/busybox/debianutils/pipe_progress.c new file mode 100644 index 00000000..fa98e8b3 --- /dev/null +++ b/release/src/router/busybox/debianutils/pipe_progress.c @@ -0,0 +1,39 @@ +/* vi: set sw=4 ts=4: */ +/* + * Monitor a pipe with a simple progress display. + * + * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + */ + +#include "libbb.h" + +#define PIPE_PROGRESS_SIZE 4096 + +/* Read a block of data from stdin, write it to stdout. + * Activity is indicated by a '.' to stderr + */ +int pipe_progress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int pipe_progress_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) +{ + RESERVE_CONFIG_BUFFER(buf, PIPE_PROGRESS_SIZE); + time_t t = time(NULL); + size_t len; + + while ((len = fread(buf, 1, PIPE_PROGRESS_SIZE, stdin)) > 0) { + time_t new_time = time(NULL); + if (new_time != t) { + t = new_time; + fputc('.', stderr); + } + fwrite(buf, len, 1, stdout); + } + + fputc('\n', stderr); + + if (ENABLE_FEATURE_CLEAN_UP) + RELEASE_CONFIG_BUFFER(buf); + + return 0; +} diff --git a/release/src/router/busybox/debianutils/readlink.c b/release/src/router/busybox/debianutils/readlink.c deleted file mode 100644 index d8d7e8c2..00000000 --- a/release/src/router/busybox/debianutils/readlink.c +++ /dev/null @@ -1,46 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Mini readlink implementation for busybox - * - * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu> - * - * 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 - * 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 - * - */ - -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include "busybox.h" - -int readlink_main(int argc, char **argv) -{ - char *buf = NULL; - - /* no options, no getopt */ - - if (argc != 2) - bb_show_usage(); - - buf = xreadlink(argv[1]); - if (!buf) - return EXIT_FAILURE; - puts(buf); -#ifdef CONFIG_FEATURE_CLEAN_UP - free(buf); -#endif - - return EXIT_SUCCESS; -} diff --git a/release/src/router/busybox/debianutils/run_parts.c b/release/src/router/busybox/debianutils/run_parts.c index 53d33cec..7c38fa11 100644 --- a/release/src/router/busybox/debianutils/run_parts.c +++ b/release/src/router/busybox/debianutils/run_parts.c @@ -2,113 +2,172 @@ /* * Mini run-parts implementation for busybox * + * Copyright (C) 2007 Bernhard Reutner-Fischer * - * Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it> + * Based on a older version that was in busybox which was 1k big.. + * Copyright (C) 2001 by Emanuele Aina <emanuele.aina@tiscali.it> * * Based on the Debian run-parts program, version 1.15 * Copyright (C) 1996 Jeff Noxon <jeff@router.patch.net>, * Copyright (C) 1996-1999 Guy Maor <maor@debian.org> - * * - * 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 - * 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 GPL v2 or later, see file LICENSE in this tarball for details. */ /* This is my first attempt to write a program in C (well, this is my first * attempt to write a program! :-) . */ /* This piece of code is heavily based on the original version of run-parts, - * taken from debian-utils. I've only removed the long options and a the + * taken from debian-utils. I've only removed the long options and a the * report mode. As the original run-parts support only long options, I've - * broken compatibility because the BusyBox policy doesn't allow them. - * The supported options are: - * -t test. Print the name of the files to be executed, without - * execute them. - * -a ARG argument. Pass ARG as an argument the program executed. It can - * be repeated to pass multiple arguments. - * -u MASK umask. Set the umask of the program executed to MASK. */ - -/* TODO - * done - convert calls to error in perror... and remove error() - * done - convert malloc/realloc to their x... counterparts - * done - remove catch_sigchld - * done - use bb's concat_path_file() - * done - declare run_parts_main() as extern and any other function as static? + * broken compatibility because the BusyBox policy doesn't allow them. + * The supported options are: + * -t test. Print the name of the files to be executed, without + * execute them. + * -a ARG argument. Pass ARG as an argument the program executed. It can + * be repeated to pass multiple arguments. + * -u MASK umask. Set the umask of the program executed to MASK. */ -#include <getopt.h> -#include <stdlib.h> - #include "libbb.h" -static const struct option runparts_long_options[] = { - { "test", 0, NULL, 't' }, - { "umask", 1, NULL, 'u' }, - { "arg", 1, NULL, 'a' }, - { 0, 0, 0, 0 } +struct globals { + char **names; + int cur; + char *cmd[1]; +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define names (G.names) +#define cur (G.cur ) +#define cmd (G.cmd ) + +enum { NUM_CMD = (COMMON_BUFSIZE - sizeof(G)) / sizeof(cmd[0]) - 1 }; + +enum { + OPT_r = (1 << 0), + OPT_a = (1 << 1), + OPT_u = (1 << 2), + OPT_t = (1 << 3), + OPT_l = (1 << 4) * ENABLE_FEATURE_RUN_PARTS_FANCY, }; -extern char **environ; +#if ENABLE_FEATURE_RUN_PARTS_FANCY +#define list_mode (option_mask32 & OPT_l) +#else +#define list_mode 0 +#endif -/* run_parts_main */ -/* Process options */ -int run_parts_main(int argc, char **argv) +/* Is this a valid filename (upper/lower alpha, digits, + * underscores, and hyphens only?) + */ +static bool invalid_name(const char *c) { - char **args = xmalloc(2 * sizeof(char *)); - unsigned char test_mode = 0; - unsigned short argcount = 1; - int opt; - - umask(022); - - while ((opt = getopt_long (argc, argv, "tu:a:", - runparts_long_options, NULL)) > 0) - { - switch (opt) { - /* Enable test mode */ - case 't': - test_mode++; - break; - /* Set the umask of the programs executed */ - case 'u': - /* Check and set the umask of the program executed. As stated in the original - * run-parts, the octal conversion in libc is not foolproof; it will take the - * 8 and 9 digits under some circumstances. We'll just have to live with it. - */ - umask(bb_xgetlarg(optarg, 8, 0, 07777)); - break; - /* Pass an argument to the programs */ - case 'a': - /* Add an argument to the commands that we will call. - * Called once for every argument. */ - args = xrealloc(args, (argcount + 2) * (sizeof(char *))); - args[argcount++] = optarg; - break; - default: - bb_show_usage(); - } + c = bb_basename(c); + + while (*c && (isalnum(*c) || *c == '_' || *c == '-')) + c++; + + return *c; /* TRUE (!0) if terminating NUL is not reached */ +} + +static int bb_alphasort(const void *p1, const void *p2) +{ + int r = strcmp(*(char **) p1, *(char **) p2); + return (option_mask32 & OPT_r) ? -r : r; +} + +static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUSED_PARAM, int depth) +{ + if (depth == 1) + return TRUE; + + if (depth == 2 + && ( !(statbuf->st_mode & (S_IFREG | S_IFLNK)) + || invalid_name(file) + || (!list_mode && access(file, X_OK) != 0)) + ) { + return SKIP; } + names = xrealloc_vector(names, 4, cur); + names[cur++] = xstrdup(file); + /*names[cur] = NULL; - xrealloc_vector did it */ + + return TRUE; +} + +#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS +static const char runparts_longopts[] ALIGN1 = + "arg\0" Required_argument "a" + "umask\0" Required_argument "u" + "test\0" No_argument "t" +#if ENABLE_FEATURE_RUN_PARTS_FANCY + "list\0" No_argument "l" + "reverse\0" No_argument "r" +//TODO: "verbose\0" No_argument "v" +#endif + ; +#endif + +int run_parts_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int run_parts_main(int argc UNUSED_PARAM, char **argv) +{ + const char *umask_p = "22"; + llist_t *arg_list = NULL; + unsigned n; + int ret; + +#if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS + applet_long_options = runparts_longopts; +#endif + /* We require exactly one argument: the directory name */ /* We require exactly one argument: the directory name */ - if (optind != (argc - 1)) { - bb_show_usage(); + opt_complementary = "=1:a::"; + getopt32(argv, "ra:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p); + + umask(xstrtou_range(umask_p, 8, 0, 07777)); + + n = 1; + while (arg_list && n < NUM_CMD) { + cmd[n++] = llist_pop(&arg_list); } + /* cmd[n] = NULL; - is already zeroed out */ + + /* run-parts has to sort executables by name before running them */ + + recursive_action(argv[optind], + ACTION_RECURSE|ACTION_FOLLOWLINKS, + act, /* file action */ + act, /* dir action */ + NULL, /* user data */ + 1 /* depth */ + ); - args[0] = argv[optind]; - args[argcount] = 0; + if (!names) + return 0; + + qsort(names, cur, sizeof(char *), bb_alphasort); + + n = 0; + while (1) { + char *name = *names++; + if (!name) + break; + if (option_mask32 & (OPT_t | OPT_l)) { + puts(name); + continue; + } + cmd[0] = name; + ret = wait4pid(spawn(cmd)); + if (ret == 0) + continue; + n = 1; + if (ret < 0) + bb_perror_msg("can't exec %s", name); + else /* ret > 0 */ + bb_error_msg("%s exited with code %d", name, ret); + } - return(run_parts(args, test_mode, environ)); + return n; } diff --git a/release/src/router/busybox/debianutils/start_stop_daemon.c b/release/src/router/busybox/debianutils/start_stop_daemon.c index c31bba6d..ab607bde 100644 --- a/release/src/router/busybox/debianutils/start_stop_daemon.c +++ b/release/src/router/busybox/debianutils/start_stop_daemon.c @@ -3,253 +3,445 @@ * Mini start-stop-daemon implementation(s) for busybox * * Written by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, - * public domain. * Adapted for busybox David Kimdon <dwhedon@gordian.com> + * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> -#include <signal.h> -#include <errno.h> -#include <sys/stat.h> -#include <dirent.h> -#include <unistd.h> -#include <getopt.h> - -#include "busybox.h" -#include "pwd_.h" - -static int start = 0; -static int stop = 0; -static int fork_before_exec = 0; -static int signal_nr = 15; -static int user_id = -1; -static char *userspec = NULL; -static char *cmdname = NULL; -static char *execname = NULL; -static char *startas = NULL; - -typedef struct pid_list { +/* +This is how it is supposed to work: + +start-stop-daemon [OPTIONS] [--start|--stop] [[--] arguments...] + +One (only) of these must be given: + -S,--start Start + -K,--stop Stop + +Search for matching processes. +If --stop is given, stop all matching processes (by sending a signal). +If --start is given, start a new process unless a matching process was found. + +Options controlling process matching +(if multiple conditions are specified, all must match): + -u,--user USERNAME|UID Only consider this user's processes + -n,--name PROCESS_NAME Look for processes by matching PROCESS_NAME + with comm field in /proc/$PID/stat. + Only basename is compared: + "ntpd" == "./ntpd" == "/path/to/ntpd". +[TODO: can PROCESS_NAME be a full pathname? Should we require full match then +with /proc/$PID/exe or argv[0] (comm can't be matched, it never contains path)] + -x,--exec EXECUTABLE Look for processes that were started with this + command in /proc/$PID/cmdline. + Unlike -n, we match against the full path: + "ntpd" != "./ntpd" != "/path/to/ntpd" + -p,--pidfile PID_FILE Look for processes with PID from this file + +Options which are valid for --start only: + -x,--exec EXECUTABLE Program to run (1st arg of execvp). Mandatory. + -a,--startas NAME argv[0] (defaults to EXECUTABLE) + -b,--background Put process into background + -N,--nicelevel N Add N to process' nice level + -c,--chuid USER[:[GRP]] Change to specified user [and group] + -m,--make-pidfile Write PID to the pidfile + (both -m and -p must be given!) + +Options which are valid for --stop only: + -s,--signal SIG Signal to send (default:TERM) + -t,--test Exit with status 0 if process is found + (we don't actually start or stop daemons) + +Misc options: + -o,--oknodo Exit with status 0 if nothing is done + -q,--quiet Quiet + -v,--verbose Verbose +*/ + +#include <sys/resource.h> + +/* Override ENABLE_FEATURE_PIDFILE */ +#define WANT_PIDFILE 1 +#include "libbb.h" + +struct pid_list { struct pid_list *next; - int pid; -} pid_list; - -static pid_list *found = NULL; + pid_t pid; +}; -static inline void -push(int pid) +enum { + CTX_STOP = (1 << 0), + CTX_START = (1 << 1), + OPT_BACKGROUND = (1 << 2), // -b + OPT_QUIET = (1 << 3), // -q + OPT_TEST = (1 << 4), // -t + OPT_MAKEPID = (1 << 5), // -m + OPT_a = (1 << 6), // -a + OPT_n = (1 << 7), // -n + OPT_s = (1 << 8), // -s + OPT_u = (1 << 9), // -u + OPT_c = (1 << 10), // -c + OPT_x = (1 << 11), // -x + OPT_p = (1 << 12), // -p + OPT_OKNODO = (1 << 13) * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -o + OPT_VERBOSE = (1 << 14) * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -v + OPT_NICELEVEL = (1 << 15) * ENABLE_FEATURE_START_STOP_DAEMON_FANCY, // -N +}; +#define QUIET (option_mask32 & OPT_QUIET) +#define TEST (option_mask32 & OPT_TEST) + +struct globals { + struct pid_list *found; + char *userspec; + char *cmdname; + char *execname; + char *pidfile; + int user_id; + smallint signal_nr; +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define found (G.found ) +#define userspec (G.userspec ) +#define cmdname (G.cmdname ) +#define execname (G.execname ) +#define pidfile (G.pidfile ) +#define user_id (G.user_id ) +#define signal_nr (G.signal_nr ) +#define INIT_G() do { \ + user_id = -1; \ + signal_nr = 15; \ +} while (0) + +#ifdef OLDER_VERSION_OF_X +/* -x,--exec EXECUTABLE + * Look for processes with matching /proc/$PID/exe. + * Match is performed using device+inode. + */ +static int pid_is_exec(pid_t pid) { - pid_list *p; + struct stat st; + char buf[sizeof("/proc//exe") + sizeof(int)*3]; - p = xmalloc(sizeof(*p)); - p->next = found; - p->pid = pid; - found = p; + sprintf(buf, "/proc/%u/exe", (unsigned)pid); + if (stat(buf, &st) < 0) + return 0; + if (st.st_dev == execstat.st_dev + && st.st_ino == execstat.st_ino) + return 1; + return 0; } +#endif -static int -pid_is_exec(int pid, const char *exec) +static int pid_is_exec(pid_t pid) { + ssize_t bytes; char buf[PATH_MAX]; - FILE *fp; - sprintf(buf, "/proc/%d/cmdline", pid); - fp = fopen(buf, "r"); - if (fp && fgets (buf, sizeof (buf), fp) ) { - fclose(fp); - if (strncmp (buf, exec, strlen(exec)) == 0) - return 1; + sprintf(buf, "/proc/%u/cmdline", (unsigned)pid); + bytes = open_read_close(buf, buf, sizeof(buf) - 1); + if (bytes > 0) { + buf[bytes] = '\0'; + return strcmp(buf, execname) == 0; } return 0; } - -static int -pid_is_user(int pid, int uid) +static int pid_is_name(pid_t pid) { - struct stat sb; - char buf[32]; + /* /proc/PID/stat is "PID (comm_15_bytes_max) ..." */ + char buf[32]; /* should be enough */ + char *p, *pe; - sprintf(buf, "/proc/%d", pid); - if (stat(buf, &sb) != 0) + sprintf(buf, "/proc/%u/stat", (unsigned)pid); + if (open_read_close(buf, buf, sizeof(buf) - 1) < 0) + return 0; + buf[sizeof(buf) - 1] = '\0'; /* paranoia */ + p = strchr(buf, '('); + if (!p) + return 0; + pe = strrchr(++p, ')'); + if (!pe) + return 0; + *pe = '\0'; + /* we require comm to match and to not be truncated */ + /* in Linux, if comm is 15 chars, it may be a truncated + * name, so we don't allow that to match */ + if (strlen(p) >= COMM_LEN - 1) /* COMM_LEN is 16 */ return 0; - return (sb.st_uid == uid); + return strcmp(p, cmdname) == 0; } - -static int -pid_is_cmd(int pid, const char *name) +static int pid_is_user(int pid) { - char buf[32]; - FILE *f; - int c; + struct stat sb; + char buf[sizeof("/proc/") + sizeof(int)*3]; - sprintf(buf, "/proc/%d/stat", pid); - f = fopen(buf, "r"); - if (!f) - return 0; - while ((c = getc(f)) != EOF && c != '(') - ; - if (c != '(') { - fclose(f); + sprintf(buf, "/proc/%u", (unsigned)pid); + if (stat(buf, &sb) != 0) return 0; - } - /* this hopefully handles command names containing ')' */ - while ((c = getc(f)) != EOF && c == *name) - name++; - fclose(f); - return (c == ')' && *name == '\0'); + return (sb.st_uid == (uid_t)user_id); } - -static void -check(int pid) +static void check(int pid) { - if (execname && !pid_is_exec(pid, execname)) { + struct pid_list *p; + + if (execname && !pid_is_exec(pid)) { return; } - if (userspec && !pid_is_user(pid, user_id)) { + if (cmdname && !pid_is_name(pid)) { return; } - if (cmdname && !pid_is_cmd(pid, cmdname)) { + if (userspec && !pid_is_user(pid)) { return; } - push(pid); + p = xmalloc(sizeof(*p)); + p->next = found; + p->pid = pid; + found = p; } +static void do_pidfile(void) +{ + FILE *f; + unsigned pid; + f = fopen_for_read(pidfile); + if (f) { + if (fscanf(f, "%u", &pid) == 1) + check(pid); + fclose(f); + } else if (errno != ENOENT) + bb_perror_msg_and_die("open pidfile %s", pidfile); +} -static void -do_procfs(void) +static void do_procinit(void) { DIR *procdir; struct dirent *entry; - int foundany, pid; + int pid; + + if (pidfile) { + do_pidfile(); + return; + } - procdir = opendir("/proc"); - if (!procdir) - bb_perror_msg_and_die ("opendir /proc"); + procdir = xopendir("/proc"); - foundany = 0; - while ((entry = readdir(procdir)) != NULL) { - if (sscanf(entry->d_name, "%d", &pid) != 1) + pid = 0; + while (1) { + errno = 0; /* clear any previous error */ + entry = readdir(procdir); +// TODO: this check is too generic, it's better +// to check for exact errno(s) which mean that we got stale entry + if (errno) /* Stale entry, process has died after opendir */ + continue; + if (!entry) /* EOF, no more entries */ + break; + pid = bb_strtou(entry->d_name, NULL, 10); + if (errno) /* NaN */ continue; - foundany++; check(pid); } closedir(procdir); - if (!foundany) - bb_error_msg_and_die ("nothing in /proc - not mounted?"); + if (!pid) + bb_error_msg_and_die("nothing in /proc - not mounted?"); } - -static void -do_stop(void) +static int do_stop(void) { - char what[1024]; - pid_list *p; + char *what; + struct pid_list *p; int killed = 0; - if (cmdname) - strcpy(what, cmdname); - else if (execname) - strcpy(what, execname); - else if (userspec) - sprintf(what, "process(es) owned by `%s'", userspec); - else - bb_error_msg_and_die ("internal error, please report"); + if (cmdname) { + if (ENABLE_FEATURE_CLEAN_UP) what = xstrdup(cmdname); + if (!ENABLE_FEATURE_CLEAN_UP) what = cmdname; + } else if (execname) { + if (ENABLE_FEATURE_CLEAN_UP) what = xstrdup(execname); + if (!ENABLE_FEATURE_CLEAN_UP) what = execname; + } else if (pidfile) { + what = xasprintf("process in pidfile '%s'", pidfile); + } else if (userspec) { + what = xasprintf("process(es) owned by '%s'", userspec); + } else { + bb_error_msg_and_die("internal error, please report"); + } if (!found) { - printf("no %s found; none killed.\n", what); - return; + if (!QUIET) + printf("no %s found; none killed\n", what); + killed = -1; + goto ret; } for (p = found; p; p = p->next) { - if (kill(p->pid, signal_nr) == 0) { - p->pid = -p->pid; + if (TEST || kill(p->pid, signal_nr) == 0) { killed++; } else { - bb_perror_msg("warning: failed to kill %d:", p->pid); + p->pid = 0; + bb_perror_msg("warning: killing process %u", (unsigned)p->pid); } } - if (killed) { + if (!QUIET && killed) { printf("stopped %s (pid", what); for (p = found; p; p = p->next) - if(p->pid < 0) - printf(" %d", -p->pid); - printf(").\n"); + if (p->pid) + printf(" %u", (unsigned)p->pid); + puts(")"); } + ret: + if (ENABLE_FEATURE_CLEAN_UP) + free(what); + return killed; } - -static const struct option ssd_long_options[] = { - { "stop", 0, NULL, 'K' }, - { "start", 0, NULL, 'S' }, - { "background", 0, NULL, 'b' }, - { "startas", 1, NULL, 'a' }, - { "name", 1, NULL, 'n' }, - { "signal", 1, NULL, 's' }, - { "user", 1, NULL, 'u' }, - { "exec", 1, NULL, 'x' }, - { 0, 0, 0, 0 } -}; - -int -start_stop_daemon_main(int argc, char **argv) +#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS +static const char start_stop_daemon_longopts[] ALIGN1 = + "stop\0" No_argument "K" + "start\0" No_argument "S" + "background\0" No_argument "b" + "quiet\0" No_argument "q" + "test\0" No_argument "t" + "make-pidfile\0" No_argument "m" +#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY + "oknodo\0" No_argument "o" + "verbose\0" No_argument "v" + "nicelevel\0" Required_argument "N" +#endif + "startas\0" Required_argument "a" + "name\0" Required_argument "n" + "signal\0" Required_argument "s" + "user\0" Required_argument "u" + "chuid\0" Required_argument "c" + "exec\0" Required_argument "x" + "pidfile\0" Required_argument "p" +#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY + "retry\0" Required_argument "R" +#endif + ; +#endif + +int start_stop_daemon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv) { - int flags; - char *signame = NULL; - bb_applet_long_options = ssd_long_options; - - flags = bb_getopt_ulflags(argc, argv, "KSba:n:s:u:x:", - &startas, &cmdname, &signame, &userspec, &execname); - - /* Be sneaky and avoid branching */ - stop = (flags & 1); - start = (flags & 2); - fork_before_exec = (flags & 4); - - if (signame) { - signal_nr = bb_xgetlarg(signame, 10, 0, NSIG); + unsigned opt; + char *signame; + char *startas; + char *chuid; +#ifdef OLDER_VERSION_OF_X + struct stat execstat; +#endif +#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY +// char *retry_arg = NULL; +// int retries = -1; + char *opt_N; +#endif + + INIT_G(); + +#if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS + applet_long_options = start_stop_daemon_longopts; +#endif + + /* -K or -S is required; they are mutually exclusive */ + /* -p is required if -m is given */ + /* -xpun (at least one) is required if -K is given */ + /* -xa (at least one) is required if -S is given */ + /* -q turns off -v */ + opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa" + USE_FEATURE_START_STOP_DAEMON_FANCY("q-v"); + opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:" + USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"), + &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile + USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N) + /* We accept and ignore -R <param> / --retry <param> */ + USE_FEATURE_START_STOP_DAEMON_FANCY(,NULL) + ); + + if (opt & OPT_s) { + signal_nr = get_signum(signame); + if (signal_nr < 0) bb_show_usage(); } - if (start == stop) - bb_error_msg_and_die ("need exactly one of -S or -K"); - - if (!execname && !userspec) - bb_error_msg_and_die ("need at least one of -x or -u"); - - if (!startas) + if (!(opt & OPT_a)) startas = execname; - - if (start && !startas) - bb_error_msg_and_die ("-S needs -x or -a"); - - argc -= optind; + if (!execname) /* in case -a is given and -x is not */ + execname = startas; + +// USE_FEATURE_START_STOP_DAEMON_FANCY( +// if (retry_arg) +// retries = xatoi_u(retry_arg); +// ) + //argc -= optind; argv += optind; - if (userspec && sscanf(userspec, "%d", &user_id) != 1) - user_id = my_getpwnam(userspec); - - do_procfs(); + if (userspec) { + user_id = bb_strtou(userspec, NULL, 10); + if (errno) + user_id = xuname2uid(userspec); + } + /* Both start and stop need to know current processes */ + do_procinit(); - if (stop) { - do_stop(); - return EXIT_SUCCESS; + if (opt & CTX_STOP) { + int i = do_stop(); + return (opt & OPT_OKNODO) ? 0 : (i <= 0); } if (found) { - printf("%s already running.\n%d\n", execname ,found->pid); - return EXIT_SUCCESS; + if (!QUIET) + printf("%s is already running\n%u\n", execname, (unsigned)found->pid); + return !(opt & OPT_OKNODO); } + +#ifdef OLDER_VERSION_OF_X + if (execname) + xstat(execname, &execstat); +#endif + *--argv = startas; - if (fork_before_exec) { - if (daemon(0, 0) == -1) - bb_perror_msg_and_die ("unable to fork"); + if (opt & OPT_BACKGROUND) { +#if BB_MMU + bb_daemonize(DAEMON_DEVNULL_STDIO + DAEMON_CLOSE_EXTRA_FDS); + /* DAEMON_DEVNULL_STDIO is superfluous - + * it's always done by bb_daemonize() */ +#else + pid_t pid = vfork(); + if (pid < 0) /* error */ + bb_perror_msg_and_die("vfork"); + if (pid != 0) { + /* parent */ + /* why _exit? the child may have changed the stack, + * so "return 0" may do bad things */ + _exit(EXIT_SUCCESS); + } + /* Child */ + setsid(); /* detach from controlling tty */ + /* Redirect stdio to /dev/null, close extra FDs. + * We do not actually daemonize because of DAEMON_ONLY_SANITIZE */ + bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO + + DAEMON_CLOSE_EXTRA_FDS + + DAEMON_ONLY_SANITIZE, + NULL /* argv, unused */ ); +#endif + } + if (opt & OPT_MAKEPID) { + /* User wants _us_ to make the pidfile */ + write_pidfile(pidfile); } - setsid(); - execv(startas, argv); - bb_perror_msg_and_die ("unable to start %s", startas); + if (opt & OPT_c) { + struct bb_uidgid_t ugid = { -1, -1 }; + parse_chown_usergroup_or_die(&ugid, chuid); + if (ugid.gid != (gid_t) -1) xsetgid(ugid.gid); + if (ugid.uid != (uid_t) -1) xsetuid(ugid.uid); + } +#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY + if (opt & OPT_NICELEVEL) { + /* Set process priority */ + int prio = getpriority(PRIO_PROCESS, 0) + xatoi_range(opt_N, INT_MIN/2, INT_MAX/2); + if (setpriority(PRIO_PROCESS, 0, prio) < 0) { + bb_perror_msg_and_die("setpriority(%d)", prio); + } + } +#endif + execvp(startas, argv); + bb_perror_msg_and_die("cannot start %s", startas); } - diff --git a/release/src/router/busybox/debianutils/which.c b/release/src/router/busybox/debianutils/which.c index 79a89c4e..748e6dc2 100644 --- a/release/src/router/busybox/debianutils/which.c +++ b/release/src/router/busybox/debianutils/which.c @@ -2,79 +2,89 @@ /* * Which implementation for busybox * - * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> + * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu> * - * 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 - * 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 the GPL v2 or later, see the file LICENSE in this tarball. * + * Based on which from debianutils */ -/* getopt not needed */ -#include <string.h> -#include <stdio.h> -#include <stdlib.h> -#include "busybox.h" +#include "libbb.h" -extern int which_main(int argc, char **argv) +int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int which_main(int argc UNUSED_PARAM, char **argv) { - char *path_list, *path_n; - struct stat filestat; - int i, count=1, found, status = EXIT_SUCCESS; + USE_DESKTOP(int opt;) + int status = EXIT_SUCCESS; + char *path; + char *p; - if (argc <= 1 || **(argv + 1) == '-') - bb_show_usage(); - argc--; + opt_complementary = "-1"; /* at least one argument */ + USE_DESKTOP(opt =) getopt32(argv, "a"); + argv += optind; - path_list = getenv("PATH"); - if (path_list != NULL) { - for(i=strlen(path_list); i > 0; i--) - if (path_list[i]==':') { - path_list[i]=0; - count++; - } - } else { - path_list = "/bin\0/sbin\0/usr/bin\0/usr/sbin\0/usr/local/bin"; - count = 5; + /* This matches what is seen on e.g. ubuntu. + * "which" there is a shell script. */ + path = getenv("PATH"); + if (!path) { + path = (char*)bb_PATH_root_path; + putenv(path); + path += 5; /* skip "PATH=" */ } - while(argc-- > 0) { - path_n = path_list; - argv++; - found = 0; - for (i = 0; i < count; i++) { - char *buf; - buf = concat_path_file(path_n, *argv); - if (stat (buf, &filestat) == 0 - && filestat.st_mode & S_IXUSR) - { - puts(buf); - found = 1; - break; + do { +#if ENABLE_DESKTOP +/* Much bloat just to support -a */ + if (strchr(*argv, '/')) { + if (execable_file(*argv)) { + puts(*argv); + continue; } - free(buf); - path_n += (strlen(path_n) + 1); - } - if (!found) status = EXIT_FAILURE; - } - return status; -} + } else { + char *path2 = xstrdup(path); + char *tmp = path2; -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ + p = find_execable(*argv, &tmp); + if (!p) + status = EXIT_FAILURE; + else { + print: + puts(p); + free(p); + if (opt) { + /* -a: show matches in all PATH components */ + if (tmp) { + p = find_execable(*argv, &tmp); + if (p) + goto print; + } + } + } + free(path2); + } +#else +/* Just ignoring -a */ + if (strchr(*argv, '/')) { + if (execable_file(*argv)) { + puts(*argv); + continue; + } + } else { + char *path2 = xstrdup(path); + char *tmp = path2; + p = find_execable(*argv, &tmp); + free(path2); + if (p) { + puts(p); + free(p); + continue; + } + } + status = EXIT_FAILURE; +#endif + } while (*(++argv) != NULL); + + fflush_stdout_and_exit(status); +} |