" --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.
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?oauth_callback=oob";
-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 identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
+static const char identica_access_token_uri[] = "https://identi.ca/api/oauth/access_token";
+static const char identica_authorize_uri[] = "https://identi.ca/api/oauth/authorize?oauth_token=";
static const char user_uri[] = "/user_timeline/";
static const char update_uri[] = "/update.xml";
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;
}
/* The final place data is sent to the screen/pty/tty */
-void bti_output_line(struct session *session, xmlChar *user, xmlChar *id,
- xmlChar *created, xmlChar *text)
+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", user, id, created, text);
+ printf("[%*s] {%s} (%.16s) %s\n", -session->column_output, user,
+ id, created, text);
else
- printf("[%s] %s\n", user, text);
+ printf("[%*s] %s\n", -session->column_output, user, text);
}
static void parse_statuses(struct session *session,
}
if (user && text && created && id) {
- bti_output_line(session, user, id, created, text);
+ bti_output_line(session, user, id,
+ created, text);
xmlFree(user);
xmlFree(text);
xmlFree(created);
{
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;
fprintf(stdout,
"Please put these two lines in your bti "
- "configuration file (~/.bti):\n"
+ "configuration file (%s):\n"
"access_token_key=%s\n"
"access_token_secret=%s\n",
- at_key, at_secret);
+ session->configfile, at_key, at_secret);
return 0;
}
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);
}
}
if (!reply) {
fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
- return 1;
+ return -EIO;
}
if ((session->action != ACTION_UPDATE) &&
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;
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. */
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;
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;
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