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

Issue570 (#571)

Browse source 
* First start issue #570

* Implement (glob style) includes.

* Add glob check to configure.

* If expanding path, use it
This commit is contained in:
Dave Davenport 2017-03-08 16:56:28 +01:00 committed by GitHub
parent 8083eef5d0
commit b72a010908
2 changed files with 109 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -89,7 +89,8 @@ AC_CHECK_FUNC([flock],, AC_MSG_ERROR("Could not find flock"))
AC_CHECK_FUNC([ftruncate],,AC_MSG_ERROR("Could not find ftruncate")) AC_CHECK_FUNC([ftruncate],,AC_MSG_ERROR("Could not find ftruncate"))
AC_CHECK_FUNC([fcntl],, AC_MSG_ERROR("Could not find fcntl")) AC_CHECK_FUNC([fcntl],, AC_MSG_ERROR("Could not find fcntl"))
AC_CHECK_FUNC([setlocale],,AC_MSG_ERROR("Could not find setlocale")) AC_CHECK_FUNC([setlocale],,AC_MSG_ERROR("Could not find setlocale"))
AC_CHECK_FUNC([atexit],, AC_MSG_ERROR("Could not find atexit in c library")) AC_CHECK_FUNC([atexit],, AC_MSG_ERROR("Could not find atexit in c library"))
AC_CHECK_FUNC([glob],, AC_MSG_ERROR("Could not find glob in c library"))
AC_CHECK_HEADER([math.h],, AC_MSG_ERROR("Could not find math.h header file")) AC_CHECK_HEADER([math.h],, AC_MSG_ERROR("Could not find math.h header file"))
AC_SEARCH_LIBS([floor],[m],, AC_MSG_ERROR("Could not find floor in math library")) AC_SEARCH_LIBS([floor],[m],, AC_MSG_ERROR("Could not find floor in math library"))

174
source/dialogs/ssh.c
View file

@ -43,12 +43,20 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <helper.h> #include <helper.h>
#include <glob.h>
#include "rofi.h" #include "rofi.h"
#include "settings.h" #include "settings.h"
#include "history.h" #include "history.h"
#include "dialogs/ssh.h" #include "dialogs/ssh.h"
/**
* Log domain for the ssh modi.
*/
#define LOG_DOMAIN "Dialogs.Ssh"
/** /**
* Name of the history file where previously choosen hosts are stored. * Name of the history file where previously choosen hosts are stored.
*/ */
@ -255,6 +263,104 @@ static char **read_hosts_file ( char ** retv, unsigned int *length )
return retv; return retv;
} }
static void parse_ssh_config_file ( const char *filename, char ***retv, unsigned int *length, unsigned int num_favorites )
{
FILE *fd = fopen ( filename, "r" );
g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Parsing ssh config file: %s" , filename);
if ( fd != NULL ) {
char *buffer = NULL;
size_t buffer_length = 0;
char *strtok_pointer = NULL;
while ( getline ( &buffer, &buffer_length, fd ) > 0 ) {
// Each line is either empty, a comment line starting with a '#'
// character or of the form "keyword [=] arguments", where there may
// be multiple (possibly quoted) arguments separated by whitespace.
// The keyword is separated from its arguments by whitespace OR by
// optional whitespace and a '=' character.
char *token = strtok_r ( buffer, SSH_TOKEN_DELIM, &strtok_pointer );
// Skip empty lines and comment lines. Also skip lines where the
// keyword is not "Host".
if ( !token || *token == '#' ) {
continue;
}
if ( g_strcmp0 ( token, "Include") == 0 ) {
token = strtok_r ( NULL, SSH_TOKEN_DELIM, &strtok_pointer );
g_log ( LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Found Include: %s" , token);
gchar *path = rofi_expand_path ( token );
gchar *full_path = NULL;
if ( ! g_path_is_absolute ( path ) ){
char *dirname = g_path_get_dirname ( filename );
full_path = g_build_filename ( dirname, path, NULL );
g_free(dirname);
} else {
full_path = g_strdup ( path );
}
glob_t globbuf = {0,};
if ( glob ( full_path, 0, NULL, &globbuf ) == 0 ){
for ( size_t iter = 0; iter < globbuf.gl_pathc; iter++){
parse_ssh_config_file ( globbuf.gl_pathv[iter], retv, length, num_favorites );
}
}
globfree ( &globbuf );
g_free ( full_path );
g_free ( path );
}
else if ( g_strcmp0 ( token, "Host" ) == 0 ) {
// Now we know that this is a "Host" line.
// The "Host" keyword is followed by one more host names separated
// by whitespace; while host names may be quoted with double quotes
// to represent host names containing spaces, we don't support this
// (how many host names contain spaces?).
while ( ( token = strtok_r ( NULL, SSH_TOKEN_DELIM, &strtok_pointer ) ) ) {
// We do not want to show wildcard entries, as you cannot ssh to them.
const char *const sep = "*?";
if ( *token == '!' || strpbrk ( token, sep ) ) {
continue;
}
// If comment, skip from now on.
if ( *token == '#' ) {
break;
}
// Is this host name already in the history file?
// This is a nice little penalty, but doable? time will tell.
// given num_favorites is max 25.
int found = 0;
for ( unsigned int j = 0; j < num_favorites; j++ ) {
if ( !g_ascii_strcasecmp ( token, (*retv)[j] ) ) {
found = 1;
break;
}
}
if ( found ) {
continue;
}
// Add this host name to the list.
(*retv) = g_realloc ( (*retv), ( ( *length ) + 2 ) * sizeof ( char* ) );
(*retv)[( *length )] = g_strdup ( token );
(*retv)[( *length ) + 1] = NULL;
( *length )++;
}
}
}
if ( buffer != NULL ) {
free ( buffer );
}
if ( fclose ( fd ) != 0 ) {
fprintf ( stderr, "Failed to close ssh configuration file: '%s'\n", strerror ( errno ) );
}
}
}
/** /**
* @param length The number of found ssh hosts [out] * @param length The number of found ssh hosts [out]
* *
@ -286,74 +392,8 @@ static char ** get_ssh ( unsigned int *length )
const char *hd = g_get_home_dir (); const char *hd = g_get_home_dir ();
path = g_build_filename ( hd, ".ssh", "config", NULL ); path = g_build_filename ( hd, ".ssh", "config", NULL );
FILE *fd = fopen ( path, "r" );
if ( fd != NULL ) {
char *buffer = NULL;
size_t buffer_length = 0;
char *strtok_pointer = NULL;
while ( getline ( &buffer, &buffer_length, fd ) > 0 ) {
// Each line is either empty, a comment line starting with a '#'
// character or of the form "keyword [=] arguments", where there may
// be multiple (possibly quoted) arguments separated by whitespace.
// The keyword is separated from its arguments by whitespace OR by
// optional whitespace and a '=' character.
char *token = strtok_r ( buffer, SSH_TOKEN_DELIM, &strtok_pointer );
// Skip empty lines and comment lines. Also skip lines where the
// keyword is not "Host".
if ( !token || *token == '#' || g_ascii_strcasecmp ( token, "Host" ) ) {
continue;
}
// Now we know that this is a "Host" line.
// The "Host" keyword is followed by one more host names separated
// by whitespace; while host names may be quoted with double quotes
// to represent host names containing spaces, we don't support this
// (how many host names contain spaces?).
while ( ( token = strtok_r ( NULL, SSH_TOKEN_DELIM, &strtok_pointer ) ) ) {
// We do not want to show wildcard entries, as you cannot ssh to them.
const char *const sep = "*?";
if ( *token == '!' || strpbrk ( token, sep ) ) {
continue;
}
// If comment, skip from now on.
if ( *token == '#' ) {
break;
}
// Is this host name already in the history file?
// This is a nice little penalty, but doable? time will tell.
// given num_favorites is max 25.
int found = 0;
for ( unsigned int j = 0; j < num_favorites; j++ ) {
if ( !g_ascii_strcasecmp ( token, retv[j] ) ) {
found = 1;
break;
}
}
if ( found ) {
continue;
}
// Add this host name to the list.
retv = g_realloc ( retv, ( ( *length ) + 2 ) * sizeof ( char* ) );
retv[( *length )] = g_strdup ( token );
retv[( *length ) + 1] = NULL;
( *length )++;
}
}
if ( buffer != NULL ) {
free ( buffer );
}
if ( fclose ( fd ) != 0 ) {
fprintf ( stderr, "Failed to close ssh configuration file: '%s'\n", strerror ( errno ) );
}
}
parse_ssh_config_file ( path, &retv, length, num_favorites );
g_free ( path ); g_free ( path );
return retv; return retv;