X-Git-Url: https://git.toastfreeware.priv.at/gregoa/bti.git/blobdiff_plain/f9408faf1b437a34af1e0e4ed464a7a5a181ddf8..a03d5f2cf2ae11fa03f642547bcd3c169e6c9dda:/bti.c

diff --git a/bti.c b/bti.c
index 201d56f..4bf6a6c 100644
--- a/bti.c
+++ b/bti.c
@@ -82,6 +82,7 @@ struct session {
 	char *group;
 	char *hosturl;
 	char *hostname;
+	char *configfile;
 	int bash;
 	int interactive;
 	int shrink_urls;
@@ -116,6 +117,7 @@ static void display_help(void)
 	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");
@@ -234,7 +236,6 @@ static struct session *session_alloc(void)
 	session = zalloc(sizeof(*session));
 	if (!session)
 		return NULL;
-	session_readline_init(session);
 	return session;
 }
 
@@ -242,7 +243,6 @@ static void session_free(struct session *session)
 {
 	if (!session)
 		return;
-	session_readline_cleanup(session);
 	free(session->password);
 	free(session->account);
 	free(session->tweet);
@@ -253,6 +253,7 @@ static void session_free(struct session *session)
 	free(session->group);
 	free(session->hosturl);
 	free(session->hostname);
+	free(session->configfile);
 	free(session);
 }
 
@@ -553,12 +554,7 @@ static void parse_configfile(struct session *session)
 	char *file;
 	int shrink_urls = 0;
 
-	/* config file is ~/.bti  */
-	file = alloca(strlen(session->homedir) + 7);
-
-	sprintf(file, "%s/.bti", session->homedir);
-
-	config_file = fopen(file, "r");
+	config_file = fopen(session->configfile, "r");
 
 	/* No error if file does not exist or is unreadable.  */
 	if (config_file == NULL)
@@ -710,7 +706,8 @@ static void log_session(struct session *session, int retval)
 				session->time, session->hostname);
 		else
 			fprintf(log_file, "%s: host=%s tweet=%s\n",
-				session->time, session->hostname, session->tweet);
+				session->time, session->hostname,
+				session->tweet);
 		break;
 	case ACTION_FRIENDS:
 		fprintf(log_file, "%s: host=%s retrieving friends timeline\n",
@@ -1063,6 +1060,7 @@ int main(int argc, char *argv[], char *envp[])
 		{ "dry-run", 0, NULL, 'n' },
 		{ "page", 1, NULL, 'g' },
 		{ "version", 0, NULL, 'v' },
+		{ "config", 1, NULL, 'c' },
 		{ }
 	};
 	struct session *session;
@@ -1089,8 +1087,13 @@ int main(int argc, char *argv[], char *envp[])
 	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"));
 
+	/* set up a default config file location (traditionally ~/.bti) */
+	session->configfile = zalloc(strlen(session->homedir) + 7);
+	sprintf(session->configfile, "%s/.bti", session->homedir);
+
 	curl_global_init(CURL_GLOBAL_ALL);
 
 	/* Set environment variables first, before reading command line options
@@ -1106,7 +1109,7 @@ int main(int argc, char *argv[], char *envp[])
 	parse_configfile(session);
 
 	while (1) {
-		option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:hg:G:snVv",
+		option = getopt_long_only(argc, argv, "dp:P:H:a:A:u:c:hg:G:snVv",
 					  options, NULL);
 		if (option == -1)
 			break;
@@ -1202,6 +1205,18 @@ int main(int argc, char *argv[], char *envp[])
 		case 'b':
 			session->bash = 1;
 			break;
+		case 'c':
+			if (session->configfile)
+				free(session->configfile);
+			session->configfile = strdup(optarg);
+			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...
+			 */
+			parse_configfile(session);
+			break;
 		case 'h':
 			display_help();
 			goto exit;
@@ -1217,6 +1232,7 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
+	session_readline_init(session);
 	/*
 	 * Show the version to make it easier to determine what
 	 * is going on here
@@ -1280,6 +1296,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (session->page == 0)
 		session->page = 1;
+	dbg("config file = %s\n", session->configfile);
 	dbg("account = %s\n", session->account);
 	dbg("password = %s\n", session->password);
 	dbg("host = %d\n", session->host);
@@ -1302,6 +1319,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	log_session(session, retval);
 exit:
+	session_readline_cleanup(session);
 	session_free(session);
 	return retval;;
 }