PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Use strtok_r instead of strtok.

Browse source
This commit is contained in:
Dave Davenport 2016-10-30 10:12:43 +01:00
parent d1d4a8439a
commit f5f4f52957
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/dialogs/run.c
View file

@ -261,7 +261,8 @@ static char ** get_apps ( unsigned int *length )
} }
const char *const sep = ":"; const char *const sep = ":";
for ( const char *dirname = strtok ( path, sep ); dirname != NULL; dirname = strtok ( NULL, sep ) ) { char *strtok_savepointer = NULL;
for ( const char *dirname = strtok_r ( path, sep, &strtok_savepointer); dirname != NULL; dirname = strtok_r ( NULL, sep, &strtok_savepointer ) ) {
DIR *dir = opendir ( dirname ); DIR *dir = opendir ( dirname );
g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Checking path %s for executable.", dirname ); g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Checking path %s for executable.", dirname );

5
source/dialogs/ssh.c
View file

@ -291,13 +291,14 @@ static char ** get_ssh ( unsigned int *length )
if ( fd != NULL ) { if ( fd != NULL ) {
char *buffer = NULL; char *buffer = NULL;
size_t buffer_length = 0; size_t buffer_length = 0;
char *strtok_pointer = NULL;
while ( getline ( &buffer, &buffer_length, fd ) > 0 ) { while ( getline ( &buffer, &buffer_length, fd ) > 0 ) {
// Each line is either empty, a comment line starting with a '#' // Each line is either empty, a comment line starting with a '#'
// character or of the form "keyword [=] arguments", where there may // character or of the form "keyword [=] arguments", where there may
// be multiple (possibly quoted) arguments separated by whitespace. // be multiple (possibly quoted) arguments separated by whitespace.
// The keyword is separated from its arguments by whitespace OR by // The keyword is separated from its arguments by whitespace OR by
// optional whitespace and a '=' character. // optional whitespace and a '=' character.
char *token = strtok ( buffer, SSH_TOKEN_DELIM ); char *token = strtok_r ( buffer, SSH_TOKEN_DELIM, &strtok_pointer);
// Skip empty lines and comment lines. Also skip lines where the // Skip empty lines and comment lines. Also skip lines where the
// keyword is not "Host". // keyword is not "Host".
@ -310,7 +311,7 @@ static char ** get_ssh ( unsigned int *length )
// by whitespace; while host names may be quoted with double quotes // by whitespace; while host names may be quoted with double quotes
// to represent host names containing spaces, we don't support this // to represent host names containing spaces, we don't support this
// (how many host names contain spaces?). // (how many host names contain spaces?).
while ( ( token = strtok ( NULL, SSH_TOKEN_DELIM ) ) ) { while ( ( token = strtok_r ( NULL, SSH_TOKEN_DELIM, &strtok_pointer ) ) ) {
// We do not want to show wildcard entries, as you cannot ssh to them. // We do not want to show wildcard entries, as you cannot ssh to them.
const char *const sep = "*?"; const char *const sep = "*?";
if ( *token == '!' || strpbrk ( token, sep ) ) { if ( *token == '!' || strpbrk ( token, sep ) ) {