aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-02-26 10:01:18 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-02-26 10:01:18 +0100
commit26ffe81188a5555824bc86b1953517f7ba4524a9 (patch)
tree79b05ca36349747f5bf5eee0cfcf87a29db5f233 /libbb
parentfd686a262fa34b71900b010b4b31d7e2e3f3385c (diff)
downloadbusybox-w32-26ffe81188a5555824bc86b1953517f7ba4524a9.tar.gz
busybox-w32-26ffe81188a5555824bc86b1953517f7ba4524a9.tar.bz2
busybox-w32-26ffe81188a5555824bc86b1953517f7ba4524a9.zip
su: move restricted_shell into su.c (the only user)
function old new delta su_main 448 468 +20 buffer_fill_and_print 179 196 +17 scriptreplay_main 205 208 +3 localcmd 275 277 +2 hash_find 233 234 +1 devmem_main 469 463 -6 install_main 724 716 -8 setusershell 11 - -11 find_pair 187 169 -18 restricted_shell 49 - -49 ------------------------------------------------------------------------------ (add/remove: 0/3 grow/shrink: 5/3 up/down: 43/-92) Total: -49 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Kbuild1
-rw-r--r--libbb/restricted_shell.c46
2 files changed, 0 insertions, 47 deletions
diff --git a/libbb/Kbuild b/libbb/Kbuild
index c205ceb4c..49cf4b8ad 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -84,7 +84,6 @@ lib-y += read.o
84lib-y += read_key.o 84lib-y += read_key.o
85lib-y += recursive_action.o 85lib-y += recursive_action.o
86lib-y += remove_file.o 86lib-y += remove_file.o
87lib-y += restricted_shell.o
88lib-y += run_shell.o 87lib-y += run_shell.o
89lib-y += safe_gethostname.o 88lib-y += safe_gethostname.o
90lib-y += safe_poll.o 89lib-y += safe_poll.o
diff --git a/libbb/restricted_shell.c b/libbb/restricted_shell.c
deleted file mode 100644
index 2a5073f03..000000000
--- a/libbb/restricted_shell.c
+++ /dev/null
@@ -1,46 +0,0 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Copyright 1989 - 1991, Julianne Frances Haugh <jockgrrl@austin.rr.com>
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 * 3. Neither the name of Julianne F. Haugh nor the names of its contributors
15 * may be used to endorse or promote products derived from this software
16 * without specific prior written permission.
17 *
18 * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
19 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21 * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
28 * SUCH DAMAGE.
29 */
30
31#include "libbb.h"
32
33/* Return 1 if SHELL is a restricted shell (one not returned by
34 getusershell), else 0, meaning it is a standard shell. */
35int FAST_FUNC restricted_shell(const char *shell)
36{
37 char *line;
38
39 setusershell();
40 while ((line = getusershell())) {
41 if (*line != '#' && strcmp(line, shell) == 0)
42 return 0;
43 }
44 endusershell();
45 return 1;
46}