From a184b5256a35ccf70e418c5140e68675333b3ba0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 15 Jan 2004 23:30:37 +0000
Subject: fix device locking

git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@40 dbf6933d-3bce-0310-9bcc-ed052ba35b35
---
 configure.ac | 2 +-
 src/modem.c  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e86a016..02c74ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # along with ivam2; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.59)
 AC_INIT([ivam2],[0.1],[mzvinzgjb (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/modem.c b/src/modem.c
index e8bab71..f98079a 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -143,11 +143,15 @@ void modem_close(struct modem *m);
 struct modem *modem_open(const char *dev, const char*msn) {
     struct modem *m = NULL;
     char res_dev[PATH_MAX];
-
+    int r;
+    
     assert(dev);
 
-    if (device_lock(dev) != 0)
+    if ((r = device_lock(dev)) != 0) {
+        if (r > 0)
+            daemon_log(LOG_WARNING, "Device '%s' locked.", dev);
         goto fail;
+    }
 
     m = malloc(sizeof(struct modem));
     assert(m);
-- 
cgit