Merge branch 'master' into gregoa

[gregoa/bti.git] / bti.c

diff --git a/bti.c b/bti.c
index a8fb97b5f4d3738201fa4a040046d3df759558de..db9cadc8043f1cd5e23c539a077770d760a5086f 100644 (file)
--- a/bti.c
+++ b/bti.c
@@ -1,7 +1,7 @@
 /*
 /*

- * Copyright (C) 2008 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 Bart Trojanowski <bart@jukie.net>

- * Copyright (C) 2009 Amir Mohammad Saied <amirsaied@gmail.com>
+ * Copyright (C) 2009-2010 Amir Mohammad Saied <amirsaied@gmail.com>

  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the


@@ -32,6 +32,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <curl/curl.h>

 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>


@@ -39,7 +40,7 @@
 #include <termios.h>
 #include <dlfcn.h>
 #include <oauth.h>
 #include <termios.h>
 #include <dlfcn.h>
 #include <oauth.h>

-
+#include "bti.h"

 
 #define zalloc(size)   calloc(size, 1)
 
 
 #define zalloc(size)   calloc(size, 1)
 


@@ -51,75 +52,37 @@
        } while (0)
 
 
        } 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_UNKNOWN = 32
-};
-
-struct session {
-       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;
-       int bash;
-       int interactive;
-       int shrink_urls;
-       int dry_run;
-       int page;
-       enum host host;
-       enum action action;
-       void *readline_handle;
-       char *(*readline)(const char *);
-};
+int debug;

 
 static void display_help(void)
 {
 
 static void display_help(void)
 {

-       fprintf(stdout, "bti - send tweet to twitter or identi.ca\n");
-       fprintf(stdout, "Version: " VERSION "\n");
-       fprintf(stdout, "Usage:\n");
-       fprintf(stdout, "  bti [options]\n");
-       fprintf(stdout, "options are:\n");
-       fprintf(stdout, "  --action action\n");
-       fprintf(stdout, "    ('update', 'friends', 'public', 'replies', "
-               "'group' or 'user')\n");
-       fprintf(stdout, "  --user screenname\n");
-       fprintf(stdout, "  --group groupname\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, "  --debug\n");
-       fprintf(stdout, "  --verbose\n");
-       fprintf(stdout, "  --dry-run\n");
-       fprintf(stdout, "  --version\n");
-       fprintf(stdout, "  --help\n");
+       fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
+               "Version: %s\n"
+               "Usage:\n"
+               "  bti [options]\n"
+               "options are:\n"
+               "  --account accountname\n"
+               "  --password password\n"
+               "  --action action\n"
+               "    ('update', 'friends', 'public', 'replies', or 'user')\n"
+               "  --user screenname\n"
+               "  --group groupname\n"
+               "  --proxy PROXY:PORT\n"
+               "  --host HOST\n"
+               "  --logfile logfile\n"
+               "  --config configfile\n"
+               "  --replyto ID\n"
+               "  --retweet ID\n"
+               "  --shrink-urls\n"
+               "  --page PAGENUMBER\n"
+               "  --column COLUMNWIDTH\n"
+               "  --bash\n"
+               "  --background\n"
+               "  --debug\n"
+               "  --verbose\n"
+               "  --dry-run\n"
+               "  --version\n"
+               "  --help\n", VERSION);

 }
 
 static void display_version(void)
 }
 
 static void display_version(void)


@@ -154,7 +117,7 @@ static char *get_string(const char *name)
  * 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
  * 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.
  * 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.


@@ -237,6 +200,10 @@ static void session_free(struct session *session)
 {
        if (!session)
                return;
 {
        if (!session)
                return;

+       free(session->retweet);
+       free(session->replyto);
+       free(session->password);
+       free(session->account);

        free(session->consumer_key);
        free(session->consumer_secret);
        free(session->access_token_key);
        free(session->consumer_key);
        free(session->consumer_secret);
        free(session->access_token_key);


@@ -253,30 +220,91 @@ static void session_free(struct session *session)
        free(session);
 }
 
        free(session);
 }
 

-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 *mentions_uri = "/mentions.xml";
-//static const char *group_uri = "/../laconica/groups/timeline/";
-
-static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
+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);
+}
+
+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 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 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 mentions_uri[] = "/mentions.xml";
+static const char replies_uri[]  = "/replies.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;
+
+       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;
+}
+
+/* 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;
        xmlChar *created = NULL;
 {
        xmlChar *text = NULL;
        xmlChar *user = NULL;
        xmlChar *created = NULL;

+       xmlChar *id = NULL;

        xmlNodePtr userinfo;
 
        current = current->xmlChildrenNode;
        xmlNodePtr userinfo;
 
        current = current->xmlChildrenNode;


@@ -286,6 +314,8 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
                                created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                        if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
                                text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
                                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 *)"id"))
+                               id = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);

                        if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
                                userinfo = current->xmlChildrenNode;
                                while (userinfo != NULL) {
                        if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
                                userinfo = current->xmlChildrenNode;
                                while (userinfo != NULL) {


@@ -298,19 +328,17 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
                                }
                        }
 
                                }
                        }
 

-                       if (user && text && created) {
-                               if (verbose)
-                                       printf("[%s] (%.16s) %s\n",
-                                               user, created, text);
-                               else
-                                       printf("[%s] %s\n",
-                                               user, text);
+                       if (user && text && created && id) {
+                               bti_output_line(session, user, id,
+                                               created, text);

                                xmlFree(user);
                                xmlFree(text);
                                xmlFree(created);
                                xmlFree(user);
                                xmlFree(text);
                                xmlFree(created);

+                               xmlFree(id);

                                user = NULL;
                                text = NULL;
                                created = NULL;
                                user = NULL;
                                text = NULL;
                                created = NULL;

+                               id = NULL;

                        }
                }
                current = current->next;
                        }
                }
                current = current->next;


@@ -319,7 +347,7 @@ static void parse_statuses(xmlDocPtr doc, xmlNodePtr current)
        return;
 }
 
        return;
 }
 

-static void parse_timeline(char *document)
+static void parse_timeline(char *document, struct session *session)

 {
        xmlDocPtr doc;
        xmlNodePtr current;
 {
        xmlDocPtr doc;
        xmlNodePtr current;


@@ -345,7 +373,7 @@ static void parse_timeline(char *document)
        current = current->xmlChildrenNode;
        while (current != NULL) {
                if ((!xmlStrcmp(current->name, (const xmlChar *)"status")))
        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);
                current = current->next;
        }
        xmlFreeDoc(doc);


@@ -353,6 +381,34 @@ static void parse_timeline(char *document)
        return;
 }
 
        return;
 }
 

+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;
+       char *temp;
+
+       if ((!buffer) || (!buffer_size) || (!curl_buf))
+               return -EINVAL;
+
+       /* add to the data we already have */
+       temp = zalloc(curl_buf->length + buffer_size + 1);
+       if (!temp)
+               return -ENOMEM;
+
+       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, curl_buf->session);
+
+       dbg("%s\n", curl_buf->data);
+
+       return buffer_size;
+}
+

 static int parse_osp_reply(const char *reply, char **token, char **secret)
 {
        int rc;
 static int parse_osp_reply(const char *reply, char **token, char **secret)
 {
        int rc;


@@ -361,37 +417,41 @@ static int parse_osp_reply(const char *reply, char **token, char **secret)
        rc = oauth_split_url_parameters(reply, &rv);
        qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
        if (rc == 2 || rc == 4) {
        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 (!strncmp(rv[0], "oauth_token=", 11) &&
+                   !strncmp(rv[1], "oauth_token_secret=", 18)) {

                        if (token)
                        if (token)

-                               *token =strdup(&(rv[0][12]));
+                               *token = strdup(&(rv[0][12]));

                        if (secret)
                        if (secret)

-                               *secret=strdup(&(rv[1][19]));
+                               *secret = strdup(&(rv[1][19]));

 
                        retval = 0;
                }
        } else if (rc == 3) {
 
                        retval = 0;
                }
        } else if (rc == 3) {

-               if (!strncmp(rv[1],"oauth_token=",11) && !strncmp(rv[2],"oauth_token_secret=",18)) {
+               if (!strncmp(rv[1], "oauth_token=", 11) &&
+                   !strncmp(rv[2], "oauth_token_secret=", 18)) {

                        if (token)
                        if (token)

-                               *token =strdup(&(rv[1][12]));
+                               *token = strdup(&(rv[1][12]));

                        if (secret)
                        if (secret)

-                               *secret=strdup(&(rv[2][19]));
+                               *secret = strdup(&(rv[2][19]));

 
                        retval = 0;
                }
        }
 
 
                        retval = 0;
                }
        }
 

