From e14a8c751549c224b157f9689177b1a2f127ce20 Mon Sep 17 00:00:00 2001
From: james <>
Date: Wed, 27 Feb 2008 16:01:25 +0000
Subject: *** empty log message ***

---
 Makefile.am     | 15 ++++++++++-----
 apps/sympathy.c | 11 +++++++++--
 apps/usage.c    |  6 +++++-
 maintainer/tag  |  5 ++++-
 sympathy.1      | 29 +++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 sympathy.1

diff --git a/Makefile.am b/Makefile.am
index e341690..b82e068 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.6  2008/02/27 16:01:24  james
+# *** empty log message ***
+#
 # Revision 1.5  2008/02/27 15:17:55  james
 # *** empty log message ***
 #
@@ -35,8 +38,8 @@ bin_SCRIPTS = libsympathy-config
 clean-local:
 	-rm -f libsympathy-config version.sed sympathy.man
 
-sympathy.man: sympathy.man.src version.sed 
-	@SED@ -f version.sed < sympathy.man.src > sympathy.man || rm -f sympathy.man
+sympathy.man: sympathy.1 version.sed 
+	@SED@ -f version.sed < sympathy.1 > sympathy.man || rm -f sympathy.man
 
 
 libsympathy-config.src:libsympathy-config.src.in
@@ -50,7 +53,7 @@ VF=${shell cat ${VFD}/version-files}
 VFS=${VF:%=${VFD}/%}
 VCHK=${shell cat ${VFS} | @MD5SUM@ | @AWK@ '{print $$1 }' }
 VNUM=${shell @GREP@ ${VCHK} ${VFD}/version-md5sums | @AWK@ '{ print $$2 }'  }
-VSTP=${shell @GREP@ ${VCHK} ${VFD}/version-stamps  | @AWK@ '{ print $$2 }'  }
+VSTP=${shell @GREP@ ${VCHK} ${VFD}/version-stamps  | @AWK@  'BEGIN { FS="\t" }; { print $$2 }'  }
 VDEF=${shell echo `cat ${VFD}/version-major`.`cat ${VFD}/version-minor`.`cat ${VFD}/version-micro` }
 
 EXTRA_DIST=version-files version-major version-minor version-micro version-md5sums version-stamps
@@ -60,10 +63,12 @@ version.sed: $(VFD)/version-files $(VFD)/version-major \
 	$(VFD)/version-md5sums $(VFD)/version-stamps ${VFS} Makefile
 	if [ .${VNUM} = . ]; then \
 		echo "s/%VERSION%/${VDEF}-E/g" > version.sed; \
-		echo "s/%VERSION%/After ${VSTP}/g" > version.sed; \
+		echo "s/%VERSIONSTAMP%/After ${VSTP}/g" >> version.sed; \
+		echo "s/%LONGVERSION%/libsympathy version ${VNUM} + Edits/g" >> version.sed; \
 	else \
 		echo "s/%VERSION%/${VNUM}/g" > version.sed; \
-		echo "s/%VERSIONSTAMP%/${VSTP}/g" > version.sed; \
+		echo "s/%VERSIONSTAMP%/${VSTP}/g" >> version.sed; \
+		echo "s/%LONGVERSION%/libsympathy version ${VNUM}/g" >> version.sed; \
 	fi
 
 protos:
diff --git a/apps/sympathy.c b/apps/sympathy.c
index 6e869be..89cc552 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * Revision 1.21  2008/02/27 16:01:24  james
+ * *** empty log message ***
+ *
  * Revision 1.20  2008/02/27 10:00:34  james
  * *** empty log message ***
  *
@@ -355,12 +358,16 @@ main (int argc, char *argv[])
   /*Fold -r into -c */
   if (oflags['r'])
     {
-      int id = safe_atoi (oargs['r']);
+      char *id = oargs['r'];
       if (id < 0)
         fatal_moan ("cannot parse -r %s as an integer", oargs['r']);
 
       oflags['k']++;
-      oargs['k'] = mome ("/.sympathy/%s%d", hostname, id);
+      if (safe_atoi(id)>0) {
+      	oargs['k'] = mome ("/.sympathy/%s%d", hostname, safe_atoi(id));
+      } else {
+      	oargs['k'] = mome ("/.sympathy/%s", id);
+      }
       oflags['r'] = 0;
       oflags['c']++;
     }
diff --git a/apps/usage.c b/apps/usage.c
index d06bf05..5a00619 100644
--- a/apps/usage.c
+++ b/apps/usage.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.15  2008/02/27 16:01:24  james
+ * *** empty log message ***
+ *
  * Revision 1.14  2008/02/27 09:55:57  james
  * *** empty log message ***
  *
@@ -83,7 +86,8 @@ usage (void)
            "            incompatible with -F. This is the default mode\n"
            "   -c     client mode: connect to server mode process\n"
            "   -r id  client mode: connect to server mode process on socket\n"
-           "             ~/.sympathy/id\n"
+           "             ~/.sympathy/id or ~/.sympathy/hostname.id if id is an\n"
+           "             integer\n"
            "   -l or -ls  list active sockets in ~/.sympathy\n"
            "   -v   show version\n"
            "   -h   show help\n"
diff --git a/maintainer/tag b/maintainer/tag
index fb3a72c..85709f2 100755
--- a/maintainer/tag
+++ b/maintainer/tag
@@ -8,6 +8,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.5  2008/02/27 16:01:25  james
+# *** empty log message ***
+#
 # Revision 1.4  2008/02/27 15:17:56  james
 # *** empty log message ***
 #
@@ -44,7 +47,7 @@ echo $MICRO > version-micro
 STP=`date '+"%B %d, %Y"'`
 
 echo "$CHK	${MAJOR}.${MINOR}.${MICRO}" >> version-md5sums
-echo "$STP	${MAJOR}.${MINOR}.${MICRO}" >> version-stamps
+echo "$CHK	$STP" >> version-stamps
 
 cvs commit -m ""
 cvs tag libsympathy-${MAJOR}_${MINOR}_${MICRO} .
diff --git a/sympathy.1 b/sympathy.1
new file mode 100644
index 0000000..06afdbc
--- /dev/null
+++ b/sympathy.1
@@ -0,0 +1,29 @@
+.TH sympathy 1  "%VERSIONSTAMP%" "%LONGVERSION%" "USER COMMANDS"
+.SH NAME
+sympathy \- client/server terminal emulator with logging
+.SH SYNOPSIS
+.\"           "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] [-k skt]\n"
+.\"           "                      [-n hlines] [-w WxH] [-F]\n"
+.\"           "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-u] [-k skt]\n"
+.\"           "                      [-n hlines] [-w WxH]\n"
+.\"           "sympathy -c      [-H] [-u] -k skt\n"
+.\"           "sympathy -r id   [-H] [-u]\n"
+.\"           "sympathy {-l|-ls}\n"
+.\"           "sympathy -v\n"
+.\"           "sympathy -h\n"
+
+.SH DESCRIPTION
+.SH OPTIONS
+.SH EXIT STATUS
+.SH ENVIRONMENT
+.SH FILES
+.SH EXAMPLES
+.SH ERRORS
+.SH SEE ALSO
+screen(1) minicom(1) consolidate(1)
+.SH STANDARDS
+.SH BUGS
+.SH SECURITY CONSIDERATIONS
+.SH AUTHOR
+.\" vi: set syn=groff
-- 
cgit v1.2.3