PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Fix a few minor bugs

This commit is contained in:
Qball Cow 2014-02-01 14:39:49 +01:00
parent 5415cd60ed
commit fa5a496629
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,5 +1,5 @@
QUIET?=@
CFLAGS?=-Wall -Wextra -O3
CFLAGS?=-Wall -Wextra -O3
VERSION?=0.14.1
PROGRAM=simpleswitcher

9
source/mark-dialog.c
View File

@ -187,7 +187,7 @@ static char ** get_mark ( )
if ( t == sizeof( head ) ) {
char *result = malloc( sizeof( char )*( head.size+1 ) );
ssize_t index = 0;
t = 0;
// Grab results.
while ( index < ( ssize_t )head.size ) {
t= recv( s, &result[index], ( head.size-t ), 0 );
@ -273,7 +273,6 @@ SwitcherMode mark_switcher_dialog ( char **input )
int shift=0;
int selected_line = 0;
int mretv = menu( cmd_list, input, "mark:", NULL, &shift,token_match,NULL, &selected_line );
if ( mretv == MENU_NEXT ) {
retv = NEXT_DIALOG;
} else if ( mretv == MENU_OK && cmd_list[selected_line] != NULL ) {
@ -281,12 +280,12 @@ SwitcherMode mark_switcher_dialog ( char **input )
} else if ( mretv == MENU_CUSTOM_INPUT && *input != NULL && *input[0] != '\0' ) {
exec_mark( *input );
}
for ( int i=0; cmd_list[i] != NULL; i++ ) {
for ( int i=0; cmd_list != NULL && cmd_list[i] != NULL; i++ ) {
free( cmd_list[i] );
}
free( cmd_list );
if (cmd_list) free( cmd_list );
return retv;
}

7
source/run-dialog.c
View File

@ -118,7 +118,7 @@ static pid_t exec_cmd( const char *cmd, int run_in_term )
fclose( fd );
}
for ( int i=0; retv[i] != NULL; i++ ) {
for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
free( retv[i] );
}
@ -179,7 +179,7 @@ static void delete_entry( const char *cmd )
fclose( fd );
}
for ( int i=0; retv[i] != NULL; i++ ) {
for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
free( retv[i] );
}
@ -318,9 +318,10 @@ SwitcherMode run_switcher_dialog ( char **input )
exec_cmd( *input, shift );
} else if ( mretv == MENU_ENTRY_DELETE && cmd_list[selected_line] ) {
delete_entry ( cmd_list[selected_line] );
retv = RUN_DIALOG;
}
for ( int i=0; cmd_list[i] != NULL; i++ ) {
for ( int i=0; cmd_list != NULL && cmd_list[i] != NULL; i++ ) {
free( cmd_list[i] );
}

1
source/simpleswitcher.c
View File

@ -1095,7 +1095,6 @@ MenuReturn menu( char **lines, char **input, char *prompt, Time *time, int *shif
release_keyboard();
if ( *input != NULL ) free( *input );
*input = strdup( text->text );

7
source/ssh-dialog.c
View File

@ -115,7 +115,7 @@ static pid_t exec_ssh( const char *cmd )
fclose( fd );
}
for ( int i=0; retv[i] != NULL; i++ ) {
for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
free( retv[i] );
}
@ -176,7 +176,7 @@ static void delete_ssh( const char *cmd )
fclose( fd );
}
for ( int i=0; retv[i] != NULL; i++ ) {
for ( int i=0; retv != NULL && retv[i] != NULL; i++ ) {
free( retv[i] );
}
@ -307,7 +307,6 @@ SwitcherMode ssh_switcher_dialog ( char **input )
int shift=0;
int selected_line = 0;
int mretv = menu( cmd_list, input, "ssh", NULL, &shift,token_match, NULL , &selected_line );
if ( mretv == MENU_NEXT ) {
retv = NEXT_DIALOG;
} else if ( mretv == MENU_OK && cmd_list[selected_line] != NULL ) {
@ -316,6 +315,8 @@ SwitcherMode ssh_switcher_dialog ( char **input )
exec_ssh( *input );
} else if ( mretv == MENU_ENTRY_DELETE && cmd_list[selected_line] ) {
delete_ssh ( cmd_list[selected_line] );
// Stay
retv = SSH_DIALOG;
}
for ( int i=0; cmd_list[i] != NULL; i++ ) {