emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trivial fixes to make bbox compile with gcc 4.3.0

Browse Source
This commit is contained in:
Denis Vlasenko 2008-04-15 01:17:50 +00:00
parent 3cfebe44c7
commit bc1918a7a2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/libunarchive/get_header_tar.c
View File

@ -217,9 +217,7 @@ char get_header_tar(archive_handle_t *archive_handle)
} }
file_header->link_target = NULL; file_header->link_target = NULL;
if (!linkname && parse_names && tar.linkname[0]) { if (!linkname && parse_names && tar.linkname[0]) {
/* we trash magic[0] here, it's ok */ file_header->link_target = xstrndup(tar.linkname, sizeof(tar.linkname));
tar.linkname[sizeof(tar.linkname)] = '\0';
file_header->link_target = xstrdup(tar.linkname);
/* FIXME: what if we have non-link object with link_target? */ /* FIXME: what if we have non-link object with link_target? */
/* Will link_target be free()ed? */ /* Will link_target be free()ed? */
} }
@ -237,10 +235,12 @@ char get_header_tar(archive_handle_t *archive_handle)
file_header->name = NULL; file_header->name = NULL;
if (!longname && parse_names) { if (!longname && parse_names) {
/* we trash mode[0] here, it's ok */ /* we trash mode[0] here, it's ok */
tar.name[sizeof(tar.name)] = '\0'; //tar.name[sizeof(tar.name)] = '\0'; - gcc 4.3.0 would complain
tar.mode[0] = '\0';
if (tar.prefix[0]) { if (tar.prefix[0]) {
/* and padding[0] */ /* and padding[0] */
tar.prefix[sizeof(tar.prefix)] = '\0'; //tar.prefix[sizeof(tar.prefix)] = '\0'; - gcc 4.3.0 would complain
tar.padding[0] = '\0';
file_header->name = concat_path_file(tar.prefix, tar.name); file_header->name = concat_path_file(tar.prefix, tar.name);
} else } else
file_header->name = xstrdup(tar.name); file_header->name = xstrdup(tar.name);

3
shell/msh.c
View File

@ -588,7 +588,6 @@ static const struct builtincmd builtincmds[] = {
{ NULL , NULL }, { NULL , NULL },
}; };
static struct op *scantree(struct op *);
static struct op *dowholefile(int /*, int*/); static struct op *dowholefile(int /*, int*/);
@ -1278,6 +1277,7 @@ static int newfile(char *s)
} }
#ifdef UNUSED
struct op *scantree(struct op *head) struct op *scantree(struct op *head)
{ {
struct op *dotnode; struct op *dotnode;
@ -1309,6 +1309,7 @@ struct op *scantree(struct op *head)
return NULL; return NULL;
} }
#endif
static void onecommand(void) static void onecommand(void)