From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/miscutils/strings.c | 197 ++++++++----------------- 1 file changed, 60 insertions(+), 137 deletions(-) (limited to 'release/src/router/busybox/miscutils/strings.c') diff --git a/release/src/router/busybox/miscutils/strings.c b/release/src/router/busybox/miscutils/strings.c index c914338d..fea9edbe 100644 --- a/release/src/router/busybox/miscutils/strings.c +++ b/release/src/router/busybox/miscutils/strings.c @@ -2,159 +2,82 @@ /* * strings implementation for busybox * - * Copyright (c) 1980, 1987 - * The Regents of the University of California. All rights reserved. + * Copyright 2003 Tito Ragusa * - * 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 - * - * Original copyright notice is retained at the end of this file. - * - * Modified for BusyBox by Erik Andersen - * Badly hacked by Tito Ragusa + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ -#include -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -#define ISSTR(ch) (isprint(ch) || ch == '\t') +#define WHOLE_FILE 1 +#define PRINT_NAME 2 +#define PRINT_OFFSET 4 +#define SIZE 8 -int strings_main(int argc, char **argv) +int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int strings_main(int argc UNUSED_PARAM, char **argv) { - int n=4, c, i, opt=0, a=0, status=EXIT_SUCCESS; - long t=0, count; + int n, c, status = EXIT_SUCCESS; + unsigned count; + off_t offset; FILE *file; - char *string=NULL; - - while ((i = getopt(argc, argv, "afon:")) > 0) - switch(i) - { - case 'a': - break; - case 'f': - opt+=1; - break; - case 'o': - opt+=2; - break; - case 'n': - n = bb_xgetlarg(optarg, 10, 1, INT_MAX); - break; - default: - bb_show_usage(); - } + char *string; + const char *fmt = "%s: "; + const char *n_arg = "4"; - argc -= optind; + getopt32(argv, "afon:", &n_arg); + /* -a is our default behaviour */ + /*argc -= optind;*/ argv += optind; - i=0; - - string=xmalloc(n+1); - string[n]='\0'; - n-=1; + n = xatou_range(n_arg, 1, INT_MAX); + string = xzalloc(n + 1); + n--; - if(!argc ) - { - file = stdin; - goto pipe; + if (!*argv) { + fmt = "{%s}: "; + *--argv = (char *)bb_msg_standard_input; } - for(a=0;a= 2 ) - printf("%7lo ", t); - printf("%s", string); + do { + file = fopen_or_warn_stdin(*argv); + if (!file) { + status = EXIT_FAILURE; + continue; + } + offset = 0; + count = 0; + do { + c = fgetc(file); + if (isprint(c) || c == '\t') { + if (count > n) { + bb_putchar(c); + } else { + string[count] = c; + if (count == n) { + if (option_mask32 & PRINT_NAME) { + printf(fmt, *argv); + } + if (option_mask32 & PRINT_OFFSET) { + printf("%7"OFF_FMT"o ", offset - n); + } + fputs(string, stdout); } - if(i>n) - putchar(c); - i++; + count++; } - else - { - if(i>n) - puts(""); - i=0; + } else { + if (count > n) { + bb_putchar('\n'); } - count++; + count = 0; } - while(c!=EOF); + offset++; + } while (c != EOF); + fclose_if_not_stdin(file); + } while (*++argv); - if(file!=stdin) - fclose(file); - } - else - { - bb_perror_msg("%s",argv[a]); - status=EXIT_FAILURE; - } - } - free(string); - exit(status); -} + if (ENABLE_FEATURE_CLEAN_UP) + free(string); -/* - * Copyright (c) 1980, 1987 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. - * - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ + fflush_stdout_and_exit(status); +} -- cgit v1.2.3-54-g00ecf