From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Feb 2011 23:47:29 +0000 (-0800)
Subject: Merge branch 'fix-segfault-invalid-host' of https://github.com/agimenez/bti into... 
X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/commitdiff_plain/0b6b14f8523b6d14af373ce66e610093b2297dc8?hp=-c

Merge branch 'fix-segfault-invalid-host' of https://github.com/agimenez/bti into agimenez-fix-segfault-invalid-host
---

0b6b14f8523b6d14af373ce66e610093b2297dc8
diff --combined bti.c
index 93b32a3,17a2a93..9fb5f54
--- a/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);
@@@ -724,6 -724,11 +724,11 @@@ static int send_request(struct session 
  				free(req_url);
  		}
  
+ 		if (!reply) {
+ 			fprintf(stderr, "Error retrieving from URL (%s)\n", endpoint);
+ 			return 1;
+ 		}
+ 
  		if ((session->action != ACTION_UPDATE) &&
  				(session->action != ACTION_RETWEET))
  			parse_timeline(reply, session);
@@@ -1119,6 -1124,7 +1124,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;
@@@ -1160,7 -1166,7 +1165,7 @@@
  
  	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;
@@@ -1359,21 -1365,17 +1364,21 @@@
  	}
  
  	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);
  	}