#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <curl/curl.h>
-#include <readline/readline.h>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <pcre.h>
#include <termios.h>
+#include <dlfcn.h>
+#include <oauth.h>
#define zalloc(size) calloc(size, 1)
};
struct session {
- char *password;
- char *account;
+ char *consumer_key;
+ char *consumer_secret;
+ char *access_token_key;
+ char *access_token_secret;
char *tweet;
char *proxy;
char *time;
char *group;
char *hosturl;
char *hostname;
+ char *configfile;
int bash;
+ int interactive;
int shrink_urls;
int dry_run;
int page;
enum host host;
enum action action;
-};
-
-struct bti_curl_buffer {
- char *data;
- enum action action;
- int length;
+ void *readline_handle;
+ char *(*readline)(const char *);
};
static void display_help(void)
fprintf(stdout, "Usage:\n");
fprintf(stdout, " bti [options]\n");
fprintf(stdout, "options are:\n");
- fprintf(stdout, " --account accountname\n");
- fprintf(stdout, " --password password\n");
fprintf(stdout, " --action action\n");
fprintf(stdout, " ('update', 'friends', 'public', 'replies', "
"'group' or 'user')\n");
fprintf(stdout, " --proxy PROXY:PORT\n");
fprintf(stdout, " --host HOST\n");
fprintf(stdout, " --logfile logfile\n");
+ fprintf(stdout, " --config configfile\n");
fprintf(stdout, " --shrink-urls\n");
fprintf(stdout, " --page PAGENUMBER\n");
fprintf(stdout, " --bash\n");
fprintf(stdout, "bti - version %s\n", VERSION);
}
+static char *get_string(const char *name)
+{
+ char *temp;
+ char *string;
+
+ string = zalloc(1000);
+ if (!string)
+ exit(1);
+ if (name != NULL)
+ fprintf(stdout, "%s", name);
+ if (!fgets(string, 999, stdin))
+ return NULL;
+ temp = strchr(string, '\n');
+ if (temp)
+ *temp = '\0';
+ return string;
+}
+
+/*
+ * Try to get a handle to a readline function from a variety of different
+ * libraries. If nothing is present on the system, then fall back to an
+ * internal one.
+ *
+ * Logic originally based off of code in the e2fsutils package in the
+ * lib/ss/get_readline.c file, which is licensed under the MIT license.
+ *
+ * This keeps us from having to relicense the bti codebase if readline
+ * ever changes its license, as there is no link-time dependancy.
+ * It is a run-time thing only, and we handle any readline-like library
+ * in the same manner, making bti not be a derivative work of any
+ * other program.
+ */
+static void session_readline_init(struct session *session)
+{
+ /* Libraries we will try to use for readline/editline functionality */
+ const char *libpath = "libreadline.so.6:libreadline.so.5:"
+ "libreadline.so.4:libreadline.so:libedit.so.2:"
+ "libedit.so:libeditline.so.0:libeditline.so";
+ void *handle = NULL;
+ char *tmp, *cp, *next;
+ int (*bind_key)(int, void *);
+ void (*insert)(void);
+
+ /* default to internal function if we can't or won't find anything */
+ session->readline = get_string;
+ if (!isatty(0))
+ return;
+ session->interactive = 1;
+
+ tmp = malloc(strlen(libpath)+1);
+ if (!tmp)
+ return;
+ strcpy(tmp, libpath);
+ for (cp = tmp; cp; cp = next) {
+ next = strchr(cp, ':');
+ if (next)
+ *next++ = 0;
+ if (*cp == 0)
+ continue;
+ handle = dlopen(cp, RTLD_NOW);
+ if (handle) {
+ dbg("Using %s for readline library\n", cp);
+ break;
+ }
+ }
+ free(tmp);
+ if (!handle) {
+ dbg("No readline library found.\n");
+ return;
+ }
+
+ session->readline_handle = handle;
+ session->readline = (char *(*)(const char *))dlsym(handle, "readline");
+ if (session->readline == NULL) {
+ /* something odd happened, default back to internal stuff */
+ session->readline_handle = NULL;
+ session->readline = get_string;
+ return;
+ }
+
+ /*
+ * If we found a library, turn off filename expansion
+ * as that makes no sense from within bti.
+ */
+ bind_key = (int (*)(int, void *))dlsym(handle, "rl_bind_key");
+ insert = (void (*)(void))dlsym(handle, "rl_insert");
+ if (bind_key && insert)
+ bind_key('\t', insert);
+}
+
+static void session_readline_cleanup(struct session *session)
+{
+ if (session->readline_handle)
+ dlclose(session->readline_handle);
+}
+
static struct session *session_alloc(void)
{
struct session *session;
{
if (!session)
return;
- free(session->password);
- free(session->account);
+ free(session->consumer_key);
+ free(session->consumer_secret);
+ free(session->access_token_key);
+ free(session->access_token_secret);
free(session->tweet);
free(session->proxy);
free(session->time);
free(session->group);
free(session->hosturl);
free(session->hostname);
+ free(session->configfile);
free(session);
}
-static struct bti_curl_buffer *bti_curl_buffer_alloc(enum action action)
-{
- struct bti_curl_buffer *buffer;
-
- buffer = zalloc(sizeof(*buffer));
- if (!buffer)
- return NULL;
-
- /* start out with a data buffer of 1 byte to
- * make the buffer fill logic simpler */
- buffer->data = zalloc(1);
- if (!buffer->data) {
- free(buffer);
- return NULL;
- }
- buffer->length = 0;
- buffer->action = action;
- return buffer;
-}
-
-static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
-{
- if (!buffer)
- return;
- free(buffer->data);
- free(buffer);
-}
-
-static const char *twitter_host = "https://twitter.com/statuses";
+static const char *twitter_host = "http://api.twitter.com/1/statuses";
static const char *identica_host = "https://identi.ca/api/statuses";
static const char *twitter_name = "twitter";
static const char *identica_name = "identi.ca";
+static const char *twitter_request_token_uri = "http://twitter.com/oauth/request_token";
+static const char *twitter_access_token_uri = "http://twitter.com/oauth/access_token";
+static const char *twitter_authorize_uri = "http://twitter.com/oauth/authorize?oauth_token=";
+static const char *identica_request_token_uri = "http://identi.ca/api/oauth/request_token";
+static const char *identica_access_token_uri = "http://identi.ca/api/oauth/access_token";
+static const char *identica_authorize_uri = "http://identi.ca/api/oauth/authorize?oauth_token=";
+
static const char *user_uri = "/user_timeline/";
static const char *update_uri = "/update.xml";
static const char *public_uri = "/public_timeline.xml";
static const char *friends_uri = "/friends_timeline.xml";
-static const char *replies_uri = "/replies.xml";
-static const char *group_uri = "/../laconica/groups/timeline/";
-
-static CURL *curl_init(void)
-{
- CURL *curl;
-
- curl = curl_easy_init();
- if (!curl) {
- fprintf(stderr, "Can not init CURL!\n");
- return NULL;
- }
- /* some ssl sanity checks on the connection we are making */
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
- return curl;
-}
+static const char *mentions_uri = "/mentions.xml";
+//static const char *group_uri = "/../laconica/groups/timeline/";
static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
{
return;
}
-static size_t curl_callback(void *buffer, size_t size, size_t nmemb,
- void *userp)
+static int parse_osp_reply(const char *reply, char **token, char **secret)
{
- struct bti_curl_buffer *curl_buf = userp;
- size_t buffer_size = size * nmemb;
- char *temp;
+ int rc;
+ int retval = 1;
+ char **rv = NULL;
+ rc = oauth_split_url_parameters(reply, &rv);
+ qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
+ if (rc == 2 || rc == 4) {
+ if (!strncmp(rv[0],"oauth_token=",11) && !strncmp(rv[1],"oauth_token_secret=",18)) {
+ if (token)
+ *token =strdup(&(rv[0][12]));
+ if (secret)
+ *secret=strdup(&(rv[1][19]));
+
+ retval = 0;
+ }
+ } else if (rc == 3) {
+ if (!strncmp(rv[1],"oauth_token=",11) && !strncmp(rv[2],"oauth_token_secret=",18)) {
+ if (token)
+ *token =strdup(&(rv[1][12]));
+ if (secret)
+ *secret=strdup(&(rv[2][19]));
+
+ retval = 0;
+ }
+ }
- if ((!buffer) || (!buffer_size) || (!curl_buf))
+ if (rv)
+ free(rv);
+
+ return retval;
+}
+
+
+static int request_access_token(struct session *session)
+{
+ char *post_params = NULL;
+ char *request_url = NULL;
+ char *reply = NULL;
+ char *at_key = NULL;
+ char *at_secret = NULL;
+ char *verifier = NULL;
+ char at_uri[90];
+
+ if (!session)
return -EINVAL;
- /* add to the data we already have */
- temp = zalloc(curl_buf->length + buffer_size + 1);
- if (!temp)
- return -ENOMEM;
+ if (session->host == HOST_TWITTER)
+ request_url = oauth_sign_url2(
+ twitter_request_token_uri, NULL,
+ OA_HMAC, NULL, session->consumer_key,
+ session->consumer_secret, NULL, NULL);
+ else if (session->host == HOST_IDENTICA)
+ request_url = oauth_sign_url2(
+ identica_request_token_uri, NULL,
+ OA_HMAC, NULL, session->consumer_key,
+ session->consumer_secret, NULL, NULL);
+ reply = oauth_http_get(request_url, post_params);
+
+ if (request_url)
+ free(request_url);
+
+ if (post_params)
+ free(post_params);
+
+ if (!reply)
+ return 1;
+
+ if (parse_osp_reply(reply, &at_key, &at_secret))
+ return 1;
+
+ free(reply);
+
+ fprintf(stdout, "Please open the following link in your browser, and ");
+ fprintf(stdout, "allow 'bti' to access your account. Then paste ");
+ fprintf(stdout, "back the provided PIN in here.\n");
+ if (session->host == HOST_TWITTER) {
+ fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
+ verifier = session->readline(NULL);
+ sprintf(at_uri, "%s?oauth_verifier=%s", twitter_access_token_uri, verifier);
+ } else if (session->host == HOST_IDENTICA) {
+ fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
+ verifier = session->readline(NULL);
+ sprintf(at_uri, "%s?oauth_verifier=%s", identica_access_token_uri, verifier);
+ }
+ request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,
+ session->consumer_key, session->consumer_secret, at_key,
+ at_secret);
+ reply = oauth_http_get(request_url, post_params);
+
+ if (!reply)
+ return 1;
+
+ if (parse_osp_reply(reply, &at_key, &at_secret))
+ return 1;
- memcpy(temp, curl_buf->data, curl_buf->length);
- free(curl_buf->data);
- curl_buf->data = temp;
- memcpy(&curl_buf->data[curl_buf->length], (char *)buffer, buffer_size);
- curl_buf->length += buffer_size;
- if (curl_buf->action)
- parse_timeline(curl_buf->data);
+ free(reply);
- dbg("%s\n", curl_buf->data);
+ fprintf(stdout, "Please put these two lines in your bti configuration ");
+ fprintf(stdout, "file (~/.bti):\n");
+ fprintf(stdout, "access_token_key=%s\n", at_key);
+ fprintf(stdout, "access_token_secret=%s\n", at_secret);
- return buffer_size;
+ return 0;
}
static int send_request(struct session *session)
{
- char endpoint[100];
- char user_password[500];
- char data[500];
- struct bti_curl_buffer *curl_buf;
- CURL *curl = NULL;
- CURLcode res;
- struct curl_httppost *formpost = NULL;
- struct curl_httppost *lastptr = NULL;
- struct curl_slist *slist = NULL;
+ char endpoint[500];
+ char *req_url = NULL;
+ char *reply = NULL;
+ char *postarg = NULL;
+ int is_post = 0;
if (!session)
return -EINVAL;
- curl_buf = bti_curl_buffer_alloc(session->action);
- if (!curl_buf)
- return -ENOMEM;
-
- curl = curl_init();
- if (!curl)
- return -EINVAL;
-
if (!session->hosturl)
session->hosturl = strdup(twitter_host);
switch (session->action) {
case ACTION_UPDATE:
- snprintf(user_password, sizeof(user_password), "%s:%s",
- session->account, session->password);
- snprintf(data, sizeof(data), "status=\"%s\"", session->tweet);
- curl_formadd(&formpost, &lastptr,
- CURLFORM_COPYNAME, "status",
- CURLFORM_COPYCONTENTS, session->tweet,
- CURLFORM_END);
-
- curl_formadd(&formpost, &lastptr,
- CURLFORM_COPYNAME, "source",
- CURLFORM_COPYCONTENTS, "bti",
- CURLFORM_END);
-
- curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
- slist = curl_slist_append(slist, "Expect:");
- curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
-
- sprintf(endpoint, "%s%s", session->hosturl, update_uri);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
- curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
- break;
- case ACTION_FRIENDS:
- snprintf(user_password, sizeof(user_password), "%s:%s",
- session->account, session->password);
- sprintf(endpoint, "%s%s?page=%d", session->hosturl,
- friends_uri, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
- curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
+ sprintf(endpoint, "%s%s?status=%s", session->hosturl, update_uri, session->tweet);
+ is_post = 1;
break;
case ACTION_USER:
- sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
- user_uri, session->user, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-
+ sprintf(endpoint, "%s%s", session->hosturl, user_uri);
break;
case ACTION_REPLIES:
- snprintf(user_password, sizeof(user_password), "%s:%s",
- session->account, session->password);
- sprintf(endpoint, "%s%s?page=%d", session->hosturl, replies_uri,
- session->page);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
- curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
-
+ sprintf(endpoint, "%s%s", session->hosturl, mentions_uri);
break;
case ACTION_PUBLIC:
- sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri,
- session->page);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-
+ sprintf(endpoint, "%s%s", session->hosturl, public_uri);
break;
case ACTION_GROUP:
- sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl,
- group_uri, session->group, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, endpoint);
-
+ case ACTION_FRIENDS:
+ sprintf(endpoint, "%s%s", session->hosturl, friends_uri);
break;
default:
break;
}
+
+ if (is_post) {
+ req_url = oauth_sign_url2(
+ endpoint, &postarg, OA_HMAC, NULL,
+ session->consumer_key, session->consumer_secret,
+ session->access_token_key, session->access_token_secret
+ );
+ reply = oauth_http_post(req_url, postarg);
+ } else {
+ req_url = oauth_sign_url2(
+ endpoint, NULL, OA_HMAC, NULL,
+ session->consumer_key, session->consumer_secret,
+ session->access_token_key, session->access_token_secret
+ );
+ reply = oauth_http_get(req_url, postarg);
+ }
- if (session->proxy)
- curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+ if (req_url)
+ free(req_url);
- if (debug)
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
-
- dbg("user_password = %s\n", user_password);
- dbg("data = %s\n", data);
- dbg("proxy = %s\n", session->proxy);
-
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
- if (!session->dry_run) {
- res = curl_easy_perform(curl);
- if (res && !session->bash) {
- fprintf(stderr, "error(%d) trying to perform "
- "operation\n", res);
- return -EINVAL;
- }
- }
+ parse_timeline(reply);
- curl_easy_cleanup(curl);
- if (session->action == ACTION_UPDATE)
- curl_formfree(formpost);
- bti_curl_buffer_free(curl_buf);
return 0;
}
FILE *config_file;
char *line = NULL;
size_t len = 0;
- char *account = NULL;
- char *password = NULL;
+ char *consumer_key = NULL;
+ char *consumer_secret = NULL;
+ char *access_token_key = NULL;
+ char *access_token_secret = NULL;
char *host = NULL;
char *proxy = NULL;
char *logfile = NULL;
char *action = NULL;
char *user = NULL;
- char *file;
int shrink_urls = 0;
- /* config file is ~/.bti */
- file = alloca(strlen(session->homedir) + 7);
-
- sprintf(file, "%s/.bti", session->homedir);
-
- config_file = fopen(file, "r");
+ config_file = fopen(session->configfile, "r");
/* No error if file does not exist or is unreadable. */
if (config_file == NULL)
if (c[0] == '\0')
continue;
- if (!strncasecmp(c, "account", 7) && (c[7] == '=')) {
- c += 8;
+ if (!strncasecmp(c, "consumer_key", 12) &&
+ (c[12] == '=')) {
+ c += 13;
+ if (c[0] != '\0')
+ consumer_key = strdup(c);
+ } else if (!strncasecmp(c, "consumer_secret", 15) &&
+ (c[15] == '=')) {
+ c += 16;
if (c[0] != '\0')
- account = strdup(c);
- } else if (!strncasecmp(c, "password", 8) &&
- (c[8] == '=')) {
- c += 9;
+ consumer_secret = strdup(c);
+ } else if (!strncasecmp(c, "access_token_key", 16) &&
+ (c[16] == '=')) {
+ c += 17;
if (c[0] != '\0')
- password = strdup(c);
+ access_token_key = strdup(c);
+ } else if (!strncasecmp(c, "access_token_secret", 19) &&
+ (c[19] == '=')) {
+ c += 20;
+ if (c[0] != '\0')
+ access_token_secret = strdup(c);
} else if (!strncasecmp(c, "host", 4) &&
(c[4] == '=')) {
c += 5;
}
} while (!feof(config_file));
- if (password)
- session->password = password;
- if (account)
- session->account = account;
+ if (consumer_key)
+ session->consumer_key = consumer_key;
+ if (consumer_secret)
+ session->consumer_secret = consumer_secret;
+ if (access_token_key)
+ session->access_token_key = access_token_key;
+ if (access_token_secret)
+ session->access_token_secret = access_token_secret;
if (host) {
if (strcasecmp(host, "twitter") == 0) {
session->host = HOST_TWITTER;
session->time, session->hostname);
else
fprintf(log_file, "%s: host=%s tweet=%s\n",
- session->time, session->hostname, session->tweet);
+ session->time, session->hostname,
+ session->tweet);
break;
case ACTION_FRIENDS:
fprintf(log_file, "%s: host=%s retrieving friends timeline\n",
if (!fgets(string, 999, stdin))
return NULL;
temp = strchr(string, '\n');
- *temp = '\0';
+ if (temp)
+ *temp = '\0';
return string;
}
-static void read_password(char *buf, size_t len, char *host)
-{
- char pwd[80];
- int retval;
- struct termios old;
- struct termios tp;
-
- tcgetattr(0, &tp);
- old = tp;
-
- tp.c_lflag &= (~ECHO);
- tcsetattr(0, TCSANOW, &tp);
-
- fprintf(stdout, "Enter password for %s: ", host);
- fflush(stdout);
- tcflow(0, TCOOFF);
- retval = scanf("%79s", pwd);
- tcflow(0, TCOON);
- fprintf(stdout, "\n");
-
- tcsetattr(0, TCSANOW, &old);
-
- strncpy(buf, pwd, len);
- buf[len-1] = '\0';
-}
-
static int find_urls(const char *tweet, int **pranges)
{
/*
static const struct option options[] = {
{ "debug", 0, NULL, 'd' },
{ "verbose", 0, NULL, 'V' },
- { "account", 1, NULL, 'a' },
- { "password", 1, NULL, 'p' },
{ "host", 1, NULL, 'H' },
{ "proxy", 1, NULL, 'P' },
{ "action", 1, NULL, 'A' },
{ "dry-run", 0, NULL, 'n' },
{ "page", 1, NULL, 'g' },
{ "version", 0, NULL, 'v' },
+ { "config", 1, NULL, 'c' },
{ }
};
struct session *session;
pid_t child;
char *tweet;
- static char password[80];
int retval = 0;
int option;
char *http_proxy;
debug = 0;
verbose = 0;
- rl_bind_key('\t', rl_insert);
session = session_alloc();
if (!session) {
session->time = strdup(ctime(&t));
session->time[strlen(session->time)-1] = 0x00;
+ /* Get the home directory so we can try to find a config file */
session->homedir = strdup(getenv("HOME"));
- curl_global_init(CURL_GLOBAL_ALL);
+ /* set up a default config file location (traditionally ~/.bti) */
+ session->configfile = zalloc(strlen(session->homedir) + 7);
+ sprintf(session->configfile, "%s/.bti", session->homedir);
/* Set environment variables first, before reading command line options
* or config file values. */
parse_configfile(session);
while (1) {
- option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:hg:G:snVv",
+ option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:snVv",
options, NULL);
if (option == -1)
break;
case 'V':
verbose = 1;
break;
- case 'a':
- if (session->account)
- free(session->account);
- session->account = strdup(optarg);
- dbg("account = %s\n", session->account);
- break;
case 'g':
page_nr = atoi(optarg);
dbg("page = %d\n", page_nr);
session->page = page_nr;
break;
- case 'p':
- if (session->password)
- free(session->password);
- session->password = strdup(optarg);
- dbg("password = %s\n", session->password);
- break;
case 'P':
if (session->proxy)
free(session->proxy);
case 'b':
session->bash = 1;
break;
+ case 'c':
+ if (session->configfile)
+ free(session->configfile);
+ session->configfile = strdup(optarg);
+ dbg("configfile = %s\n", session->configfile);
+
+ /*
+ * read the config file now. Yes, this could override previously
+ * set options from the command line, but the user asked for it...
+ */
+ parse_configfile(session);
+ break;
case 'h':
display_help();
goto exit;
}
}
+ session_readline_init(session);
/*
* Show the version to make it easier to determine what
* is going on here
if (debug)
display_version();
+ if (!session->consumer_key || !session->consumer_secret) {
+ fprintf(stderr, "Both consumer key, and consumer secret are required.\n");
+ goto exit;
+ }
+
+ if (!session->access_token_key || !session->access_token_secret) {
+ request_access_token(session);
+ goto exit;
+ }
+
if (session->action == ACTION_UNKNOWN) {
fprintf(stderr, "Unknown action, valid actions are:\n");
fprintf(stderr, "'update', 'friends', 'public', "
if (session->action == ACTION_GROUP && !session->group) {
fprintf(stdout, "Enter group name: ");
- session->group = readline(NULL);
- }
-
- if (!session->account) {
- fprintf(stdout, "Enter account for %s: ", session->hostname);
- session->account = readline(NULL);
- }
-
- if (!session->password) {
- read_password(password, sizeof(password), session->hostname);
- session->password = strdup(password);
+ session->group = session->readline(NULL);
}
if (session->action == ACTION_UPDATE) {
- if (session->bash)
+ if (session->bash || !session->interactive)
tweet = get_string_from_stdin();
else
- tweet = readline("tweet: ");
+ tweet = session->readline("tweet: ");
if (!tweet || strlen(tweet) == 0) {
dbg("no tweet?\n");
return -1;
dbg("tweet = %s\n", session->tweet);
}
- if (!session->user)
- session->user = strdup(session->account);
-
if (session->page == 0)
session->page = 1;
- dbg("account = %s\n", session->account);
- dbg("password = %s\n", session->password);
+ dbg("config file = %s\n", session->configfile);
dbg("host = %d\n", session->host);
dbg("action = %d\n", session->action);
log_session(session, retval);
exit:
+ session_readline_cleanup(session);
session_free(session);
return retval;;
}
ToastFreeware / gregoa / bti.git / blobdiff