[Goodies-commits] r2652 - xfce4-cellmodem-plugin/trunk/panel-plugin

[Alvaro Lopes]

Author: alvieboy
Date: 2007-04-02 18:58:16 +0000 (Mon, 02 Apr 2007)
New Revision: 2652

Modified:
   xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.c
   xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.h
   xfce4-cellmodem-plugin/trunk/panel-plugin/modem_driver_generic.c
Log:
Use NOCTTY while opening device

Modified: xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.c
===================================================================
--- xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.c	2007-04-02 17:39:22 UTC (rev 2651)
+++ xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.c	2007-04-02 18:58:16 UTC (rev 2652)
@@ -22,6 +22,13 @@
 #include "preferences.h"
 #include "pin_helper.h"
 
+#ifdef DEBUG_ENABLED
+
+char logbuf[8192];
+int debug_level = 0;
+
+#endif
+
 /* Prototypes */
 
 static gboolean cellmodem_t_send_at_command(cellmodem_t *monitor,
@@ -198,13 +205,15 @@
 	return TRUE;
     if ( strncmp(c,"COMMAND NOT",11) == 0 )
 	return TRUE;
-    if ( strcmp(c,"NO CARRIER") == 0 )
-	return TRUE;
-    if ( strcmp(c,"BUSY") == 0 )
-	return TRUE;
-    if ( strcmp(c,"NO DIALTONE") == 0 )
-	return TRUE;
+	/*    if ( strcmp(c,"NO CARRIER") == 0 )
+	 return TRUE;
+	 if ( strcmp(c,"BUSY") == 0 )
+	 return TRUE;
+	 if ( strcmp(c,"NO DIALTONE") == 0 )
+	 return TRUE;
+	 */
 
+
     return FALSE;
 }
 
@@ -1618,8 +1627,6 @@
     return 0;
 }
 
-char logbuf[8192];
-
 #endif
 /* create the plugin */
 

Modified: xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.h
===================================================================
--- xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.h	2007-04-02 17:39:22 UTC (rev 2651)
+++ xfce4-cellmodem-plugin/trunk/panel-plugin/cellmodem.h	2007-04-02 18:58:16 UTC (rev 2652)
@@ -42,6 +42,7 @@
 
 extern int init_logging();
 extern char logbuf[8192];
+extern int debug_level;
 
 #endif
 
@@ -52,10 +53,13 @@
 
 
 #ifdef DEBUG_ENABLED
-#define DEBUG(x...) do { char *tmp=logbuf; tmp+=sprintf(logbuf,"%s [%d] : ", __FUNCTION__, __LINE__); \
+#define DEBUG(dl, x...) do { \
+	if ( dl >= debug_level ) { \
+	char *tmp=logbuf; tmp+=sprintf(logbuf,"%s [%d] : ", __FUNCTION__, __LINE__); \
     tmp+=sprintf(tmp,x); \
     sprintf(tmp,"\n"); \
-    syslog(LOG_DEBUG, "%s", logbuf ); \
+	syslog(LOG_DEBUG, "%s", logbuf ); \
+	}\
     } while (0)
 #else
 #define DEBUG(x...)

Modified: xfce4-cellmodem-plugin/trunk/panel-plugin/modem_driver_generic.c
===================================================================
--- xfce4-cellmodem-plugin/trunk/panel-plugin/modem_driver_generic.c	2007-04-02 17:39:22 UTC (rev 2651)
+++ xfce4-cellmodem-plugin/trunk/panel-plugin/modem_driver_generic.c	2007-04-02 18:58:16 UTC (rev 2652)
@@ -33,7 +33,7 @@
 	return FALSE;
     }
 
-    int fd = open( options->modem_device, O_RDWR|O_EXCL);
+	int fd = open( options->modem_device, O_RDWR|O_EXCL|O_NOCTTY);
 
     if (fd<0) {
         DEBUG("Cannot open modem!!!");