[svn-commits] murf: branch murf/bug6334 r47810 - in
/team/murf/bug6334: apps/ cdr/ channels...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Nov 17 14:38:28 MST 2006
Author: murf
Date: Fri Nov 17 15:38:27 2006
New Revision: 47810
URL: http://svn.digium.com/view/asterisk?view=rev&rev=47810
Log:
The latest patch applied, failures overcome
Modified:
team/murf/bug6334/apps/app_chanspy.c
team/murf/bug6334/apps/app_dictate.c
team/murf/bug6334/apps/app_directory.c
team/murf/bug6334/apps/app_festival.c
team/murf/bug6334/apps/app_meetme.c
team/murf/bug6334/apps/app_mixmonitor.c
team/murf/bug6334/apps/app_record.c
team/murf/bug6334/apps/app_voicemail.c
team/murf/bug6334/cdr/cdr_sqlite.c
team/murf/bug6334/channels/chan_iax2.c
team/murf/bug6334/channels/chan_zap.c
team/murf/bug6334/include/asterisk.h
team/murf/bug6334/main/app.c
team/murf/bug6334/main/db.c
team/murf/bug6334/main/file.c
team/murf/bug6334/res/res_agi.c
team/murf/bug6334/res/res_convert.c
team/murf/bug6334/res/res_monitor.c
Modified: team/murf/bug6334/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_chanspy.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_chanspy.c (original)
+++ team/murf/bug6334/apps/app_chanspy.c Fri Nov 17 15:38:27 2006
@@ -617,7 +617,7 @@
char filename[512];
snprintf(filename, sizeof(filename), "%s/%s.%d.raw", ast_config_AST_MONITOR_DIR, recbase, (int) time(NULL));
- if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0644)) <= 0) {
+ if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, AST_FILE_MODE)) <= 0) {
ast_log(LOG_WARNING, "Cannot open '%s' for recording\n", filename);
fd = 0;
}
@@ -701,7 +701,7 @@
char filename[512];
snprintf(filename, sizeof(filename), "%s/%s.%d.raw", ast_config_AST_MONITOR_DIR, recbase, (int) time(NULL));
- if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0644)) <= 0) {
+ if ((fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, AST_FILE_MODE)) <= 0) {
ast_log(LOG_WARNING, "Cannot open '%s' for recording\n", filename);
fd = 0;
}
Modified: team/murf/bug6334/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_dictate.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_dictate.c (original)
+++ team/murf/bug6334/apps/app_dictate.c Fri Nov 17 15:38:27 2006
@@ -150,7 +150,7 @@
}
snprintf(path, len, "%s/%s", base, filein);
- fs = ast_writefile(path, "raw", NULL, O_CREAT|O_APPEND, 0, 0700);
+ fs = ast_writefile(path, "raw", NULL, O_CREAT|O_APPEND, 0, AST_FILE_MODE);
mode = DMODE_PLAY;
memset(&flags, 0, sizeof(flags));
ast_set_flag(&flags, DFLAG_PAUSE);
@@ -307,7 +307,7 @@
} else {
oflags |= O_APPEND;
}
- fs = ast_writefile(path, "raw", NULL, oflags, 0, 0700);
+ fs = ast_writefile(path, "raw", NULL, oflags, 0, AST_FILE_MODE);
if (ast_test_flag(&flags, DFLAG_TRUNC)) {
ast_seekstream(fs, 0, SEEK_SET);
ast_clear_flag(&flags, DFLAG_TRUNC);
Modified: team/murf/bug6334/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_directory.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_directory.c (original)
+++ team/murf/bug6334/apps/app_directory.c Fri Nov 17 15:38:27 2006
@@ -142,7 +142,7 @@
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
break;
}
- fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, 0770);
+ fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, AST_FILE_MODE);
if (fd < 0) {
ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno));
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
Modified: team/murf/bug6334/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_festival.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_festival.c (original)
+++ team/murf/bug6334/apps/app_festival.c Fri Nov 17 15:38:27 2006
@@ -426,7 +426,7 @@
snprintf(cachefile, sizeof(cachefile), "%s/%s", cachedir, MD5Hex);
fdesc=open(cachefile,O_RDWR);
if (fdesc==-1) {
- fdesc=open(cachefile,O_CREAT|O_RDWR,0777);
+ fdesc=open(cachefile,O_CREAT|O_RDWR,AST_FILE_MODE);
if (fdesc!=-1) {
writecache=1;
strln=strlen((char *)data);
Modified: team/murf/bug6334/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_meetme.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_meetme.c (original)
+++ team/murf/bug6334/apps/app_meetme.c Fri Nov 17 15:38:27 2006
@@ -2873,7 +2873,7 @@
break;
}
if (!s && cnf->recordingfilename && (cnf->recordingfilename != oldrecordingfilename)) {
- s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, 0644);
+ s = ast_writefile(cnf->recordingfilename, cnf->recordingformat, NULL, flags, 0, AST_FILE_MODE);
oldrecordingfilename = cnf->recordingfilename;
}
Modified: team/murf/bug6334/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_mixmonitor.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_mixmonitor.c (original)
+++ team/murf/bug6334/apps/app_mixmonitor.c Fri Nov 17 15:38:27 2006
@@ -256,7 +256,7 @@
}
/* Move onto actually creating the filestream */
- mixmonitor->fs = ast_writefile(file_name, ext, NULL, oflags, 0, 0644);
+ mixmonitor->fs = ast_writefile(file_name, ext, NULL, oflags, 0, AST_FILE_MODE);
if (!mixmonitor->fs) {
ast_log(LOG_ERROR, "Cannot open %s.%s\n", file_name, ext);
free(mixmonitor);
Modified: team/murf/bug6334/apps/app_record.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_record.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_record.c (original)
+++ team/murf/bug6334/apps/app_record.c Fri Nov 17 15:38:27 2006
@@ -265,7 +265,7 @@
flags = option_append ? O_CREAT|O_APPEND|O_WRONLY : O_CREAT|O_TRUNC|O_WRONLY;
- s = ast_writefile( tmp, ext, NULL, flags , 0, 0644);
+ s = ast_writefile( tmp, ext, NULL, flags , 0, AST_FILE_MODE);
if (!s) {
ast_log(LOG_WARNING, "Could not create file %s\n", filename);
Modified: team/murf/bug6334/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_voicemail.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/apps/app_voicemail.c (original)
+++ team/murf/bug6334/apps/app_voicemail.c Fri Nov 17 15:38:27 2006
@@ -1,4 +1,5 @@
/*
+:1
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2006, Digium, Inc.
@@ -1067,7 +1068,7 @@
ast_odbc_release_obj(obj);
goto yuck;
}
- fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, 0770);
+ fd = open(full_fn, O_RDWR | O_CREAT | O_TRUNC, VOICEMAIL_FILE_MODE);
if (fd < 0) {
ast_log(LOG_WARNING, "Failed to write '%s': %s\n", full_fn, strerror(errno));
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
Modified: team/murf/bug6334/cdr/cdr_sqlite.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/cdr/cdr_sqlite.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/cdr/cdr_sqlite.c (original)
+++ team/murf/bug6334/cdr/cdr_sqlite.c Fri Nov 17 15:38:27 2006
@@ -181,7 +181,7 @@
/* is the database there? */
snprintf(fn, sizeof(fn), "%s/cdr.db", ast_config_AST_LOG_DIR);
- db = sqlite_open(fn, 0660, &zErr);
+ db = sqlite_open(fn, AST_FILE_MODE, &zErr);
if (!db) {
ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
free(zErr);
Modified: team/murf/bug6334/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/channels/chan_iax2.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/channels/chan_iax2.c (original)
+++ team/murf/bug6334/channels/chan_iax2.c Fri Nov 17 15:38:27 2006
@@ -1345,7 +1345,7 @@
ast_log(LOG_WARNING, "Cannot open '%s': %s\n", s, strerror(errno));
return -1;
}
- fd = open(s2, O_RDWR | O_CREAT | O_EXCL);
+ fd = open(s2, O_RDWR | O_CREAT | O_EXCL, AST_FILE_MODE);
if (fd < 0) {
ast_log(LOG_WARNING, "Cannot open '%s' for writing: %s\n", s2, strerror(errno));
close(ifd);
Modified: team/murf/bug6334/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/channels/chan_zap.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/channels/chan_zap.c (original)
+++ team/murf/bug6334/channels/chan_zap.c Fri Nov 17 15:38:27 2006
@@ -10235,7 +10235,7 @@
for (i = 0; i < NUM_DCHANS; i++) {
if (!pri->dchannels[i])
break;
- pri->fds[i] = open("/dev/zap/channel", O_RDWR, 0600);
+ pri->fds[i] = open("/dev/zap/channel", O_RDWR);
x = pri->dchannels[i];
if ((pri->fds[i] < 0) || (ioctl(pri->fds[i],ZT_SPECIFY,&x) == -1)) {
ast_log(LOG_ERROR, "Unable to open D-channel %d (%s)\n", x, strerror(errno));
@@ -10352,7 +10352,7 @@
if (ast_strlen_zero(argv[4]))
return RESULT_SHOWUSAGE;
- myfd = open(argv[4], O_CREAT|O_WRONLY);
+ myfd = open(argv[4], O_CREAT|O_WRONLY, AST_FILE_MODE);
if (myfd < 0) {
ast_cli(fd, "Unable to open '%s' for writing\n", argv[4]);
return RESULT_SUCCESS;
Modified: team/murf/bug6334/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/include/asterisk.h?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/include/asterisk.h (original)
+++ team/murf/bug6334/include/asterisk.h Fri Nov 17 15:38:27 2006
@@ -23,6 +23,16 @@
#include "asterisk/compat.h"
#include "asterisk/paths.h"
+
+/* Default to allowing the umask or filesystem ACLs to determine actual file
+ * creation permissions
+ */
+#ifndef AST_DIR_MODE
+#define AST_DIR_MODE 0777
+#endif
+#ifndef AST_FILE_MODE
+#define AST_FILE_MODE 0666
+#endif
#define DEFAULT_LANGUAGE "en"
Modified: team/murf/bug6334/main/app.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/main/app.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/main/app.c (original)
+++ team/murf/bug6334/main/app.c Fri Nov 17 15:38:27 2006
@@ -569,7 +569,7 @@
end = start = time(NULL); /* pre-initialize end to be same as start in case we never get into loop */
for (x = 0; x < fmtcnt; x++) {
- others[x] = ast_writefile(prepend ? prependfile : recordfile, sfmt[x], comment, O_TRUNC, 0, 0700);
+ others[x] = ast_writefile(prepend ? prependfile : recordfile, sfmt[x], comment, O_TRUNC, 0, AST_FILE_MODE);
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing: %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]);
@@ -941,7 +941,7 @@
}
snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
- fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
+ fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, AST_FILE_MODE);
if (fd < 0) {
ast_log(LOG_ERROR, "Unable to create lock file '%s': %s\n", path, strerror(errno));
return AST_LOCK_PATH_NOT_FOUND;
Modified: team/murf/bug6334/main/db.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/main/db.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/main/db.c (original)
+++ team/murf/bug6334/main/db.c Fri Nov 17 15:38:27 2006
@@ -62,7 +62,7 @@
static int dbinit(void)
{
- if (!astdb && !(astdb = dbopen((char *)ast_config_AST_DB, O_CREAT | O_RDWR, 0664, DB_BTREE, NULL))) {
+ if (!astdb && !(astdb = dbopen((char *)ast_config_AST_DB, O_CREAT | O_RDWR, AST_FILE_MODE, DB_BTREE, NULL))) {
ast_log(LOG_WARNING, "Unable to open Asterisk database\n");
return -1;
}
Modified: team/murf/bug6334/main/file.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/main/file.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/main/file.c (original)
+++ team/murf/bug6334/main/file.c Fri Nov 17 15:38:27 2006
@@ -214,7 +214,7 @@
ast_log(LOG_WARNING, "Unable to open %s in read-only mode\n", infile);
return -1;
}
- if ((ofd = open(outfile, O_WRONLY | O_TRUNC | O_CREAT, 0600)) < 0) {
+ if ((ofd = open(outfile, O_WRONLY | O_TRUNC | O_CREAT, AST_FILE_MODE)) < 0) {
ast_log(LOG_WARNING, "Unable to open %s in write-only mode\n", outfile);
close(ifd);
return -1;
Modified: team/murf/bug6334/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/res/res_agi.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/res/res_agi.c (original)
+++ team/murf/bug6334/res/res_agi.c Fri Nov 17 15:38:27 2006
@@ -949,7 +949,7 @@
if (res) {
fdprintf(agi->fd, "200 result=%d (randomerror) endpos=%ld\n", res, sample_offset);
} else {
- fs = ast_writefile(argv[2], argv[3], NULL, O_CREAT | O_WRONLY | (sample_offset ? O_APPEND : 0), 0, 0644);
+ fs = ast_writefile(argv[2], argv[3], NULL, O_CREAT | O_WRONLY | (sample_offset ? O_APPEND : 0), 0, AST_FILE_MODE);
if (!fs) {
res = -1;
fdprintf(agi->fd, "200 result=%d (writefile)\n", res);
Modified: team/murf/bug6334/res/res_convert.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/res/res_convert.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/res/res_convert.c (original)
+++ team/murf/bug6334/res/res_convert.c Fri Nov 17 15:38:27 2006
@@ -88,7 +88,7 @@
ast_cli(fd, "'%s' is an invalid filename!\n", argv[3]);
goto fail_out;
}
- if (!(fs_out = ast_writefile(name_out, ext_out, NULL, O_CREAT|O_TRUNC|O_WRONLY, 0, 0644))) {
+ if (!(fs_out = ast_writefile(name_out, ext_out, NULL, O_CREAT|O_TRUNC|O_WRONLY, 0, AST_FILE_MODE))) {
ast_cli(fd, "Unable to open output file: %s\n", argv[3]);
goto fail_out;
}
Modified: team/murf/bug6334/res/res_monitor.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/res/res_monitor.c?view=diff&rev=47810&r1=47809&r2=47810
==============================================================================
--- team/murf/bug6334/res/res_monitor.c (original)
+++ team/murf/bug6334/res/res_monitor.c Fri Nov 17 15:38:27 2006
@@ -197,7 +197,7 @@
}
if (!(monitor->read_stream = ast_writefile(monitor->read_filename,
monitor->format, NULL,
- O_CREAT|O_TRUNC|O_WRONLY, 0, 0644))) {
+ O_CREAT|O_TRUNC|O_WRONLY, 0, AST_FILE_MODE))) {
ast_log(LOG_WARNING, "Could not create file %s\n",
monitor->read_filename);
free(monitor);
@@ -209,7 +209,7 @@
}
if (!(monitor->write_stream = ast_writefile(monitor->write_filename,
monitor->format, NULL,
- O_CREAT|O_TRUNC|O_WRONLY, 0, 0644))) {
+ O_CREAT|O_TRUNC|O_WRONLY, 0, AST_FILE_MODE))) {
ast_log(LOG_WARNING, "Could not create file %s\n",
monitor->write_filename);
ast_closestream(monitor->read_stream);
More information about the svn-commits
mailing list