Permalink
Browse files

Merge branch 'master' of git://github.com/psykoyiko/bti

  • Loading branch information...
2 parents a844919 + 9745bde commit 03c3babc14f229472896d7ba863ff100f7ea329d @gregkh committed Mar 24, 2009
Showing with 25 additions and 17 deletions.
  1. +25 −17 bti.c
View
42 bti.c
@@ -75,6 +75,7 @@ struct session {
int bash;
int shrink_urls;
int dry_run;
+ int page;
enum host host;
enum action action;
};
@@ -349,12 +350,12 @@ static int send_request(struct session *session)
session->account, session->password);
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL,
- twitter_friends_url);
+ sprintf(user_url, "%s?page=%d", twitter_friends_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL,
- identica_friends_url);
+ sprintf(user_url, "%s?page=%d", identica_friends_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
@@ -363,13 +364,11 @@ static int send_request(struct session *session)
case ACTION_USER:
switch (session->host) {
case HOST_TWITTER:
- sprintf(user_url, "%s%s.xml", twitter_user_url,
- session->user);
+ sprintf(user_url, "%s%s.xml?page=%d", twitter_user_url, session->user, session->page);
curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- sprintf(user_url, "%s%s.xml", identica_user_url,
- session->user);
+ sprintf(user_url, "%s%s.xml?page=%d", identica_user_url, session->user, session->page);
curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
@@ -380,12 +379,12 @@ static int send_request(struct session *session)
session->account, session->password);
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL,
- twitter_replies_url);
+ sprintf(user_url, "%s?page=%d", twitter_replies_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL,
- identica_replies_url);
+ sprintf(user_url, "%s?page=%d", identica_replies_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
@@ -394,12 +393,12 @@ static int send_request(struct session *session)
case ACTION_PUBLIC:
switch (session->host) {
case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL,
- twitter_public_url);
+ sprintf(user_url, "%s?page=%d", twitter_public_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL,
- identica_public_url);
+ sprintf(user_url, "%s?page=%d", identica_public_url, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, user_url);
break;
}
@@ -921,6 +920,7 @@ int main(int argc, char *argv[], char *envp[])
{ "help", 0, NULL, 'h' },
{ "bash", 0, NULL, 'b' },
{ "dry-run", 0, NULL, 'n' },
+ { "page", 1, NULL, 'g' },
{ "version", 0, NULL, 'v' },
{ }
};
@@ -931,6 +931,7 @@ int main(int argc, char *argv[], char *envp[])
int option;
char *http_proxy;
time_t t;
+ int page_nr;
debug = 0;
rl_bind_key('\t', rl_insert);
@@ -963,7 +964,7 @@ int main(int argc, char *argv[], char *envp[])
parse_configfile(session);
while (1) {
- option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:h",
+ option = getopt_long_only(argc, argv, "dqe:p:P:H:a:A:u:hg:",
options, NULL);
if (option == -1)
break;
@@ -977,6 +978,11 @@ int main(int argc, char *argv[], char *envp[])
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;
case 'p':
if (session->password)
free(session->password);
@@ -1087,6 +1093,8 @@ int main(int argc, char *argv[], char *envp[])
if (!session->user)
session->user = strdup(session->account);
+ if (session->page == 0)
+ session->page = 1;
dbg("account = %s\n", session->account);
dbg("password = %s\n", session->password);
dbg("host = %d\n", session->host);

0 comments on commit 03c3bab

Please sign in to comment.