Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 00:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Tito, Reduces the size of busybox's strings applet from 1900 to

Browse Source 
1788 bytes (for strings.o).
This commit is contained in:
Glenn L McGrath 2003-09-15 14:22:37 +00:00
parent 977451ef44
commit e16ab475ad
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miscutils/strings.c
View File

@ -37,10 +37,11 @@
int strings_main(int argc, char **argv) int strings_main(int argc, char **argv)
{ {
int n=4, c, i, opt=0, a=0, status=EXIT_SUCCESS; int n=4, c, i, opt=0, status=EXIT_SUCCESS;
long t=0, count; long t=0, count;
FILE *file; FILE *file = stdin;
char *string=NULL; char *string=NULL;
const char *fmt="%s: ";
while ((i = getopt(argc, argv, "afon:")) > 0) while ((i = getopt(argc, argv, "afon:")) > 0)
switch(i) switch(i)
@ -66,18 +67,19 @@ int strings_main(int argc, char **argv)
i=0; i=0;
string=xmalloc(n+1); string=xmalloc(n+1);
string[n]='\0'; /*string[n]='\0';*/
n-=1; n-=1;
if(!argc ) if(argc==0)
{ {
file = stdin; fmt="{%s}: ";
*argv=(char *)bb_msg_standard_input;
goto pipe; goto pipe;
} }
for(a=0;a<argc;a++) for( ;*argv!=NULL;*argv++)
{ {
if((file=fopen(argv[a],"r"))) if((file=bb_wfopen(*argv,"r")))
{ {
pipe: pipe:
@ -93,7 +95,7 @@ pipe:
if(i==n) if(i==n)
{ {
if(opt == 1 || opt == 3 ) if(opt == 1 || opt == 3 )
printf("%s: ", (!argv[a])? "{stdin}" : argv[a]); printf(fmt,*argv);
if(opt >= 2 ) if(opt >= 2 )
printf("%7lo ", t); printf("%7lo ", t);
printf("%s", string); printf("%s", string);
@ -114,12 +116,9 @@ pipe:
bb_fclose_nonstdin(file); bb_fclose_nonstdin(file);
} }
else else
{
bb_perror_msg("%s",argv[a]);
status=EXIT_FAILURE; status=EXIT_FAILURE;
}
} }
free(string); /*free(string);*/
exit(status); exit(status);
} }