kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kevin P. Fleming
2006-07-12 15:46:56 +00:00
parent ff29ba6296
commit 0c754a13a8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app.c
View File

@@ -1167,11 +1167,13 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
time(&start); time(&start);
while (((res = link(fs, s)) < 0) && (errno == EEXIST) && (time(NULL) - start < 5)) while (((res = link(fs, s)) < 0) && (errno == EEXIST) && (time(NULL) - start < 5))
usleep(1); usleep(1);
unlink(fs);
if (res) { if (res) {
ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n", path, strerror(errno)); ast_log(LOG_WARNING, "Failed to lock path '%s': %s\n", path, strerror(errno));
return AST_LOCK_TIMEOUT; return AST_LOCK_TIMEOUT;
} else { } else {
unlink(fs);
ast_log(LOG_DEBUG, "Locked path '%s'\n", path); ast_log(LOG_DEBUG, "Locked path '%s'\n", path);
return AST_LOCK_SUCCESS; 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) int ast_unlock_path(const char *path)
{ {
char *s; char *s;
int res;
s = alloca(strlen(path) + 10); s = alloca(strlen(path) + 10);
if (!s) if (!s) {
ast_log(LOG_WARNING, "Out of memory!\n");
return -1; return -1;
}
snprintf(s, strlen(path) + 9, "%s/%s", path, ".lock"); 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) int ast_record_review(struct ast_channel *chan, const char *playfile, const char *recordfile, int maxtime, const char *fmt, int *duration, const char *path)