lsscsi: new applet

[oweals/busybox.git] / miscutils / strings.c

diff --git a/miscutils/strings.c b/miscutils/strings.c
index 3e02b53afd9ec3d1f2f4d8fe3cc619ecaf00db54..4d9bfe6901cd96f15db6daacd37b36ea10cb37b7 100644 (file)
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -2,31 +2,56 @@
 /*
  * strings implementation for busybox
  *
- * Copyright Tito Ragusa <farmatito@tiscali.it>
+ * Copyright 2003 Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config STRINGS
+//config:      bool "strings"
+//config:      default y
+//config:      help
+//config:        strings prints the printable character sequences for each file
+//config:        specified.
+
+//applet:IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_STRINGS) += strings.o
+
+//usage:#define strings_trivial_usage
+//usage:       "[-fo] [-t o/d/x] [-n LEN] [FILE]..."
+//usage:#define strings_full_usage "\n\n"
+//usage:       "Display printable strings in a binary file\n"
+//We usually don't bother user with "nop" options. They work, but are not shown:
+////usage:     "\n     -a              Scan whole file (default)"
+//unimplemented alternative is -d: Only strings from initialized, loaded data sections
+//usage:     "\n       -f              Precede strings with filenames"
+//usage:     "\n       -o              Precede strings with octal offsets"
+//usage:     "\n       -t o/d/x        Precede strings with offsets in base 8/10/16"
+//usage:     "\n       -n LEN          At least LEN characters form a string (default 4)"
 
 #include "libbb.h"
 
-#define WHOLE_FILE             1
-#define PRINT_NAME             2
-#define PRINT_OFFSET   4
-#define SIZE                   8
+#define WHOLE_FILE    1
+#define PRINT_NAME    2
+#define PRINT_OFFSET  4
+#define SIZE          8
+#define PRINT_RADIX  16
 
 int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int strings_main(int argc UNUSED_PARAM, char **argv)
 {
        int n, c, status = EXIT_SUCCESS;
-       unsigned opt;
        unsigned count;
        off_t offset;
        FILE *file;
        char *string;
        const char *fmt = "%s: ";
        const char *n_arg = "4";
+       /* default for -o */
+       const char *radix = "o";
+       char *radix_fmt;
 
-       opt = getopt32(argv, "afon:", &n_arg);
+       getopt32(argv, "afon:t:", &n_arg, &radix);
        /* -a is our default behaviour */
        /*argc -= optind;*/
        argv += optind;
@@ -35,6 +60,11 @@ int strings_main(int argc UNUSED_PARAM, char **argv)
        string = xzalloc(n + 1);
        n--;
 
+       if ((radix[0] != 'd' && radix[0] != 'o' && radix[0] != 'x') || radix[1] != 0)
+               bb_show_usage();
+
+       radix_fmt = xasprintf("%%7"OFF_FMT"%s ", radix);
+
        if (!*argv) {
                fmt = "{%s}: ";
                *--argv = (char *)bb_msg_standard_input;
@@ -50,17 +80,17 @@ int strings_main(int argc UNUSED_PARAM, char **argv)
                count = 0;
                do {
                        c = fgetc(file);
-                       if (isprint(c) || c == '\t') {
+                       if (isprint_asciionly(c) || c == '\t') {
                                if (count > n) {
                                        bb_putchar(c);
                                } else {
                                        string[count] = c;
                                        if (count == n) {
-                                               if (opt & PRINT_NAME) {
+                                               if (option_mask32 & PRINT_NAME) {
                                                        printf(fmt, *argv);
                                                }
-                                               if (opt & PRINT_OFFSET) {
-                                                       printf("%7"OFF_FMT"o ", offset - n);
+                                               if (option_mask32 & (PRINT_OFFSET | PRINT_RADIX)) {
+                                                       printf(radix_fmt, offset - n);
                                                }
                                                fputs(string, stdout);
                                        }
@@ -77,8 +107,10 @@ int strings_main(int argc UNUSED_PARAM, char **argv)
                fclose_if_not_stdin(file);
        } while (*++argv);
 
-       if (ENABLE_FEATURE_CLEAN_UP)
+       if (ENABLE_FEATURE_CLEAN_UP) {
                free(string);
+               free(radix_fmt);
+       }
 
        fflush_stdout_and_exit(status);
 }