diff options
author | Emanuele Giaquinta <exg@irssi.org> | 2006-09-18 22:32:33 +0000 |
---|---|---|
committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2006-09-18 22:32:33 +0000 |
commit | 8ca4e8544bcd8543afcca0d0af55dc00a6921cc8 (patch) | |
tree | 19d3e7e8ed4b36946383c147cdb3778e61a05358 /src/core/session.c | |
parent | 9f0cd484e5a3442ee1ebb8daaf187bab87cb272f (diff) | |
download | irssi-8ca4e8544bcd8543afcca0d0af55dc00a6921cc8.zip |
Apply 05upgrade-check-binary.dpatch with some modifications.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4366 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/session.c')
-rw-r--r-- | src/core/session.c | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/src/core/session.c b/src/core/session.c index f8d70d3b..9bbd3eb7 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -37,42 +37,59 @@ char *irssi_binary = NULL; static char **session_args; -void session_set_binary(const char *path) +#ifndef HAVE_GLIB2 +static char *g_find_program_in_path(const char *path) { const char *envpath; char **paths, **tmp; char *str; - - g_free_and_null(irssi_binary); + char *result = NULL; if (g_path_is_absolute(path)) { /* full path - easy */ - irssi_binary = g_strdup(path); - return; + if(access(path, X_OK) == -1) + return NULL; + else + return g_strdup(path); } if (strchr(path, G_DIR_SEPARATOR) != NULL) { /* relative path */ str = g_get_current_dir(); - irssi_binary = g_strconcat(str, G_DIR_SEPARATOR_S, path, NULL); + result = g_strconcat(str, G_DIR_SEPARATOR_S, path, NULL); g_free(str); - return; + if (access(result, X_OK) == -1) { + g_free(result); + return NULL; + } + else + return result; } /* we'll need to find it from path. */ envpath = g_getenv("PATH"); - if (envpath == NULL) return; + if (envpath == NULL) return NULL; paths = g_strsplit(envpath, ":", -1); for (tmp = paths; *tmp != NULL; tmp++) { str = g_strconcat(*tmp, G_DIR_SEPARATOR_S, path, NULL); if (access(str, X_OK) == 0) { - irssi_binary = str; + result = str; break; } g_free(str); } g_strfreev(paths); + + return result; +} +#endif + +void session_set_binary(const char *path) +{ + g_free_and_null(irssi_binary); + + irssi_binary = g_strdup(path); } void session_upgrade(void) @@ -80,7 +97,7 @@ void session_upgrade(void) if (session_args == NULL) return; - execvp(session_args[0], session_args); + execv(session_args[0], session_args); fprintf(stderr, "exec failed: %s: %s\n", session_args[0], g_strerror(errno)); } @@ -90,10 +107,14 @@ static void cmd_upgrade(const char *data) { CONFIG_REC *session; char *session_file, *str; + char *binary; if (*data == '\0') data = irssi_binary; + if ((binary = g_find_program_in_path(data)) == NULL) + cmd_return_error(CMDERR_PROGRAM_NOT_FOUND); + /* save the session */ session_file = g_strdup_printf("%s/session", get_irssi_dir()); session = config_open(session_file, 0600); @@ -106,7 +127,8 @@ static void cmd_upgrade(const char *data) /* data may contain some other program as well, like /UPGRADE /usr/bin/screen irssi */ str = g_strdup_printf("%s --noconnect --session=%s --home=%s --config=%s", - data, session_file, get_irssi_dir(), get_irssi_config()); + binary, session_file, get_irssi_dir(), get_irssi_config()); + g_free(binary); g_free(session_file); session_args = g_strsplit(str, " ", -1); g_free(str); |