+       dbg("token: %s\n", *token);
+       dbg("secret: %s\n", *secret);
+

        if (rv)
                free(rv);
 
        return retval;
 }
        if (rv)
                free(rv);
 
        return retval;
 }

-       

 
 static int request_access_token(struct session *session)
 {
        char *post_params = NULL;
        char *request_url = NULL;
 
 static int request_access_token(struct session *session)
 {
        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;
        char *at_key      = NULL;
        char *at_secret   = NULL;
        char *verifier    = NULL;


@@ -426,21 +486,25 @@ static int request_access_token(struct session *session)
 
        free(reply);
 
 
        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");
+       fprintf(stdout,
+               "Please open the following link in your browser, and "
+               "allow 'bti' to access your account. Then paste "
+               "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);
        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);
+               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);
        } 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);
+               sprintf(at_uri, "%s?oauth_verifier=%s",
+                       identica_access_token_uri, verifier);

        }
        request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,
        }
        request_url = oauth_sign_url2(at_uri, NULL, OA_HMAC, NULL,

-                       session->consumer_key, session->consumer_secret, at_key,
-                       at_secret);
+                                     session->consumer_key,
+                                     session->consumer_secret,
+                                     at_key, at_secret);

        reply = oauth_http_get(request_url, post_params);
 
        if (!reply)
        reply = oauth_http_get(request_url, post_params);
 
        if (!reply)


