aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorjames <>2008-02-24 00:42:53 +0000
committerjames <>2008-02-24 00:42:53 +0000
commit3240b828391da405d093356eae0b90af5abc7a32 (patch)
treef4dff70c3bc9ca1da2d855fe512571ff4a6ea29d /apps
parent667353b64b552aff9e785a20ee915fb343a0dac9 (diff)
downloadsympathy-3240b828391da405d093356eae0b90af5abc7a32.tar.gz
sympathy-3240b828391da405d093356eae0b90af5abc7a32.tar.bz2
sympathy-3240b828391da405d093356eae0b90af5abc7a32.zip
*** empty log message ***
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile.am14
-rw-r--r--apps/sympathy.c7
-rw-r--r--apps/usage.c20
3 files changed, 30 insertions, 11 deletions
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 513e8ad..51a39e4 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -7,6 +7,9 @@
# $Id$
#
# $Log$
+# Revision 1.11 2008/02/24 00:42:53 james
+# *** empty log message ***
+#
# Revision 1.10 2008/02/20 18:35:10 james
# *** empty log message ***
#
@@ -44,11 +47,18 @@ INCLUDES = -I$(srcdir)/../src
bin_PROGRAMS = sympathy
-noinst_HEADERS=clients.h mainloop.h
+HDRS=clients.h mainloop.h
+SRCS=sympathy.c usage.c clients.c mainloop.c
-sympathy_SOURCES = sympathy.c usage.c clients.c mainloop.c
+noinst_HEADERS=${HDRS}
+
+sympathy_SOURCES = ${SRCS}
sympathy_LDADD = ../src/libsympathy.la -lutil
+tidy: ${SRCS} ${HDRS}
+ indent -i2 -ts0 ${SRCS} ${HDRS}
+ /bin/rm -f *~
+
AM_CFLAGS=-g -Werror
diff --git a/apps/sympathy.c b/apps/sympathy.c
index b24e6d0..b92dbe4 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.13 2008/02/24 00:42:53 james
+ * *** empty log message ***
+ *
* Revision 1.12 2008/02/23 11:48:52 james
* *** empty log message ***
*
@@ -258,7 +261,7 @@ main (int argc, char *argv[])
"sympathy -c [-H] -k skt\n"
"sympathy -r id [-H]\n" "sympathy {-l|-ls}\n"
#endif
- while ((c = getopt (argc, argv, "tscr:lKHd:pb:fL:Fk:n:")) != EOF)
+ while ((c = getopt (argc, argv, "utscr:lKHd:pb:fL:Fk:n:")) != EOF)
{
switch (c)
{
@@ -480,7 +483,7 @@ main (int argc, char *argv[])
else
{
terminal_register_handlers ();
- ansi = ansi_new_from_terminal (terminal_open (0, 1));
+ ansi = ansi_new_from_terminal (terminal_open (0, 1),oflags['u'] ? 0:1);
ansi->reset (ansi, NULL);
}
}
diff --git a/apps/usage.c b/apps/usage.c
index b0893d2..114f81d 100644
--- a/apps/usage.c
+++ b/apps/usage.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.8 2008/02/24 00:42:53 james
+ * *** empty log message ***
+ *
* Revision 1.7 2008/02/23 11:48:52 james
* *** empty log message ***
*
@@ -41,13 +44,13 @@ usage (void)
{
fprintf (stderr, "Usage:\n"
- "sympathy -t [-K] [-d serialdev|-p] [-b baud] [-f] [-L log]\n"
- "sympathy -s [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-F] [-k skt]\n"
- " [-n hlines]\n"
- "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-k skt]\n"
+ "sympathy -t [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u]\n"
+ "sympathy -s [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-F]\n"
+ " [-k skt] [-n hlines]\n"
+ "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"
" [-n hlines]\n"
- "sympathy -c [-H] -k skt\n"
- "sympathy -r id [-H]\n"
+ "sympathy -c [-H] [-u] -k skt\n"
+ "sympathy -r id [-H] [-u]\n"
"sympathy {-l|-ls}\n"
"sympathy -h\n"
"\n"
@@ -85,7 +88,10 @@ usage (void)
" emit HTML of the current state of the screen on stdout\n"
" -L log activity on the device to the file log\n"
" -n hlines the number of lines of history to store in the\n"
- " server, that are replayed on connexion\n");
+ " server, that are replayed on connexion\n"
+ " -u don't emit utf-8 instead map all non ascii characters as ?\n"
+);
+
exit (1);
}