+Summary of changes from v021 to v022
+============================================
+
+Amir Mohammad Saied (2):
+ Support for custom bti installations
+ Updating config example file
+
+Greg Kroah-Hartman (4):
+ add the script to the tarball.
+ fix build warning from time patch.
+ Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/bti
+ Merge branch 'master' of git://github.com/amir/bti
+
+J.R. Mauro (1):
+ bti: show timestamp in statuses
+
+gregor herrmann (1):
+ bti: use ssl for identi.ca
+
+
Summary of changes from v020 to v021
============================================
+++ /dev/null
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure COPYING ChangeLog INSTALL depcomp \
- install-sh missing
+ $(top_srcdir)/configure COPYING ChangeLog depcomp install-sh \
+ missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+bti 022
+=============
+custom identi.ca instances supported
+timestamps on messages read.
+autoconf fixes.
+
bti 021
=============
yet more autoconf fixes
static int debug;
enum host {
- HOST_TWITTER = 0,
+ HOST_TWITTER = 0,
HOST_IDENTICA = 1,
+ HOST_CUSTOM = 2
};
enum action {
- ACTION_UPDATE = 0,
+ ACTION_UPDATE = 0,
ACTION_FRIENDS = 1,
- ACTION_USER = 2,
+ ACTION_USER = 2,
ACTION_REPLIES = 4,
- ACTION_PUBLIC = 8,
+ ACTION_PUBLIC = 8,
ACTION_UNKNOWN = 16
};
char *homedir;
char *logfile;
char *user;
+ char *hosturl;
int bash;
int shrink_urls;
int dry_run;
free(session->time);
free(session->homedir);
free(session->user);
+ free(session->hosturl);
free(session);
}
free(buffer);
}
-static const char *twitter_user_url = "http://twitter.com/statuses/user_timeline/";
-static const char *twitter_update_url = "https://twitter.com/statuses/update.xml";
-static const char *twitter_public_url = "http://twitter.com/statuses/public_timeline.xml";
-static const char *twitter_friends_url = "https://twitter.com/statuses/friends_timeline.xml";
-static const char *twitter_replies_url = "http://twitter.com/statuses/replies.xml";
+static const char *twitter_host = "http://twitter.com/statuses";
+static const char *identica_host = "https://identi.ca/api/statuses";
-static const char *identica_user_url = "http://identi.ca/api/statuses/user_timeline/";
-static const char *identica_update_url = "http://identi.ca/api/statuses/update.xml";
-static const char *identica_public_url = "http://identi.ca/api/statuses/public_timeline.xml";
-static const char *identica_friends_url = "http://identi.ca/api/statuses/friends_timeline.xml";
-static const char *identica_replies_url = "http://identi.ca/api/statuses/replies.xml";
+static const char *user_uri = "/user_timeline/";
+static const char *update_uri = "/update.xml";
+static const char *public_uri = "/public_timeline.xml";
+static const char *friends_uri = "/friends_timeline.xml";
+static const char *replies_uri = "/replies.xml";
static CURL *curl_init(void)
{
{
xmlChar *text = NULL;
xmlChar *user = NULL;
+ xmlChar *created = NULL;
xmlNodePtr userinfo;
current = current->xmlChildrenNode;
while (current != NULL) {
if (current->type == XML_ELEMENT_NODE) {
+ if (!xmlStrcmp(current->name, (const xmlChar *)"created_at"))
+ created = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
if (!xmlStrcmp(current->name, (const xmlChar *)"text"))
text = xmlNodeListGetString(doc, current->xmlChildrenNode, 1);
if (!xmlStrcmp(current->name, (const xmlChar *)"user")) {
userinfo = userinfo->next;
}
}
- if (user && text) {
- printf("[%s] %s\n", user, text);
+
+ if (user && text && created) {
+ printf("[%s] (%.16s) %s\n",
+ user, created, text);
xmlFree(user);
xmlFree(text);
+ xmlFree(created);
user = NULL;
text = NULL;
+ created = NULL;
}
}
current = current->next;
static int send_request(struct session *session)
{
+ char endpoint[100];
char user_password[500];
char data[500];
- /* is there usernames longer than 22 chars? */
- char user_url[70];
struct bti_curl_buffer *curl_buf;
CURL *curl = NULL;
CURLcode res;
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
slist = curl_slist_append(slist, "Expect:");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
- switch (session->host) {
- case HOST_TWITTER:
- curl_easy_setopt(curl, CURLOPT_URL,
- twitter_update_url);
- break;
- case HOST_IDENTICA:
- curl_easy_setopt(curl, CURLOPT_URL,
- identica_update_url);
- break;
- }
+
+ sprintf(endpoint, "%s%s", session->hosturl, update_uri);
+ curl_easy_setopt(curl, CURLOPT_URL, endpoint);
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
break;
case ACTION_FRIENDS:
snprintf(user_password, sizeof(user_password), "%s:%s",
session->account, session->password);
- switch (session->host) {
- case HOST_TWITTER:
- sprintf(user_url, "%s?page=%d", twitter_friends_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- case HOST_IDENTICA:
- sprintf(user_url, "%s?page=%d", identica_friends_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- }
+ sprintf(endpoint, "%s%s?page=%d", session->hosturl,
+ friends_uri, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, endpoint);
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
break;
case ACTION_USER:
- switch (session->host) {
- case HOST_TWITTER:
- 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?page=%d", identica_user_url, session->user, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- }
+ sprintf(endpoint, "%s%s%s.xml?page=%d", session->hosturl, user_uri,
+ session->user, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, endpoint);
break;
case ACTION_REPLIES:
snprintf(user_password, sizeof(user_password), "%s:%s",
session->account, session->password);
- switch (session->host) {
- case HOST_TWITTER:
- sprintf(user_url, "%s?page=%d", twitter_replies_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- case HOST_IDENTICA:
- sprintf(user_url, "%s?page=%d", identica_replies_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- }
+ sprintf(endpoint, "%s%s?page=%d", session->hosturl, replies_uri, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, endpoint);
curl_easy_setopt(curl, CURLOPT_USERPWD, user_password);
break;
case ACTION_PUBLIC:
- switch (session->host) {
- case HOST_TWITTER:
- sprintf(user_url, "%s?page=%d", twitter_public_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- case HOST_IDENTICA:
- sprintf(user_url, "%s?page=%d", identica_public_url, session->page);
- curl_easy_setopt(curl, CURLOPT_URL, user_url);
- break;
- }
+ sprintf(endpoint, "%s%s?page=%d", session->hosturl, public_uri, session->page);
+ curl_easy_setopt(curl, CURLOPT_URL, endpoint);
break;
default:
if (account)
session->account = account;
if (host) {
- if (strcasecmp(host, "twitter") == 0)
+ if (strcasecmp(host, "twitter") == 0) {
session->host = HOST_TWITTER;
- if (strcasecmp(host, "identica") == 0)
+ session->hosturl = strdup(twitter_host);
+ } else if (strcasecmp(host, "identica") == 0) {
session->host = HOST_IDENTICA;
+ session->hosturl = strdup(identica_host);
+ } else {
+ session->host = HOST_CUSTOM;
+ session->hosturl = strdup(host);
+ }
free(host);
}
if (proxy) {
host = "identi.ca";
break;
default:
- host = "unknown";
+ host = session->hosturl;
break;
}
session->shrink_urls = 1;
break;
case 'H':
- if (strcasecmp(optarg, "twitter") == 0)
+ if (session->hosturl)
+ free(session->hosturl);
+ if (strcasecmp(optarg, "twitter") == 0) {
session->host = HOST_TWITTER;
- if (strcasecmp(optarg, "identica") == 0)
+ session->hosturl = strdup(twitter_host);
+ } else if (strcasecmp(optarg, "identica") == 0) {
session->host = HOST_IDENTICA;
+ session->hosturl = strdup(identica_host);
+ } else {
+ session->host = HOST_CUSTOM;
+ session->hosturl = strdup(optarg);
+ }
dbg("host = %d\n", session->host);
break;
case 'b':
account=twitmaster
password=icanhascheezburger
host=identica
+# Example of a custom laconica installation
+#host=http://army.twit.tv/api/statuses
logfile=.bti.log
#action=update
#user=gregkh
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for bti 021.
+# Generated by GNU Autoconf 2.63 for bti 022.
#
# Report bugs to <greg@kroah.com>.
#
# Identity of this package.
PACKAGE_NAME='bti'
PACKAGE_TARNAME='bti'
-PACKAGE_VERSION='021'
-PACKAGE_STRING='bti 021'
+PACKAGE_VERSION='022'
+PACKAGE_STRING='bti 022'
PACKAGE_BUGREPORT='greg@kroah.com'
ac_subst_vars='LTLIBOBJS
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures bti 021 to adapt to many kinds of systems.
+\`configure' configures bti 022 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of bti 021:";;
+ short | recursive ) echo "Configuration of bti 022:";;
esac
cat <<\_ACEOF
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-bti configure 021
+bti configure 022
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by bti $as_me 021, which was
+It was created by bti $as_me 022, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
# Define the identity of the package.
PACKAGE=bti
- VERSION=021
+ VERSION=022
cat >>confdefs.h <<_ACEOF
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by bti $as_me 021, which was
+This file was extended by bti $as_me 022, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-bti config.status 021
+bti config.status 022
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-AC_INIT([bti], [021], [greg@kroah.com])
+AC_INIT([bti], [022], [greg@kroah.com])
AC_PREREQ(2.60)
-AM_INIT_AUTOMAKE(bti, 021)
+AM_INIT_AUTOMAKE(bti, 022)
dnl AM_CONFIG_HEADER([check-news foreign 1.9 dist-bzip2])
AC_PROG_CC
ToastFreeware / debian / bti.git / commitdiff