@@ -451,10 +515,12 @@ static int request_access_token(struct session *session)
 
        free(reply);
 
 
        free(reply);
 

-       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);
+       fprintf(stdout,
+               "Please put these two lines in your bti "
+               "configuration file (~/.bti):\n"
+               "access_token_key=%s\n"
+               "access_token_secret=%s\n",
+               at_key, at_secret);

 
        return 0;
 }
 
        return 0;
 }


@@ -462,9 +528,18 @@ static int request_access_token(struct session *session)
 static int send_request(struct session *session)
 {
        char endpoint[500];
 static int send_request(struct session *session)
 {
        char endpoint[500];

+       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 *req_url = NULL;
        char *reply = NULL;
        char *postarg = NULL;
        char *req_url = NULL;
        char *reply = NULL;
        char *postarg = NULL;

+       char *escaped_tweet = NULL;

        int is_post = 0;
 
        if (!session)
        int is_post = 0;
 
        if (!session)


@@ -473,208 +548,227 @@ static int send_request(struct session *session)
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 
        if (!session->hosturl)
                session->hosturl = strdup(twitter_host);
 

-       switch (session->action) {
-       case ACTION_UPDATE:
-               sprintf(endpoint, "%s%s?status=%s", session->hosturl, update_uri, session->tweet);
-               is_post = 1;
-               break;
-       case ACTION_USER:
-               sprintf(endpoint, "%s%s", session->hosturl, user_uri);
-               break;
-       case ACTION_REPLIES:
-               sprintf(endpoint, "%s%s", session->hosturl, mentions_uri);
-               break;
-       case ACTION_PUBLIC:
-               sprintf(endpoint, "%s%s", session->hosturl, public_uri);
-               break;
-       case ACTION_GROUP:
-       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->no_oauth || session->guest) {
+               curl_buf = bti_curl_buffer_alloc(session->action);
+               if (!curl_buf)
+                       return -ENOMEM;
+               curl_buf->session = session;

 
 

-       if (req_url)
-               free(req_url);
+               curl = curl_init();
+               if (!curl)
+                       return -EINVAL;

 
 

-       parse_timeline(reply);
+               if (!session->hosturl)
+                       session->hosturl = strdup(twitter_host);

 
 

-       return 0;
-}
+               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);
+
+                       if (session->replyto)
+                               curl_formadd(&formpost, &lastptr,
+                                            CURLFORM_COPYNAME,
+                                            "in_reply_to_status_id",
+                                            CURLFORM_COPYCONTENTS,
+                                            session->replyto,
+                                            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;

 
 

-static void parse_configfile(struct session *session)
-{
-       FILE *config_file;
-       char *line = NULL;
-       size_t len = 0;
-       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;
-       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;
+               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);
+                       break;

 
 

-       do {
-               ssize_t n = getline(&line, &len, config_file);
-               if (n < 0)
+               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);

                        break;
                        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, "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, "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;
-               }
-       } while (!feof(config_file));
-
-       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);
+               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);
+                       break;
+
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+                       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);
+                       break;
+
+               default:
+                       break;

                }
                }

