fix a case where ast_lock_path() could leave a randomly-named lock file hanging around

make ast_unlock_path actually report when unlocking fails

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@37441 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/app.c b/app.c
index 64fa49fa79e1ba45d45a2b286f35c6ef7623a545..a477769042f8208bc9336b8daab767cd2dee80dd 100644 (file)
--- a/app.c
+++ b/app.c
@@ -1167,11 +1167,13 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
        time(&start);
        while (((res = link(fs, s)) < 0) && (errno == EEXIST) && (time(NULL) - start < 5))
                usleep(1);
+
+       unlink(fs);
+
        if (res) {
                ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n", path, strerror(errno));
                return AST_LOCK_TIMEOUT;
        } else {
-               unlink(fs);
                ast_log(LOG_DEBUG, "Locked path '%s'\n", path);
                return AST_LOCK_SUCCESS;
        }
@@ -1180,12 +1182,22 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
 int ast_unlock_path(const char *path)
 {
        char *s;
+       int res;
+
        s = alloca(strlen(path) + 10);
-       if (!s)
+       if (!s) {
+               ast_log(LOG_WARNING, "Out of memory!\n");
                return -1;
+       }
+
        snprintf(s, strlen(path) + 9, "%s/%s", path, ".lock");
-       ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
-       return unlink(s);
+
+       if ((res = unlink(s)))
+               ast_log(LOG_ERROR, "Could not unlock path '%s': %s\n", path, strerror(errno));
+       else
+               ast_log(LOG_DEBUG, "Unlocked path '%s'\n", path);
+
+       return res;
 }
 
 int ast_record_review(struct ast_channel *chan, const char *playfile, const char *recordfile, int maxtime, const char *fmt, int *duration, const char *path)