* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#define _GNU_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <pcre.h>
-#include "bti_version.h"
#define zalloc(size) calloc(size, 1)
#define dbg(format, arg...) \
do { \
if (debug) \
- printf("%s: " format , __func__ , ## arg); \
+ fprintf(stdout, "bti: %s: " format , __func__ , \
+ ## arg); \
} while (0)
int bash;
int shrink_urls;
int dry_run;
+ int page;
enum host host;
enum action action;
};
static void display_help(void)
{
fprintf(stdout, "bti - send tweet to twitter or identi.ca\n");
- fprintf(stdout, "Version: " BTI_VERSION "\n");
+ fprintf(stdout, "Version: " VERSION "\n");
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' or 'user')\n");
+ fprintf(stdout, " ('update', 'friends', 'public', 'replies' "
+ "or 'user')\n");
fprintf(stdout, " --user screenname\n");
fprintf(stdout, " --proxy PROXY:PORT\n");
fprintf(stdout, " --host HOST\n");
fprintf(stdout, " --logfile logfile\n");
fprintf(stdout, " --shrink-urls\n");
+ fprintf(stdout, " --page PAGENUMBER\n");
fprintf(stdout, " --bash\n");
fprintf(stdout, " --debug\n");
+ fprintf(stdout, " --dry-run\n");
fprintf(stdout, " --version\n");
fprintf(stdout, " --help\n");
}
static void display_version(void)
{
- fprintf(stdout, "bti - version %s\n", BTI_VERSION);
+ fprintf(stdout, "bti - version %s\n", VERSION);
}
static struct session *session_alloc(void)
static const char *twitter_friends_url = "https://twitter.com/statuses/friends_timeline.xml";
static const char *twitter_replies_url = "http://twitter.com/statuses/replies.xml";
-static const char *identica_user_url = "http://identi.ca/api/statuses/user_timeline/";
-static const char *identica_update_url = "http://identi.ca/api/statuses/update.xml";
-static const char *identica_public_url = "http://identi.ca/api/statuses/public_timeline.xml";
-static const char *identica_friends_url = "http://identi.ca/api/statuses/friends_timeline.xml";
-static const char *identica_replies_url = "http://identi.ca/api/statuses/replies.xml";
+static const char *identica_user_url = "https://identi.ca/api/statuses/user_timeline/";
+static const char *identica_update_url = "https://identi.ca/api/statuses/update.xml";
+static const char *identica_public_url = "https://identi.ca/api/statuses/public_timeline.xml";
+static const char *identica_friends_url = "https://identi.ca/api/statuses/friends_timeline.xml";
+static const char *identica_replies_url = "https://identi.ca/api/statuses/replies.xml";
static CURL *curl_init(void)
{
return curl;
}
-void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
+static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
{
xmlChar *text = NULL;
xmlChar *user = NULL;
+ xmlChar *created = NULL;
xmlNodePtr userinfo;
current = current->xmlChildrenNode;
while (current != NULL) {
if (current->type == XML_ELEMENT_NODE) {
+ if (!xmlStrcmp(current->name, (const xmlChar *)"created_at"))
+ created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
userinfo = userinfo->next;
}
}
- if (user && text) {
- printf("[%s] %s\n", user, text);
+
+ if (user && text && created) {
+ printf("[%s] (%.16s) %s\n",
+ user, created, text);
xmlFree(user);
xmlFree(text);
+ xmlFree(created);
user = NULL;
text = NULL;
+ created = NULL;
}
}
current = current->next;
{
xmlDocPtr doc;
xmlNodePtr current;
- doc = xmlReadMemory(document, strlen(document), "timeline.xml", NULL, XML_PARSE_NOERROR);
+ doc = xmlReadMemory(document, strlen(document), "timeline.xml",
+ NULL, XML_PARSE_NOERROR);
if (doc == NULL)
return;
return;
}
-size_t curl_callback(void *buffer, size_t size, size_t nmemb, void *userp)
+static size_t curl_callback(void *buffer, size_t size, size_t nmemb,
+ void *userp)
{
struct bti_curl_buffer *curl_buf = userp;
size_t buffer_size = size * nmemb;
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL, twitter_update_url);
+ curl_easy_setopt(curl, CURLOPT_URL,
+ twitter_update_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL, identica_update_url);
+ curl_easy_setopt(curl, CURLOPT_URL,
+ identica_update_url);
break;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
session->account, session->password);
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL, twitter_friends_url);
+ sprintf(user_url, "%s?page=%d", twitter_friends_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL, identica_friends_url);
+ sprintf(user_url, "%s?page=%d", identica_friends_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
case ACTION_USER:
switch (session->host) {
case HOST_TWITTER:
- sprintf(user_url, "%s%s.xml", twitter_user_url, session->user);
+ sprintf(user_url, "%s%s.xml?page=%d", twitter_user_url, session->user, session->page);
curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- sprintf(user_url, "%s%s.xml", identica_user_url, session->user);
+ sprintf(user_url, "%s%s.xml?page=%d", identica_user_url, session->user, session->page);
curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
session->account, session->password);
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL, twitter_replies_url);
+ sprintf(user_url, "%s?page=%d", twitter_replies_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL, identica_replies_url);
+ sprintf(user_url, "%s?page=%d", identica_replies_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
case ACTION_PUBLIC:
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL, twitter_public_url);
+ sprintf(user_url, "%s?page=%d", twitter_public_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL, identica_public_url);
+ sprintf(user_url, "%s?page=%d", identica_public_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
if (!session->dry_run) {
res = curl_easy_perform(curl);
if (res && !session->bash) {
- fprintf(stderr, "error(%d) trying to perform operation\n", res);
+ fprintf(stderr, "error(%d) trying to perform "
+ "operation\n", res);
return -EINVAL;
}
}
session->action = ACTION_UNKNOWN;
free(action);
}
- if (user) {
+ if (user)
session->user = user;
- }
session->shrink_urls = shrink_urls;
/* Free buffer and close file. */
static int find_urls(const char *tweet, int **pranges)
{
- // magic obtained from http://www.geekpedia.com/KB65_How-to-validate-an-URL-using-RegEx-in-Csharp.html
+ /*
+ * magic obtained from
+ * http://www.geekpedia.com/KB65_How-to-validate-an-URL-using-RegEx-in-Csharp.html
+ */
static const char *re_magic =
"(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{1,3}"
"[0-9a-zA-Z;/~?:@&=+$\\.\\-_'()%]+)"
&errptr, &erroffset, NULL);
if (!re) {
fprintf(stderr, "pcre_compile @%u: %s\n", erroffset, errptr);
- exit (1);
+ exit(1);
}
tweetlen = strlen(tweet);
- for (startoffset=0; startoffset<tweetlen; ) {
+ for (startoffset = 0; startoffset < tweetlen; ) {
rc = pcre_exec(re, NULL, tweet, strlen(tweet), startoffset, 0,
ovector, ovsize);
if (rc == PCRE_ERROR_NOMATCH)
break;
- if (rc<0) {
- fprintf(stderr, "pcre_exec @%u: %s\n", erroffset, errptr);
- exit (1);
+ if (rc < 0) {
+ fprintf(stderr, "pcre_exec @%u: %s\n",
+ erroffset, errptr);
+ exit(1);
}
- for (i=0; i<rc; i+=2) {
+ for (i = 0; i < rc; i += 2) {
if ((rcount+2) == rbound) {
rbound *= 2;
ranges = realloc(ranges, sizeof(int) * rbound);
* execution it can then write to element 0 (stdin of exe), and read from
* element 1 (stdout) and 2 (stderr).
*/
-static int popenRW(int *rwepipe, const char *exe, const char *const argv[])
+static int popenRWE(int *rwepipe, const char *exe, const char *const argv[])
{
int in[2];
int out[2];
int rc;
rc = pipe(in);
- if (rc<0)
+ if (rc < 0)
goto error_in;
rc = pipe(out);
- if (rc<0)
+ if (rc < 0)
goto error_out;
rc = pipe(err);
- if (rc<0)
+ if (rc < 0)
goto error_err;
pid = fork();
- if (pid > 0) { // parent
+ if (pid > 0) {
+ /* parent */
close(in[0]);
close(out[1]);
close(err[1]);
rwepipe[1] = out[0];
rwepipe[2] = err[0];
return pid;
- } else if (pid == 0) { // child
+ } else if (pid == 0) {
+ /* child */
close(in[1]);
close(out[0]);
close(err[0]);
close(0);
- dup(in[0]);
+ rc = dup(in[0]);
close(1);
- dup(out[1]);
+ rc = dup(out[1]);
close(2);
- dup(err[1]);
+ rc = dup(err[1]);
- execvp(exe, (char**)argv);
+ execvp(exe, (char **)argv);
exit(1);
} else
goto error_fork;
return -1;
}
-static int pcloseRW(int pid, int *rwepipe)
+static int pcloseRWE(int pid, int *rwepipe)
{
int rc, status;
close(rwepipe[0]);
while (smalllen && isspace(small[smalllen-1]))
small[--smalllen] = 0;
- free (big);
+ free(big);
return small;
error_free_small:
NULL
};
int shrink_pid;
- int shrink_pipe[2];
+ int shrink_pipe[3];
int inlen = strlen(text);
dbg("before len=%u\n", inlen);
- shrink_pid = popenRW(shrink_pipe, shrink_args[0], shrink_args);
+ shrink_pid = popenRWE(shrink_pipe, shrink_args[0], shrink_args);
if (shrink_pid < 0)
return text;
rcount = find_urls(text, &ranges);
+ if (!rcount)
+ return text;
- for (i=0; i<rcount; i+=2) {
+ for (i = 0; i < rcount; i += 2) {
int url_start = ranges[i];
int url_end = ranges[i+1];
int long_url_len = url_end - url_start;
dbg("short url[%u]: %s\n", short_url_len, url);
if (!url || short_url_len >= long_url_len) {
- // the short url ended up being too long or unavailable
+ /* The short url ended up being too long
+ * or unavailable */
if (inofs) {
strncpy(text + outofs, text + inofs,
not_url_len + long_url_len);
outofs += not_url_len + long_url_len;
} else {
- // copy the unmodified block
+ /* copy the unmodified block */
strncpy(text + outofs, text + inofs, not_url_len);
inofs += not_url_len;
outofs += not_url_len;
- // copy the new url
+ /* copy the new url */
strncpy(text + outofs, url, short_url_len);
inofs += long_url_len;
outofs += short_url_len;
}
- free (url);
+ free(url);
}
- // copy the last block after the last match
+ /* copy the last block after the last match */
if (inofs) {
int tail = inlen - inofs;
if (tail) {
free(ranges);
- (void)pcloseRW(shrink_pid, shrink_pipe);
+ (void)pcloseRWE(shrink_pid, shrink_pipe);
text[outofs] = 0;
dbg("after len=%u\n", outofs);
{ "help", 0, NULL, 'h' },
{ "bash", 0, NULL, 'b' },
{ "dry-run", 0, NULL, 'n' },
+ { "page", 1, NULL, 'g' },
{ "version", 0, NULL, 'v' },
{ }
};
int option;
char *http_proxy;
time_t t;
+ int page_nr;
debug = 0;
rl_bind_key('\t', rl_insert);
parse_configfile(session);
while (1) {
- option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:h",
+ option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:hg:sn",
options, NULL);
if (option == -1)
break;
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);
}
}
+ /*
+ * Show the version to make it easier to determine what
+ * is going on here
+ */
+ if (debug)
+ display_version();
+
if (session->action == ACTION_UNKNOWN) {
fprintf(stderr, "Unknown action, valid actions are:\n");
- fprintf(stderr, "'update', 'friends', 'public', 'replies' or 'user'.\n");
+ fprintf(stderr, "'update', 'friends', 'public', "
+ "'replies' or 'user'.\n");
goto exit;
}
session->tweet = zalloc(strlen(tweet) + 10);
if (session->bash)
- sprintf(session->tweet, "$ %s", tweet);
+ sprintf(session->tweet, "%c %s", getuid() ? '$' : '#', tweet);
else
sprintf(session->tweet, "%s", 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("host = %d\n", session->host);
ToastFreeware / gregoa / bti.git / blobdiff