static int debug = 0;
+enum host {
+ HOST_TWITTER = 0,
+ HOST_IDENTICA = 1,
+};
+
struct session {
char *password;
char *account;
char *tweet;
- int quiet;
+ char *proxy;
+ int bash;
+ enum host host;
};
struct bti_curl_buffer {
fprintf(stdout, "options are:\n");
fprintf(stdout, " --account accountname\n");
fprintf(stdout, " --password password\n");
+ fprintf(stdout, " --proxy PROXY:PORT\n");
+ fprintf(stdout, " --host HOST\n");
fprintf(stdout, " --bash\n");
- fprintf(stdout, " --quiet\n");
fprintf(stdout, " --debug\n");
+ fprintf(stdout, " --version\n");
fprintf(stdout, " --help\n");
}
+static void display_version(void)
+{
+ fprintf(stdout, "bti - version %s\n", BTI_VERSION);
+}
+
static char *get_string_from_stdin(void)
{
char *temp;
char *string;
- string = zalloc(100);
+ string = zalloc(1000);
if (!string)
return NULL;
- if (!fgets(string, 99, stdin))
+ if (!fgets(string, 999, stdin))
return NULL;
temp = strchr(string, '\n');
*temp = '\0';
free(session->password);
free(session->account);
free(session->tweet);
+ free(session->proxy);
free(session);
}
}
static const char *twitter_url = "https://twitter.com/statuses/update.xml";
+static const char *identica_url = "http://identi.ca/api/statuses/update.xml";
static CURL *curl_init(void)
{
CURLcode res;
struct curl_httppost *formpost = NULL;
struct curl_httppost *lastptr = NULL;
+ struct curl_slist *slist = NULL;
if (!session)
return -EINVAL;
CURLFORM_END);
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
- curl_easy_setopt(curl, CURLOPT_URL, twitter_url);
+
+ switch (session->host) {
+ case HOST_TWITTER:
+ curl_easy_setopt(curl, CURLOPT_URL, twitter_url);
+ /*
+ * twitter doesn't like the "Expect: 100-continue" header
+ * anymore, so turn it off.
+ */
+ slist = curl_slist_append(slist, "Expect:");
+ curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
+ break;
+ case HOST_IDENTICA:
+ curl_easy_setopt(curl, CURLOPT_URL, identica_url);
+ break;
+ }
+
+ if (session->proxy)
+ curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+
if (debug)
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
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);
res = curl_easy_perform(curl);
- if (res) {
- printf("error(%d) trying to send tweet\n", res);
+ if (res && !session->bash) {
+ fprintf(stderr, "error(%d) trying to send tweet\n", res);
return -EINVAL;
}
size_t len = 0;
char *account = NULL;
char *password = NULL;
+ char *host = NULL;
+ char *proxy = NULL;
char *file;
char *home = getenv("HOME");
c += 9;
if (c[0] != '\0')
password = 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);
}
} while (!feof(config_file));
if (password)
session->password = password;
if (account)
- session->account= account;
+ session->account = account;
+ if (host) {
+ if (strcasecmp(host, "twitter") == 0)
+ session->host = HOST_TWITTER;
+ if (strcasecmp(host, "identica") == 0)
+ session->host = HOST_IDENTICA;
+ free(host);
+ }
+ if (proxy)
+ session->proxy = proxy;
/* Free buffer and close file. */
free(line);
{ "debug", 0, NULL, 'd' },
{ "account", 1, NULL, 'a' },
{ "password", 1, NULL, 'p' },
- { "bash", 1, NULL, 'b' },
+ { "host", 1, NULL, 'H' },
{ "help", 0, NULL, 'h' },
- { "quiet", 0, NULL, 'q' },
+ { "bash", 0, NULL, 'b' },
+ { "version", 0, NULL, 'v' },
{ }
};
struct session *session;
char *tweet;
int retval;
int option;
-
+#if 0
+ char *home = getenv("HOME");
+ char *pwd = getenv("PWD");
+ char *dir;
+#endif
session = session_alloc();
if (!session) {
fprintf(stderr, "no more memory...\n");
parse_configfile(session);
while (1) {
- option = getopt_long_only(argc, argv, "dqe:p:a:h",
+ option = getopt_long_only(argc, argv, "dqe:p:H:a:h",
options, NULL);
if (option == -1)
break;
session->password = strdup(optarg);
dbg("password = %s\n", session->password);
break;
- case 'q':
- session->quiet = 1;
+ case 'H':
+ if (strcasecmp(optarg, "twitter") == 0)
+ session->host = HOST_TWITTER;
+ if (strcasecmp(optarg, "identica") == 0)
+ session->host = HOST_IDENTICA;
+ dbg("host = %d\n", session->host);
+ break;
+ case 'b':
+ session->bash= 1;
break;
case 'h':
display_help();
goto exit;
+ case 'v':
+ display_version();
+ goto exit;
default:
display_help();
goto exit;
fprintf(stdout, "Enter twitter password: ");
session->password = get_string_from_stdin();
}
-
- /* Add the "$ " to the start of the tweet to show it's coming from
- * a shell */
+#if 0
+ /* get the current working directory basename */
+ if (strcmp(pwd, home) == 0)
+ dir = "~";
+ else {
+ dir = strrchr(pwd, '/');
+ if (dir)
+ dir++;
+ else
+ dir = "?";
+ }
+#endif
tweet = get_string_from_stdin();
- session->tweet = zalloc(strlen(tweet) + 10);
- sprintf(session->tweet, "$ %s", tweet);
- free(tweet);
-
- if (strlen(session->tweet) == 0) {
+ if (!tweet || strlen(tweet) == 0) {
dbg("no tweet?\n");
return -1;
}
+// session->tweet = zalloc(strlen(tweet) + strlen(dir) + 10);
+ session->tweet = zalloc(strlen(tweet) + 10);
+
+ /* if --bash is specified, add the "PWD $ " to
+ * the start of the tweet. */
+ if (session->bash)
+// sprintf(session->tweet, "%s $ %s", dir, tweet);
+ sprintf(session->tweet, "$ %s", tweet);
+ else
+ sprintf(session->tweet, "%s", tweet);
+ free(tweet);
+
dbg("account = %s\n", session->account);
dbg("password = %s\n", session->password);
dbg("tweet = %s\n", session->tweet);
+ dbg("host = %d\n", session->host);
/* fork ourself so that the main shell can get on
* with it's life as we try to connect and handle everything
*/
- child = fork();
- if (child) {
- dbg("child is %d\n", child);
- exit(0);
+ if (session->bash) {
+ child = fork();
+ if (child) {
+ dbg("child is %d\n", child);
+ exit(0);
+ }
}
retval = send_tweet(session);
- if (retval) {
+ if (retval && !session->bash) {
fprintf(stderr, "tweet failed\n");
return -1;
}
ToastFreeware / gregoa / bti.git / blobdiff