*** empty log message ***

diff --git a/apps/sympathy.c b/apps/sympathy.c
index 89cc552d0fdd07d81978833a1999ffd9d4a38958..91f6c0c789e809712d8f48e2194389c9dfdbf16a 100644 (file)
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
 
 /*
  * $Log$
 
 /*
  * $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 ***
  *
  * 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 <string.h>
 #include <strings.h>
 #include <malloc.h>

+#include <fcntl.h>

 
 #include "mainloop.h"
 
 
 #include "mainloop.h"
 


@@ -489,6 +493,31 @@ main (int argc, char *argv[])
         }
       else
         {
         }
       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 :
           tty =
             serial_open (oargs['d'],
                          oflags['K'] ? SERIAL_LOCK_ACTIVE :

diff --git a/sympathy.1 b/sympathy.1
index 17beda2c2a12948828ef6704929af0a7383dba9b..2ec7ea3d3601b521e62715586fc61bf36b31968c 100644 (file)
--- 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
 .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 
 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
 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
 .IP
 [foo@barhost ~]$ sympathy \-ls
 .br

diff --git a/version-md5sums b/version-md5sums
index c722bfdccebe3ade90037db791b55d228ab2be42..b7dc3a0a6dad673a0cd91017e06d5f2357c7bdce 100644 (file)
--- 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
 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 1e8b314962144c26d5e0e50fd29d2ca327864913..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/version-micro
+++ b/version-micro
@@ -1 +1 @@
-6
+7

diff --git a/version-stamps b/version-stamps
new file mode 100644 (file)
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"