/*
- * Copyright (C) 2008-2010 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2008-2011 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2009 Bart Trojanowski <bart@jukie.net>
* Copyright (C) 2009-2010 Amir Mohammad Saied <amirsaied@gmail.com>
*
#include <termios.h>
#include <dlfcn.h>
#include <oauth.h>
-
+#include "bti.h"
#define zalloc(size) calloc(size, 1)
} while (0)
-static int debug;
-static int verbose;
-
-enum host {
- HOST_TWITTER = 0,
- HOST_IDENTICA = 1,
- HOST_CUSTOM = 2
-};
-
-enum action {
- ACTION_UPDATE = 0,
- ACTION_FRIENDS = 1,
- ACTION_USER = 2,
- ACTION_REPLIES = 4,
- ACTION_PUBLIC = 8,
- ACTION_GROUP = 16,
- ACTION_RETWEET = 32,
- ACTION_UNKNOWN = 64
-};
-
-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 *homedir;
- char *logfile;
- char *user;
- char *group;
- char *hosturl;
- char *hostname;
- char *configfile;
- char *replyto;
- char *retweet;
- int bash;
- int background;
- int interactive;
- int shrink_urls;
- int dry_run;
- int page;
- int no_oauth;
- int guest;
- enum host host;
- enum action action;
- void *readline_handle;
- char *(*readline)(const char *);
-};
-
-struct bti_curl_buffer {
- char *data;
- enum action action;
- int length;
-};
+int debug;
static void display_help(void)
{
" --retweet ID\n"
" --shrink-urls\n"
" --page PAGENUMBER\n"
+ " --column COLUMNWIDTH\n"
" --bash\n"
" --background\n"
" --debug\n"
exit(1);
if (name != NULL)
fprintf(stdout, "%s", name);
- if (!fgets(string, 999, stdin))
+ if (!fgets(string, 999, stdin)) {
+ free(string);
return NULL;
+ }
temp = strchr(string, '\n');
if (temp)
*temp = '\0';
* 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.
+ * ever changes its license, as there is no link-time dependency.
* 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.
free(buffer);
}
-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";
+const char twitter_host[] = "http://api.twitter.com/1/statuses";
+const char identica_host[] = "https://identi.ca/api/statuses";
+const char twitter_name[] = "twitter";
+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 retweet_uri[] = "/retweet/";
static const char group_uri[] = "/../statusnet/groups/timeline/";
+static const char config_default[] = "/etc/bti";
+static const char config_user_default[] = ".bti";
+
static CURL *curl_init(void)
{
CURL *curl;
return curl;
}
-static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
+/* The final place data is sent to the screen/pty/tty */
+static void bti_output_line(struct session *session, xmlChar *user,
+ xmlChar *id, xmlChar *created, xmlChar *text)
+{
+ if (session->verbose)
+ printf("[%*s] {%s} (%.16s) %s\n", -session->column_output, user,
+ id, created, text);
+ else
+ printf("[%*s] %s\n", -session->column_output, user, text);
+}
+
+static void parse_statuses(struct session *session,
+ xmlDocPtr doc, xmlNodePtr current)
{
xmlChar *text = NULL;
xmlChar *user = NULL;
}
if (user && text && created && id) {
- if (verbose)
- printf("[%s] {%s} (%.16s) %s\n",
- user, id, created, text);
- else
- printf("[%s] %s\n",
- user, text);
+ bti_output_line(session, user, id,
+ created, text);
xmlFree(user);
xmlFree(text);
xmlFree(created);
return;
}
-static void parse_timeline(char *document)
+static void parse_timeline(char *document, struct session *session)
{
xmlDocPtr doc;
xmlNodePtr current;
current = current->xmlChildrenNode;
while (current != NULL) {
if ((!xmlStrcmp(current->name, (const xmlChar *)"status")))
- parse_statuses(doc, current);
+ parse_statuses(session, doc, current);
current = current->next;
}
xmlFreeDoc(doc);
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);
+ parse_timeline(curl_buf->data, curl_buf->session);
dbg("%s\n", curl_buf->data);
{
char *post_params = NULL;
char *request_url = NULL;
- char *reply = NULL;
+ char *reply = NULL;
char *at_key = NULL;
char *at_secret = NULL;
char *verifier = NULL;
curl_buf = bti_curl_buffer_alloc(session->action);
if (!curl_buf)
return -ENOMEM;
+ curl_buf->session = session;
curl = curl_init();
- if (!curl)
+ if (!curl) {
+ bti_curl_buffer_free(curl_buf);
return -EINVAL;
+ }
if (!session->hosturl)
session->hosturl = strdup(twitter_host);
if (session->replyto)
curl_formadd(&formpost, &lastptr,
- CURLFORM_COPYNAME, "in_reply_to_status_id",
- CURLFORM_COPYCONTENTS, session->replyto,
+ CURLFORM_COPYNAME,
+ "in_reply_to_status_id",
+ CURLFORM_COPYCONTENTS,
+ session->replyto,
CURLFORM_END);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl_buf);
if (!session->dry_run) {
res = curl_easy_perform(curl);
- if (res && !session->background) {
- fprintf(stderr, "error(%d) trying to perform "
- "operation\n", res);
- return -EINVAL;
+ if (!session->background) {
+ xmlDocPtr doc;
+ xmlNodePtr current;
+
+ if (res) {
+ fprintf(stderr, "error(%d) trying to "
+ "perform operation\n", res);
+ curl_easy_cleanup(curl);
+ if (session->action == ACTION_UPDATE)
+ curl_formfree(formpost);
+ bti_curl_buffer_free(curl_buf);
+ return -EINVAL;
+ }
+
+ doc = xmlReadMemory(curl_buf->data,
+ curl_buf->length,
+ "response.xml", NULL,
+ XML_PARSE_NOERROR);
+ if (doc == NULL) {
+ curl_easy_cleanup(curl);
+ if (session->action == ACTION_UPDATE)
+ curl_formfree(formpost);
+ bti_curl_buffer_free(curl_buf);
+ return -EINVAL;
+ }
+
+ current = xmlDocGetRootElement(doc);
+ if (current == NULL) {
+ fprintf(stderr, "empty document\n");
+ xmlFreeDoc(doc);
+ curl_easy_cleanup(curl);
+ if (session->action == ACTION_UPDATE)
+ curl_formfree(formpost);
+ bti_curl_buffer_free(curl_buf);
+ return -EINVAL;
+ }
+
+ if (xmlStrcmp(current->name, (const xmlChar *)"status")) {
+ fprintf(stderr, "unexpected document type\n");
+ xmlFreeDoc(doc);
+ curl_easy_cleanup(curl);
+ if (session->action == ACTION_UPDATE)
+ curl_formfree(formpost);
+ bti_curl_buffer_free(curl_buf);
+ return -EINVAL;
+ }
+
+ xmlFreeDoc(doc);
}
}
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);
+ dbg("%s\n", endpoint);
+ if (!session->dry_run) {
+ 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);
+ }
+
+ dbg("%s\n", req_url);
+ dbg("%s\n", reply);
+ if (req_url)
+ free(req_url);
}
- dbg("%s\n", req_url);
- dbg("%s\n", reply);
- if (req_url)
- free(req_url);
+ if (!reply) {
+ fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
+ return -EIO;
+ }
if ((session->action != ACTION_UPDATE) &&
(session->action != ACTION_RETWEET))
- parse_timeline(reply);
+ parse_timeline(reply, session);
}
return 0;
}
-static void parse_configfile(struct session *session)
-{
- 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 *replyto = NULL;
- char *retweet = NULL;
- int shrink_urls = 0;
-
- config_file = fopen(session->configfile, "r");
-
- /* No error if file does not exist or is unreadable. */
- if (config_file == NULL)
- return;
-
- do {
- ssize_t n = getline(&line, &len, config_file);
- if (n < 0)
- break;
- if (line[n - 1] == '\n')
- line[n - 1] = '\0';
- /* Parse file. Format is the usual value pairs:
- account=name
- passwort=value
- # is a comment character
- */
- *strchrnul(line, '#') = '\0';
- char *c = line;
- while (isspace(*c))
- c++;
- /* Ignore blank lines. */
- if (c[0] == '\0')
- continue;
-
- if (!strncasecmp(c, "account", 7) && (c[7] == '=')) {
- c += 8;
- if (c[0] != '\0')
- account = strdup(c);
- } else if (!strncasecmp(c, "password", 8) &&
- (c[8] == '=')) {
- c += 9;
- if (c[0] != '\0')
- password = strdup(c);
- } else 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')
- consumer_secret = strdup(c);
- } else if (!strncasecmp(c, "access_token_key", 16) &&
- (c[16] == '=')) {
- c += 17;
- if (c[0] != '\0')
- 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;
- if (c[0] != '\0')
- host = strdup(c);
- } else if (!strncasecmp(c, "proxy", 5) &&
- (c[5] == '=')) {
- c += 6;
- if (c[0] != '\0')
- proxy = strdup(c);
- } else if (!strncasecmp(c, "logfile", 7) &&
- (c[7] == '=')) {
- c += 8;
- if (c[0] != '\0')
- logfile = strdup(c);
- } else if (!strncasecmp(c, "replyto", 7) &&
- (c[7] == '=')) {
- c += 8;
- if (c[0] != '\0')
- replyto = strdup(c);
- } else if (!strncasecmp(c, "action", 6) &&
- (c[6] == '=')) {
- c += 7;
- if (c[0] != '\0')
- action = strdup(c);
- } else if (!strncasecmp(c, "user", 4) &&
- (c[4] == '=')) {
- c += 5;
- if (c[0] != '\0')
- user = strdup(c);
- } else if (!strncasecmp(c, "shrink-urls", 11) &&
- (c[11] == '=')) {
- c += 12;
- if (!strncasecmp(c, "true", 4) ||
- !strncasecmp(c, "yes", 3))
- shrink_urls = 1;
- } else if (!strncasecmp(c, "verbose", 7) &&
- (c[7] == '=')) {
- c += 8;
- if (!strncasecmp(c, "true", 4) ||
- !strncasecmp(c, "yes", 3))
- verbose = 1;
- } else if (!strncasecmp(c,"retweet", 7) &&
- (c[7] == '=')) {
- c += 8;
- if (c[0] != '\0')
- retweet = strdup(c);
- }
- } 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->hosturl = strdup(twitter_host);
- session->hostname = strdup(twitter_name);
- } else if (strcasecmp(host, "identica") == 0) {
- session->host = HOST_IDENTICA;
- session->hosturl = strdup(identica_host);
- session->hostname = strdup(identica_name);
- } else {
- session->host = HOST_CUSTOM;
- session->hosturl = strdup(host);
- session->hostname = strdup(host);
- }
- free(host);
- }
- if (proxy) {
- if (session->proxy)
- free(session->proxy);
- session->proxy = proxy;
- }
- if (logfile)
- session->logfile = logfile;
- if (replyto)
- session->replyto = replyto;
- if (retweet)
- session->retweet = retweet;
- if (action) {
- if (strcasecmp(action, "update") == 0)
- session->action = ACTION_UPDATE;
- else if (strcasecmp(action, "friends") == 0)
- session->action = ACTION_FRIENDS;
- else if (strcasecmp(action, "user") == 0)
- session->action = ACTION_USER;
- else if (strcasecmp(action, "replies") == 0)
- session->action = ACTION_REPLIES;
- else if (strcasecmp(action, "public") == 0)
- session->action = ACTION_PUBLIC;
- else if (strcasecmp(action, "group") == 0)
- session->action = ACTION_GROUP;
- else
- session->action = ACTION_UNKNOWN;
- free(action);
- }
- if (user)
- session->user = user;
- session->shrink_urls = shrink_urls;
-
- /* Free buffer and close file. */
- free(line);
- fclose(config_file);
-}
-
static void log_session(struct session *session, int retval)
{
FILE *log_file;
if (!string)
return NULL;
- if (!fgets(string, 999, stdin))
+ if (!fgets(string, 999, stdin)) {
+ free(string);
return NULL;
+ }
temp = strchr(string, '\n');
if (temp)
*temp = '\0';
{ "background", 0, NULL, 'B' },
{ "dry-run", 0, NULL, 'n' },
{ "page", 1, NULL, 'g' },
+ { "column", 1, NULL, 'o' },
{ "version", 0, NULL, 'v' },
{ "config", 1, NULL, 'c' },
{ "replyto", 1, NULL, 'r' },
struct session *session;
pid_t child;
char *tweet;
- char *retweet;
static char password[80];
int retval = 0;
int option;
char *http_proxy;
+ char *home;
+ const char *config_file;
time_t t;
int page_nr;
debug = 0;
- verbose = 0;
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"));
+ /*
+ * Get the home directory so we can try to find a config file.
+ * If we have no home dir set up, look in /etc/bti
+ */
+ home = getenv("HOME");
+ if (home) {
+ /* We have a home dir, so this might be a user */
+ session->homedir = strdup(home);
+ config_file = config_user_default;
+ } else {
+ session->homedir = strdup("");
+ config_file = config_default;
+ }
/* set up a default config file location (traditionally ~/.bti) */
- session->configfile = zalloc(strlen(session->homedir) + 7);
- sprintf(session->configfile, "%s/.bti", session->homedir);
+ session->configfile = zalloc(strlen(session->homedir) + strlen(config_file) + 7);
+ sprintf(session->configfile, "%s/%s", session->homedir, config_file);
/* Set environment variables first, before reading command line options
* or config file values. */
dbg("http_proxy = %s\n", session->proxy);
}
- parse_configfile(session);
+ bti_parse_configfile(session);
while (1) {
option = getopt_long_only(argc, argv,
- "dp:P:H:a:A:u:c:hg:G:sr:nVv",
+ "dp:P:H:a:A:u:c:hg:o:G:sr:nVvw:",
options, NULL);
if (option == -1)
break;
debug = 1;
break;
case 'V':
- verbose = 1;
+ session->verbose = 1;
break;
case 'a':
if (session->account)
dbg("page = %d\n", page_nr);
session->page = page_nr;
break;
+ case 'o':
+ session->column_output = atoi(optarg);
+ dbg("column_output = %d\n", session->column_output);
+ break;
case 'r':
session->replyto = strdup(optarg);
dbg("in_reply_to_status_id = %s\n", session->replyto);
session->action = ACTION_PUBLIC;
else if (strcasecmp(optarg, "group") == 0)
session->action = ACTION_GROUP;
- else if (strcasecmp(optarg,"retweet") == 0)
+ else if (strcasecmp(optarg, "retweet") == 0)
session->action = ACTION_RETWEET;
else
session->action = ACTION_UNKNOWN;
* previously set options from the command line, but
* the user asked for it...
*/
- parse_configfile(session);
+ bti_parse_configfile(session);
break;
case 'h':
display_help();
if (!session->consumer_key || !session->consumer_secret) {
if (session->action == ACTION_USER ||
session->action == ACTION_PUBLIC) {
- /* Some actions may still work without authentication */
+ /*
+ * Some actions may still work without
+ * authentication
+ */
session->guest = 1;
} else {
fprintf(stderr,
}
if (session->action == ACTION_RETWEET) {
- fprintf(stdout, "Status ID to retweet: ");
- retweet = get_string_from_stdin();
+ if (!session->retweet) {
+ char *rtid;
+
+ fprintf(stdout, "Status ID to retweet: ");
+ rtid = get_string_from_stdin();
+ session->retweet = zalloc(strlen(rtid) + 10);
+ sprintf(session->retweet, "%s", rtid);
+ free(rtid);
+ }
- if (!retweet || strlen(retweet) == 0) {
+ if (!session->retweet || strlen(session->retweet) == 0) {
dbg("no retweet?\n");
return -1;
}
- session->retweet = zalloc(strlen(retweet) + 10);
- sprintf(session->retweet,"%s", retweet);
- free(retweet);
dbg("retweet ID = %s\n", session->retweet);
}
ToastFreeware / gregoa / bti.git / blobdiff