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

fix buglets found by randomconfig run

Browse Source
This commit is contained in:
Denis Vlasenko 2007-03-11 10:56:37 +00:00
parent be644a81e9
commit a4688bf55d
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archival/bbunzip.c
View File

@ -1,7 +1,6 @@
/* vi: set sw=4 ts=4: */ /* vi: set sw=4 ts=4: */
/* /*
* Modified for busybox by Glenn McGrath <bug1@iinet.net.au> * Common code for gunzip-like applets
* Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
@ -127,6 +126,8 @@ int unpack(char **argv,
return exitcode; return exitcode;
} }
#if ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNCOMPRESS
static static
char* make_new_name_generic(char *filename, const char *expected_ext) char* make_new_name_generic(char *filename, const char *expected_ext)
{ {
@ -140,6 +141,17 @@ char* make_new_name_generic(char *filename, const char *expected_ext)
return filename; return filename;
} }
#endif
/* vi: set sw=4 ts=4: */
/*
* Modified for busybox by Glenn McGrath <bug1@iinet.net.au>
* Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#if ENABLE_BUNZIP2 #if ENABLE_BUNZIP2
static static

3
coreutils/Kbuild
View File

@ -10,7 +10,8 @@ lib-y:=
lib-$(CONFIG_BASENAME) += basename.o lib-$(CONFIG_BASENAME) += basename.o
lib-$(CONFIG_CAL) += cal.o lib-$(CONFIG_CAL) += cal.o
lib-$(CONFIG_CAT) += cat.o lib-$(CONFIG_CAT) += cat.o
lib-$(CONFIG_LESS) += cat.o # less uses it if stdout isn't a tty lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty
lib-$(CONFIG_LESS) += cat.o # less too
lib-$(CONFIG_CATV) += catv.o lib-$(CONFIG_CATV) += catv.o
lib-$(CONFIG_CHGRP) += chgrp.o chown.o lib-$(CONFIG_CHGRP) += chgrp.o chown.o
lib-$(CONFIG_CHMOD) += chmod.o lib-$(CONFIG_CHMOD) += chmod.o

4
coreutils/diff.c
View File

@ -82,7 +82,7 @@ static char *start;
static const char *label1; static const char *label1;
static const char *label2; static const char *label2;
static struct stat stb1, stb2; static struct stat stb1, stb2;
static char **dl; USE_FEATURE_DIFF_DIR(static char **dl;)
USE_FEATURE_DIFF_DIR(static int dl_count;) USE_FEATURE_DIFF_DIR(static int dl_count;)
struct cand { struct cand {
@ -1051,7 +1051,7 @@ static int add_to_dirlist(const char *filename,
{ {
/* +2: with space for eventual trailing NULL */ /* +2: with space for eventual trailing NULL */
dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0])); dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0]));
dl[dl_count] = xstrdup(filename + (int)userdata); dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata);
dl_count++; dl_count++;
return TRUE; return TRUE;
} }