diff options
author | Eric Andersen <andersen@codepoet.org> | 2002-11-07 02:09:37 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2002-11-07 02:09:37 +0000 |
commit | ef5e8f8de04af2f87a77738bfbad2ac1e58605d9 (patch) | |
tree | 5a406cd39982e815c69cdbeb1c739c774cb13d62 | |
parent | f9496d4e44f41b0964ec82377ab0a688ff0d06df (diff) | |
download | busybox-w32-ef5e8f8de04af2f87a77738bfbad2ac1e58605d9.tar.gz busybox-w32-ef5e8f8de04af2f87a77738bfbad2ac1e58605d9.tar.bz2 busybox-w32-ef5e8f8de04af2f87a77738bfbad2ac1e58605d9.zip |
Implement a small strings applet
-rw-r--r-- | include/applets.h | 3 | ||||
-rw-r--r-- | include/usage.h | 9 | ||||
-rw-r--r-- | miscutils/Makefile.in | 1 | ||||
-rw-r--r-- | miscutils/config.in | 1 | ||||
-rw-r--r-- | miscutils/strings.c | 142 |
5 files changed, 156 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h index 1660b11c5..e41a48996 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -440,6 +440,9 @@ | |||
440 | #ifdef CONFIG_START_STOP_DAEMON | 440 | #ifdef CONFIG_START_STOP_DAEMON |
441 | APPLET_ODDNAME("start-stop-daemon", start_stop_daemon_main, _BB_DIR_SBIN, _BB_SUID_NEVER, start_stop_daemon) | 441 | APPLET_ODDNAME("start-stop-daemon", start_stop_daemon_main, _BB_DIR_SBIN, _BB_SUID_NEVER, start_stop_daemon) |
442 | #endif | 442 | #endif |
443 | #ifdef CONFIG_STRINGS | ||
444 | APPLET(strings, strings_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) | ||
445 | #endif | ||
443 | #ifdef CONFIG_STTY | 446 | #ifdef CONFIG_STTY |
444 | APPLET(stty, stty_main, _BB_DIR_BIN, _BB_SUID_NEVER) | 447 | APPLET(stty, stty_main, _BB_DIR_BIN, _BB_SUID_NEVER) |
445 | #endif | 448 | #endif |
diff --git a/include/usage.h b/include/usage.h index b66d96402..b49f3869b 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1681,6 +1681,15 @@ | |||
1681 | "-s <signal>\t\tsignal to send (default 15)\n"\ | 1681 | "-s <signal>\t\tsignal to send (default 15)\n"\ |
1682 | "-a <pathname>\t\tprogram to start (default <executable>)\n" | 1682 | "-a <pathname>\t\tprogram to start (default <executable>)\n" |
1683 | 1683 | ||
1684 | #define strings_trivial_usage \ | ||
1685 | "[-afo] [-n length] [file ... ]" | ||
1686 | #define strings_full_usage \ | ||
1687 | "Display printable strings in a binary file." \ | ||
1688 | "\n\nOptions:" \ | ||
1689 | "\n\t-f\tPrecede each string with the name of the file where it was found." \ | ||
1690 | "\n\t-n N\tSpecifies that at least N characters forms a sequence (default 4)" \ | ||
1691 | "\n\t-o\tEach string is preceded by its decimal offset in the file." | ||
1692 | |||
1684 | #define stty_trivial_usage \ | 1693 | #define stty_trivial_usage \ |
1685 | "[-a|g] [-F DEVICE] [SETTING]..." | 1694 | "[-a|g] [-F DEVICE] [SETTING]..." |
1686 | #define stty_full_usage \ | 1695 | #define stty_full_usage \ |
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in index a5e12e7ee..72292b69d 100644 --- a/miscutils/Makefile.in +++ b/miscutils/Makefile.in | |||
@@ -33,6 +33,7 @@ MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o | |||
33 | MISCUTILS-$(CONFIG_MKTEMP) += mktemp.o | 33 | MISCUTILS-$(CONFIG_MKTEMP) += mktemp.o |
34 | MISCUTILS-$(CONFIG_MT) += mt.o | 34 | MISCUTILS-$(CONFIG_MT) += mt.o |
35 | MISCUTILS-$(CONFIG_READLINK) += readlink.o | 35 | MISCUTILS-$(CONFIG_READLINK) += readlink.o |
36 | MISCUTILS-$(CONFIG_STRINGS) += strings.o | ||
36 | MISCUTILS-$(CONFIG_TIME) += time.o | 37 | MISCUTILS-$(CONFIG_TIME) += time.o |
37 | MISCUTILS-$(CONFIG_UPDATE) += update.o | 38 | MISCUTILS-$(CONFIG_UPDATE) += update.o |
38 | MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o | 39 | MISCUTILS-$(CONFIG_WATCHDOG) += watchdog.o |
diff --git a/miscutils/config.in b/miscutils/config.in index 1d2751444..3dc5e2c8b 100644 --- a/miscutils/config.in +++ b/miscutils/config.in | |||
@@ -15,6 +15,7 @@ bool 'makedevs' CONFIG_MAKEDEVS | |||
15 | bool 'mktemp' CONFIG_MKTEMP | 15 | bool 'mktemp' CONFIG_MKTEMP |
16 | bool 'mt' CONFIG_MT | 16 | bool 'mt' CONFIG_MT |
17 | bool 'readlink' CONFIG_READLINK | 17 | bool 'readlink' CONFIG_READLINK |
18 | bool 'strings' CONFIG_STRINGS | ||
18 | bool 'time' CONFIG_TIME | 19 | bool 'time' CONFIG_TIME |
19 | bool 'update' CONFIG_UPDATE | 20 | bool 'update' CONFIG_UPDATE |
20 | bool 'watchdog' CONFIG_WATCHDOG | 21 | bool 'watchdog' CONFIG_WATCHDOG |
diff --git a/miscutils/strings.c b/miscutils/strings.c new file mode 100644 index 000000000..043d6b8c1 --- /dev/null +++ b/miscutils/strings.c | |||
@@ -0,0 +1,142 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * strings implementation for busybox | ||
4 | * | ||
5 | * Copyright (c) 1980, 1987 | ||
6 | * The Regents of the University of California. All rights reserved. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
16 | * General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | * | ||
22 | * Original copyright notice is retained at the end of this file. | ||
23 | * | ||
24 | * Modified for BusyBox by Erik Andersen <andersee@debian.org> | ||
25 | */ | ||
26 | |||
27 | #include <stdio.h> | ||
28 | #include <stdlib.h> | ||
29 | #include <string.h> | ||
30 | #include <getopt.h> | ||
31 | #include <unistd.h> | ||
32 | #include <ctype.h> | ||
33 | #include "busybox.h" | ||
34 | |||
35 | #define ISSTR(ch) (isprint(ch) || ch == '\t') | ||
36 | |||
37 | int strings_main(int argc, char **argv) | ||
38 | { | ||
39 | extern char *optarg; | ||
40 | extern int optind; | ||
41 | int ch, cnt; | ||
42 | int exitcode; | ||
43 | int oflg, fflg; | ||
44 | char *file; | ||
45 | size_t foff, minlen; | ||
46 | unsigned char *bfr, *C; | ||
47 | |||
48 | |||
49 | exitcode = fflg = oflg = 0; | ||
50 | minlen = -1; | ||
51 | while ((ch = getopt(argc, argv, "an:of")) > 0) | ||
52 | switch(ch) { | ||
53 | case '-': | ||
54 | break; | ||
55 | case 'f': | ||
56 | fflg = 1; | ||
57 | break; | ||
58 | case 'n': | ||
59 | minlen = atoi(optarg); | ||
60 | break; | ||
61 | case 'o': | ||
62 | oflg = 1; | ||
63 | break; | ||
64 | default: | ||
65 | show_usage(); | ||
66 | } | ||
67 | argc -= optind; | ||
68 | argv += optind; | ||
69 | |||
70 | if (minlen == -1) | ||
71 | minlen = 4; | ||
72 | |||
73 | bfr = xmalloc(minlen); | ||
74 | bfr[minlen] = '\0'; | ||
75 | file = "stdin"; | ||
76 | do { | ||
77 | if (*argv) { | ||
78 | fprintf(stderr, "opening '%s'\n", *argv); | ||
79 | file = *argv++; | ||
80 | if (!freopen(file, "r", stdin)) { | ||
81 | perror_msg("%s", file); | ||
82 | exitcode = EXIT_FAILURE; | ||
83 | continue; | ||
84 | } | ||
85 | } | ||
86 | foff = 0; | ||
87 | |||
88 | for (cnt = 0; (ch = getchar()) != EOF;) { | ||
89 | if (ISSTR(ch)) { | ||
90 | if (!cnt) | ||
91 | C = bfr; | ||
92 | *C++ = ch; | ||
93 | if (++cnt < minlen) | ||
94 | continue; | ||
95 | if (fflg) | ||
96 | printf("%s:", file); | ||
97 | if (oflg) | ||
98 | printf("%07ld %s", (long)(foff - minlen), (char *)bfr); | ||
99 | else | ||
100 | printf("%s", bfr); | ||
101 | while ((ch = getchar()) != EOF && ISSTR(ch)) | ||
102 | putchar((char)ch); | ||
103 | putchar('\n'); | ||
104 | } | ||
105 | cnt = 0; | ||
106 | } | ||
107 | } while (*argv); | ||
108 | exit(exitcode); | ||
109 | } | ||
110 | |||
111 | /* | ||
112 | * Copyright (c) 1980, 1987 | ||
113 | * The Regents of the University of California. All rights reserved. | ||
114 | * | ||
115 | * Redistribution and use in source and binary forms, with or without | ||
116 | * modification, are permitted provided that the following conditions | ||
117 | * are met: | ||
118 | * 1. Redistributions of source code must retain the above copyright | ||
119 | * notice, this list of conditions and the following disclaimer. | ||
120 | * 2. Redistributions in binary form must reproduce the above copyright | ||
121 | * notice, this list of conditions and the following disclaimer in the | ||
122 | * documentation and/or other materials provided with the distribution. | ||
123 | * | ||
124 | * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change | ||
125 | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> | ||
126 | * | ||
127 | * 4. Neither the name of the University nor the names of its contributors | ||
128 | * may be used to endorse or promote products derived from this software | ||
129 | * without specific prior written permission. | ||
130 | * | ||
131 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
132 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
133 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
134 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
135 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
136 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
137 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
138 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
139 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
140 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
141 | * SUCH DAMAGE. | ||
142 | */ | ||