/*
* $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 ***
+ *
+ * Revision 1.19 2008/02/27 09:47:05 james
+ * *** empty log message ***
+ *
* Revision 1.18 2008/02/27 09:42:53 james
* *** empty log message ***
*
oflags['s'] = 0;
- if (!oflags['s'] && !oflags['c'] && !oflags['t'] && !oflags['r']
- && !oflags['l'])
- {
- /*If no mode is specified behave like screen */
- oflags['s']++;
- oflags['c']++;
- }
-
-
{
int sum = 0;
sum += oflags['t'];
sum += oflags['l'];
sum += oflags['v'];
+ if (!sum) {
+ /*If no mode is specified behave like screen */
+ oflags['s']++;
+ oflags['c']++;
+ sum++;
+ }
+
if (sum != 1)
fatal_moan
("specifiy exactly one of ( -c and or -s ), -t, -r, -l and -v");
if (oflags['v'])
{
- fprintf ("Version: %s\n", libsympathy_version ());
+ fprintf (stderr, "Version: %s\n", libsympathy_version ());
+ fprintf (stderr, "Version: %s\n", rcsid);
return 0;
}
/*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']++;
}