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=03e07fdb619f5708c5d015ec080f4d777b405603

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

diff --git a/.gitignore b/.gitignore
index 780cf47..6b1050f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ stamp-h1
 depcomp
 INSTALL
 check-news.in
+tags
+TAGS
diff --git a/bti.c b/bti.c
index 17a2a93..9fb5f54 100644
--- a/bti.c
+++ b/bti.c
@@ -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);
@@ -1124,7 +1124,6 @@ int main(int argc, char *argv[], char *envp[])
 	struct session *session;
 	pid_t child;
 	char *tweet;
-	char *retweet;
 	static char password[80];
 	int retval = 0;
 	int option;
@@ -1166,7 +1165,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	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;
@@ -1365,17 +1364,21 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	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);
 	}
 
diff --git a/config.c b/config.c
index 63b10c2..346fed8 100644
--- a/config.c
+++ b/config.c
@@ -140,7 +140,7 @@ static int get_key(struct session *session, char *line, char **key, char **value
 		 * the value.
 		 */
 	}
-	printf("%s = %s\n", *key, *value);
+	/* printf("%s = %s\n", *key, *value); */
 	return 0;
 }
 
@@ -295,7 +295,7 @@ static struct config_function config_table[] = {
 	{ NULL, NULL }
 };
 
-void process_line(struct session *session, char *key, char *value)
+static void process_line(struct session *session, char *key, char *value)
 {
 	struct config_function *item;
 	int result;
@@ -309,7 +309,10 @@ void process_line(struct session *session, char *key, char *value)
 			break;
 
 		if (strncasecmp(item->key, key, strlen(item->key)) == 0) {
-			printf("calling %p, for key = '%s' and value = '%s'\n", item->callback, key, value);
+			/*
+			 * printf("calling %p, for key = '%s' and value = * '%s'\n",
+			 * 	  item->callback, key, value);
+			 */
 			result = item->callback(session, value);
 			if (!result)
 				return;
@@ -325,7 +328,7 @@ void bti_parse_configfile(struct session *session)
 	char *key = NULL;
 	char *value = NULL;
 	size_t len = 0;
-	size_t n;
+	ssize_t n;
 	char *c;
 
 	config_file = fopen(session->configfile, "r");