-               free(host);
-       }
-       if (proxy) {
+

                if (session->proxy)
                if (session->proxy)

-                       free(session->proxy);
-               session->proxy = proxy;
-       }
-       if (logfile)
-               session->logfile = logfile;
-       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;
+                       curl_easy_setopt(curl, CURLOPT_PROXY, session->proxy);
+
+               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 (!session->background) {
+                               xmlDocPtr doc;
+                               xmlNodePtr current;
+
+                               if (res) {
+                                       fprintf(stderr, "error(%d) trying to "
+                                               "perform operation\n", res);
+                                       return -EINVAL;
+                               }
+
+                               doc = xmlReadMemory(curl_buf->data,
+                                                   curl_buf->length,
+                                                   "response.xml", NULL,
+                                                   XML_PARSE_NOERROR);
+                               if (doc == NULL)
+                                       return -EINVAL;
+
+                               current = xmlDocGetRootElement(doc);
+                               if (current == NULL) {
+                                       fprintf(stderr, "empty document\n");
+                                       xmlFreeDoc(doc);
+                                       return -EINVAL;
+                               }
+
+                               if (xmlStrcmp(current->name, (const xmlChar *)"status")) {
+                                       fprintf(stderr, "unexpected document type\n");
+                                       xmlFreeDoc(doc);
+                                       return -EINVAL;
+                               }
+
+                               xmlFreeDoc(doc);
+                       }
+               }
+
+               curl_easy_cleanup(curl);
+               if (session->action == ACTION_UPDATE)
+                       curl_formfree(formpost);
+               bti_curl_buffer_free(curl_buf);
+       } else {
+               switch (session->action) {
+               case ACTION_UPDATE:
+                       escaped_tweet = oauth_url_escape(session->tweet);
+                       if (session->replyto) {
+                               sprintf(endpoint,
+                                       "%s%s?status=%s&in_reply_to_status_id=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet, session->replyto);
+                       } else {
+                               sprintf(endpoint, "%s%s?status=%s",
+                                       session->hosturl, update_uri,
+                                       escaped_tweet);
+                       }
+
+                       is_post = 1;
+                       break;
+               case ACTION_USER:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, user_uri, session->user,
+                               session->page);
+                       break;
+               case ACTION_REPLIES:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               mentions_uri, session->page);
+                       break;
+               case ACTION_PUBLIC:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               public_uri, session->page);
+                       break;
+               case ACTION_GROUP:
+                       sprintf(endpoint, "%s%s%s.xml?page=%d",
+                               session->hosturl, group_uri, session->group,
+                               session->page);
+                       break;
+               case ACTION_FRIENDS:
+                       sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+                               friends_uri, session->page);
+                       break;
+               case ACTION_RETWEET:
+                       sprintf(endpoint, "%s%s%s.xml", session->hosturl,
+                               retweet_uri, session->retweet);
+                       is_post = 1;
+                       break;
+               default:
+                       break;
+               }
+
+               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);
+               }

 
 

-       /* Free buffer and close file.  */
-       free(line);
-       fclose(config_file);
+               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, session);
+       }
+       return 0;

 }
 
 static void log_session(struct session *session, int retval)
 }
 
 static void log_session(struct session *session, int retval)


