From: james <james>
Date: Thu, 28 Feb 2008 01:47:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=sympathy.git;a=commitdiff_plain;h=947c4cce5c3246e331ac740ae2a97815a6a17650;ds=sidebyside

*** empty log message ***
---

diff --git a/apps/sympathy.c b/apps/sympathy.c
index 89cc552..91f6c0c 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
+ * Revision 1.22  2008/02/28 01:47:44  james
+ * *** empty log message ***
+ *
  * Revision 1.21  2008/02/27 16:01:24  james
  * *** empty log message ***
  *
@@ -86,6 +89,7 @@ static char rcsid[] =
 #include <string.h>
 #include <strings.h>
 #include <malloc.h>
+#include <fcntl.h>
 
 #include "mainloop.h"
 
@@ -489,6 +493,31 @@ main (int argc, char *argv[])
         }
       else
         {
+	 /*HACK-- check that console=device does not occur in */
+	 /*/proc/cmdline*/
+	 if (!oargs['d']) 
+		fatal_moan("no argument to -d");
+		
+	  {
+	 char kernel_cmdline[4096]={0};
+	 char search_string[1024]="console=";
+	 char *ptr=oargs['d'];
+	 int fd;
+
+	 if (!strncmp("/dev/",ptr,5)) ptr+=5; 
+
+	strcat(search_string,ptr);
+
+	fd=open("/proc/cmdline",O_RDONLY);
+	read(fd,kernel_cmdline,sizeof(kernel_cmdline));
+	close(fd);
+
+	kernel_cmdline[sizeof(kernel_cmdline)-1]=0;
+
+	if (strstr(kernel_cmdline,search_string))
+		fatal_moan("/proc/cmdline contains %s",search_string);
+	 } 
+
           tty =
             serial_open (oargs['d'],
                          oflags['K'] ? SERIAL_LOCK_ACTIVE :
diff --git a/sympathy.1 b/sympathy.1
index 17beda2..2ec7ea3 100644
--- a/sympathy.1
+++ b/sympathy.1
@@ -364,7 +364,7 @@ logs certain other events to the file. When the baud\-rate is changed
 .I sympathy
 writes  <baud changed to 19200>. Whenever a modem control line changes state 
 .I sympathy
-appends <Modem lines changed: \fI+/-line\fP> to the log. Where \fI+\fP
+appends <Modem lines changed: \fI+/-line\fP ...> to the log. Where \fI+\fP
 indicates that \fIline\fP was asserted and \fI-\fP indicates that it was de-asserted.
 When the terminal device reports receive errors 
 .I sympathy 
@@ -440,7 +440,7 @@ either hangs up on the client or issues CTRL\-B quit, and the client detaches fr
 the server.
 .IP
 Later the user wishes to retrieve her session and to determine which sympathy
-sessions are active issues:
+sessions are active and issues:
 .IP
 [foo@barhost ~]$ sympathy \-ls
 .br
diff --git a/version-md5sums b/version-md5sums
index c722bfd..b7dc3a0 100644
--- a/version-md5sums
+++ b/version-md5sums
@@ -8,3 +8,4 @@ f844259e45d571cf913580d8851ee261	1.1.3
 88cd008326dcedb9dee8011ce2697e6a	1.1.4
 93f010bab6441e6f679f523725507d04	1.1.5
 0baf4bcc06f0271dba444738df2ef1e3	1.1.6
+30b3685c955c05efa7ba0affb9fbca1a	1.1.7
diff --git a/version-micro b/version-micro
index 1e8b314..7f8f011 100644
--- a/version-micro
+++ b/version-micro
@@ -1 +1 @@
-6
+7
diff --git a/version-stamps b/version-stamps
new file mode 100644
index 0000000..7c7a9c9
--- /dev/null
+++ b/version-stamps
@@ -0,0 +1,4 @@
+88cd008326dcedb9dee8011ce2697e6a	"February 27, 2008"
+93f010bab6441e6f679f523725507d04	"February 28, 2008"
+0baf4bcc06f0271dba444738df2ef1e3	"February 28, 2008"
+30b3685c955c05efa7ba0affb9fbca1a	"February 28, 2008"