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

randomconfig fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-12-27 18:03:20 +01:00
parent 2beb1f6faf
commit 3d27d435db
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libbb/lineedit.c
View File

@ -1373,6 +1373,16 @@ void FAST_FUNC show_history(const line_input_t *st)
printf("%4d %s\n", i, st->history[i]); printf("%4d %s\n", i, st->history[i]);
} }
void FAST_FUNC free_line_input_t(line_input_t *n)
{
# if ENABLE_FEATURE_EDITING_SAVEHISTORY
int i = n->cnt_history;
while (i > 0)
free(n->history[--i]);
#endif
free(n);
}
# if ENABLE_FEATURE_EDITING_SAVEHISTORY # if ENABLE_FEATURE_EDITING_SAVEHISTORY
/* We try to ensure that concurrent additions to the history /* We try to ensure that concurrent additions to the history
* do not overwrite each other. * do not overwrite each other.
@ -1382,14 +1392,6 @@ void FAST_FUNC show_history(const line_input_t *st)
* than configured MAX_HISTORY lines. * than configured MAX_HISTORY lines.
*/ */
void FAST_FUNC free_line_input_t(line_input_t *n)
{
int i = n->cnt_history;
while (i > 0)
free(n->history[--i]);
free(n);
}
/* state->flags is already checked to be nonzero */ /* state->flags is already checked to be nonzero */
static void load_history(line_input_t *st_parm) static void load_history(line_input_t *st_parm)
{ {

6
networking/nbd-client.c
View File

@ -163,7 +163,9 @@ int nbdclient_main(int argc, char **argv)
int sock, nbd; int sock, nbd;
int ro; int ro;
int proto_new; // 0 for old, 1 for new int proto_new; // 0 for old, 1 for new
#if BB_MMU
char *data; char *data;
#endif
// Make sure BLOCKDEV exists // Make sure BLOCKDEV exists
nbd = xopen(device, O_RDWR); nbd = xopen(device, O_RDWR);
@ -200,7 +202,9 @@ int nbdclient_main(int argc, char **argv)
ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks); ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks);
ioctl(nbd, NBD_CLEAR_SOCK); ioctl(nbd, NBD_CLEAR_SOCK);
ro = !!(old_nbd_header.flags & htons(2)); ro = !!(old_nbd_header.flags & htons(2));
#if BB_MMU
data = old_nbd_header.data; data = old_nbd_header.data;
#endif
} else { } else {
unsigned namelen; unsigned namelen;
uint16_t handshake_flags; uint16_t handshake_flags;
@ -230,7 +234,9 @@ int nbdclient_main(int argc, char **argv)
ioctl(nbd, NBD_SET_FLAGS, ioctl(nbd, NBD_SET_FLAGS,
ntohs(new_nbd_header.transmission_flags)); ntohs(new_nbd_header.transmission_flags));
ro = !!(new_nbd_header.transmission_flags & htons(2)); ro = !!(new_nbd_header.transmission_flags & htons(2));
#if BB_MMU
data = new_nbd_header.data; data = new_nbd_header.data;
#endif
} }
if (ioctl(nbd, BLKROSET, &ro) < 0) { if (ioctl(nbd, BLKROSET, &ro) < 0) {

2
shell/hush.c
View File

@ -5998,7 +5998,7 @@ static const char *first_special_char_in_vararg(const char *cp)
#endif #endif
static char *encode_then_expand_vararg(const char *str, int handle_squotes, int do_unbackslash) static char *encode_then_expand_vararg(const char *str, int handle_squotes, int do_unbackslash)
{ {
#if !BASH_PATTERN_SUBST #if !BASH_PATTERN_SUBST && ENABLE_HUSH_CASE
const int do_unbackslash = 0; const int do_unbackslash = 0;
#endif #endif
char *exp_str; char *exp_str;