@@ -749,6 +843,32 @@ static char *get_string_from_stdin(void)
        return string;
 }
 
        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 int find_urls(const char *tweet, int **pranges)
 {
        /*


@@ -1016,6 +1136,8 @@ int main(int argc, char *argv[], char *envp[])
        static const struct option options[] = {
                { "debug", 0, NULL, 'd' },
                { "verbose", 0, NULL, 'V' },
        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' },
                { "host", 1, NULL, 'H' },
                { "proxy", 1, NULL, 'P' },
                { "action", 1, NULL, 'A' },


@@ -1025,23 +1147,29 @@ int main(int argc, char *argv[], char *envp[])
                { "shrink-urls", 0, NULL, 's' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },
                { "shrink-urls", 0, NULL, 's' },
                { "help", 0, NULL, 'h' },
                { "bash", 0, NULL, 'b' },

+               { "background", 0, NULL, 'B' },

                { "dry-run", 0, NULL, 'n' },
                { "page", 1, NULL, 'g' },
                { "dry-run", 0, NULL, 'n' },
                { "page", 1, NULL, 'g' },

+               { "column", 1, NULL, 'o' },

                { "version", 0, NULL, 'v' },
                { "config", 1, NULL, 'c' },
                { "version", 0, NULL, 'v' },
                { "config", 1, NULL, 'c' },

+               { "replyto", 1, NULL, 'r' },
+               { "retweet", 1, NULL, 'w' },

                { }
        };
        struct session *session;
        pid_t child;
        char *tweet;
                { }
        };
        struct session *session;
        pid_t child;
        char *tweet;

+       static char password[80];

        int retval = 0;
        int option;
        char *http_proxy;
        int retval = 0;
        int option;
        char *http_proxy;

+       char *home;
+       const char *config_file;

        time_t t;
        int page_nr;
 
        debug = 0;
        time_t t;
        int page_nr;
 
        debug = 0;

-       verbose = 0;

 
        session = session_alloc();
        if (!session) {
 
        session = session_alloc();
        if (!session) {


@@ -1054,12 +1182,23 @@ int main(int argc, char *argv[], char *envp[])
        session->time = strdup(ctime(&t));
        session->time[strlen(session->time)-1] = 0x00;
 
        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) */
 
        /* 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. */
 
        /* Set environment variables first, before reading command line options
         * or config file values. */


@@ -1071,10 +1210,11 @@ int main(int argc, char *argv[], char *envp[])
                dbg("http_proxy = %s\n", session->proxy);
        }
 
                dbg("http_proxy = %s\n", session->proxy);
        }
 

-       parse_configfile(session);
+       bti_parse_configfile(session);

 
        while (1) {
 
        while (1) {

-               option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:snVv",
+               option = getopt_long_only(argc, argv,
+                                         "dp:P:H:a:A:u:c:hg:o:G:sr:nVvw:",

                                          options, NULL);
                if (option == -1)
                        break;
                                          options, NULL);
                if (option == -1)
                        break;


@@ -1083,13 +1223,37 @@ int main(int argc, char *argv[], char *envp[])
                        debug = 1;
                        break;
                case 'V':
                        debug = 1;
                        break;
                case 'V':

-                       verbose = 1;
+                       session->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;
                        break;
                case 'g':
                        page_nr = atoi(optarg);
                        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);
+                       break;
+               case 'w':
+                       session->retweet = strdup(optarg);
+                       dbg("Retweet ID = %s\n", session->retweet);
+                       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 'P':
                        if (session->proxy)
                                free(session->proxy);


@@ -1109,6 +1273,8 @@ int main(int argc, char *argv[], char *envp[])
                                session->action = ACTION_PUBLIC;
                        else if (strcasecmp(optarg, "group") == 0)
                                session->action = ACTION_GROUP;
                                session->action = ACTION_PUBLIC;
                        else if (strcasecmp(optarg, "group") == 0)
                                session->action = ACTION_GROUP;

+                       else if (strcasecmp(optarg, "retweet") == 0)
+                               session->action = ACTION_RETWEET;

                        else
                                session->action = ACTION_UNKNOWN;
                        dbg("action = %d\n", session->action);
                        else
                                session->action = ACTION_UNKNOWN;
                        dbg("action = %d\n", session->action);


@@ -1157,6 +1323,9 @@ int main(int argc, char *argv[], char *envp[])
                        break;
                case 'b':
                        session->bash = 1;
                        break;
                case 'b':
                        session->bash = 1;

+                       /* fall-through intended */
+               case 'B':
+                       session->background = 1;

                        break;
                case 'c':
                        if (session->configfile)
                        break;
                case 'c':
                        if (session->configfile)


