Merge branch 'fix-retweet' of https://github.com/agimenez/bti into agimenez-fix-retweet
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:45:38 +0000 (15:45 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Feb 2011 23:45:38 +0000 (15:45 -0800)
1  2 
bti.c

diff --combined bti.c
index 18b8116c56d576754e8bb307450d59e2335a068c,72cc953589ed8d211459156f44b05b7bd51a8571..93b32a301bddadc15bbbd420060fba6753dc90ee
--- 1/bti.c
--- 2/bti.c
+++ b/bti.c
@@@ -284,8 -284,8 +284,8 @@@ static CURL *curl_init(void
  }
  
  /* 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);
@@@ -1119,7 -1119,6 +1119,6 @@@ int main(int argc, char *argv[], char *
        struct session *session;
        pid_t child;
        char *tweet;
-       char *retweet;
        static char password[80];
        int retval = 0;
        int option;
  
        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:G:sr:nVvw:",
                                          options, NULL);
                if (option == -1)
                        break;
        }
  
        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);
        }