@@ -1165,10 +1334,11 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("configfile = %s\n", session->configfile);
 
                        /*
                        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...
+                        * 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);
+                       bti_parse_configfile(session);

                        break;
                case 'h':
                        display_help();
                        break;
                case 'h':
                        display_help();


@@ -1193,25 +1363,54 @@ int main(int argc, char *argv[], char *envp[])
        if (debug)
                display_version();
 
        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->host == HOST_TWITTER) {
+               if (!session->consumer_key || !session->consumer_secret) {
+                       if (session->action == ACTION_USER ||
+                                       session->action == ACTION_PUBLIC) {
+                               /*
+                                * Some actions may still work without
+                                * authentication
+                                */
+                               session->guest = 1;
+                       } else {
+                               fprintf(stderr,
+                                               "Twitter no longer supports HTTP basic authentication.\n"
+                                               "Both consumer key, and consumer secret are required"
+                                               " for bti in order to behave as an OAuth consumer.\n");
+                               goto exit;
+                       }
+               }
+               if (session->action == ACTION_GROUP) {
+                       fprintf(stderr, "Groups only work in Identi.ca.\n");
+                       goto exit;
+               }
+       } else {
+               if (!session->consumer_key || !session->consumer_secret)
+                       session->no_oauth = 1;

        }
 
        }
 

-       if (session->action == ACTION_UNKNOWN) {
-               fprintf(stderr, "Unknown action, valid actions are:\n");
-               fprintf(stderr, "'update', 'friends', 'public', "
-                       "'replies', 'group' or 'user'.\n");
-               goto exit;
+       if (session->no_oauth) {
+               if (!session->account) {
+                       fprintf(stdout, "Enter account for %s: ",
+                               session->hostname);
+                       session->account = session->readline(NULL);
+               }
+               if (!session->password) {
+                       read_password(password, sizeof(password),
+                                     session->hostname);
+                       session->password = strdup(password);
+               }
+       } else if (!session->guest) {
+               if (!session->access_token_key ||
+                   !session->access_token_secret) {
+                       request_access_token(session);
+                       goto exit;
+               }

        }
 
        }
 

-       if (session->host == HOST_TWITTER && session->action == ACTION_GROUP) {
-               fprintf(stderr, "Groups only work in Identi.ca.\n");
+       if (session->action == ACTION_UNKNOWN) {
+               fprintf(stderr, "Unknown action, valid actions are:\n"
+                       "'update', 'friends', 'public', 'replies', 'group' or 'user'.\n");

                goto exit;
        }
 
                goto exit;
        }
 


@@ -1220,8 +1419,27 @@ int main(int argc, char *argv[], char *envp[])
                session->group = session->readline(NULL);
        }
 
                session->group = session->readline(NULL);
        }
 

+       if (session->action == ACTION_RETWEET) {
+               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 (!session->retweet || strlen(session->retweet) == 0) {
+                       dbg("no retweet?\n");
+                       return -1;
+               }
+
+               dbg("retweet ID = %s\n", session->retweet);
+       }
+

        if (session->action == ACTION_UPDATE) {
        if (session->action == ACTION_UPDATE) {

-               if (session->bash || !session->interactive)
+               if (session->background || !session->interactive)

                        tweet = get_string_from_stdin();
                else
                        tweet = session->readline("tweet: ");
                        tweet = get_string_from_stdin();
                else
                        tweet = session->readline("tweet: ");


@@ -1253,7 +1471,7 @@ int main(int argc, char *argv[], char *envp[])
        /* fork ourself so that the main shell can get on
         * with it's life as we try to connect and handle everything
         */
        /* fork ourself so that the main shell can get on
         * with it's life as we try to connect and handle everything
         */

-       if (session->bash) {
+       if (session->background) {

                child = fork();
                if (child) {
                        dbg("child is %d\n", child);
                child = fork();
                if (child) {
                        dbg("child is %d\n", child);


@@ -1262,7 +1480,7 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        retval = send_request(session);
        }
 
        retval = send_request(session);

-       if (retval && !session->bash)
+       if (retval && !session->background)

                fprintf(stderr, "operation failed\n");
 
        log_session(session, retval);
                fprintf(stderr, "operation failed\n");
 
        log_session(session, retval);