minor changes and eliminate some compiler warnings
[asterisk/asterisk.git] / file.c
diff --git a/file.c b/file.c
index ce24fa0..d48aaeb 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -1,14 +1,25 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Generic File Format Support.
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
- * Mark Spencer <markster@linux-support.net>
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*
+ *
+ * Generic File Format Support.
+ * 
  */
 
 #include <sys/types.h>
@@ -37,6 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
+#include "asterisk/pbx.h"
 
 struct ast_format {
        /* Name of format */
@@ -47,9 +59,9 @@ struct ast_format {
        /* Format of frames it uses/provides (one only) */
        int format;
        /* Open an input stream, and start playback */
-       struct ast_filestream * (*open)(int fd);
+       struct ast_filestream * (*open)(FILE * f);
        /* Open an output stream, of a given file descriptor and comment it appropriately if applicable */
-       struct ast_filestream * (*rewrite)(int fd, const char *comment);
+       struct ast_filestream * (*rewrite)(FILE *f, const char *comment);
        /* Write a frame to a channel */
        int (*write)(struct ast_filestream *, struct ast_frame *);
        /* seek num samples into file, whence(think normal seek) */
@@ -91,8 +103,8 @@ AST_MUTEX_DEFINE_STATIC(formatlock);
 static struct ast_format *formats = NULL;
 
 int ast_format_register(const char *name, const char *exts, int format,
-                                               struct ast_filestream * (*open)(int fd),
-                                               struct ast_filestream * (*rewrite)(int fd, const char *comment),
+                                               struct ast_filestream * (*open)(FILE *f),
+                                               struct ast_filestream * (*rewrite)(FILE *f, const char *comment),
                                                int (*write)(struct ast_filestream *, struct ast_frame *),
                                                int (*seek)(struct ast_filestream *, long sample_offset, int whence),
                                                int (*trunc)(struct ast_filestream *),
@@ -339,6 +351,7 @@ static int ast_filehelper(const char *filename, const char *filename2, const cha
        struct ast_filestream *s;
        int res=0, ret = 0;
        char *ext=NULL, *exts, *fn, *nfn;
+       FILE *bfile;
        struct ast_channel *chan = (struct ast_channel *)filename2;
        
        /* Start with negative response */
@@ -401,9 +414,10 @@ static int ast_filehelper(const char *filename, const char *filename2, const cha
                                                case ACTION_OPEN:
                                                        if ((ret < 0) && ((chan->writeformat & f->format) ||
                                                                                ((f->format >= AST_FORMAT_MAX_AUDIO) && fmt))) {
-                                                               ret = open(fn, O_RDONLY);
-                                                               if (ret >= 0) {
-                                                                       s = f->open(ret);
+                                                               bfile = fopen(fn, "r");
+                                                               if (bfile) {
+                                                                       ret = 1;
+                                                                       s = f->open(bfile);
                                                                        if (s) {
                                                                                s->lasttimeout = -1;
                                                                                s->fmt = f;
@@ -414,11 +428,14 @@ static int ast_filehelper(const char *filename, const char *filename2, const cha
                                                                                else
                                                                                        chan->vstream = s;
                                                                        } else {
-                                                                               close(ret);
-                                                                               ast_log(LOG_WARNING, "Unable to open fd on %s\n", fn);
+                                                                               fclose(bfile);
+                                                                               ast_log(LOG_WARNING, "Unable to open file on %s\n", fn);
+                                                                               ret = -1;
                                                                        }
-                                                               } else
+                                                               } else{
                                                                        ast_log(LOG_WARNING, "Couldn't open file %s\n", fn);
+                                                                       ret = -1;
+                                                               }
                                                        }
                                                        break;
                                                default:
@@ -460,10 +477,9 @@ struct ast_filestream *ast_openstream_full(struct ast_channel *chan, const char
               set it up.
                   
        */
-       int fd = -1;
        int fmts = -1;
        char filename2[256]="";
-       char filename3[256]="";
+       char filename3[256];
        char *endpart;
        int res;
 
@@ -496,8 +512,8 @@ struct ast_filestream *ast_openstream_full(struct ast_channel *chan, const char
        /* Set the channel to a format we can work with */
        res = ast_set_write_format(chan, fmts);
        
-       fd = ast_filehelper(filename2, (char *)chan, NULL, ACTION_OPEN);
-       if (fd >= 0)
+       res = ast_filehelper(filename2, (char *)chan, NULL, ACTION_OPEN);
+       if (res >= 0)
                return chan->stream;
        return NULL;
 }
@@ -807,7 +823,7 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p
 
 struct ast_filestream *ast_readfile(const char *filename, const char *type, const char *comment, int flags, int check, mode_t mode)
 {
-       int fd;
+       FILE *bfile;
        struct ast_format *f;
        struct ast_filestream *fs = NULL;
        char *fn;
@@ -822,13 +838,13 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
                        continue;
 
                fn = build_filename(filename, type);
-               fd = open(fn, flags);
-               if (fd >= 0) {
+               bfile = fopen(fn, "r");
+               if (bfile) {
                        errno = 0;
 
-                       if (!(fs = f->open(fd))) {
+                       if (!(fs = f->open(bfile))) {
                                ast_log(LOG_WARNING, "Unable to open %s\n", fn);
-                               close(fd);
+                               fclose(bfile);
                                free(fn);
                                continue;
                        }
@@ -854,6 +870,8 @@ struct ast_filestream *ast_readfile(const char *filename, const char *type, cons
 struct ast_filestream *ast_writefile(const char *filename, const char *type, const char *comment, int flags, int check, mode_t mode)
 {
        int fd, myflags = 0;
+       /* compiler claims this variable can be used before initialization... */
+       FILE *bfile = NULL;
        struct ast_format *f;
        struct ast_filestream *fs = NULL;
        char *fn, *orig_fn = NULL;
@@ -881,11 +899,20 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
 
                fn = build_filename(filename, type);
                fd = open(fn, flags | myflags, mode);
+               if (fd > -1) {
+                       /* fdopen() the resulting file stream */
+                       bfile = fdopen(fd, ((flags | myflags) & O_RDWR) ? "w+" : "w");
+                       if (!bfile) {
+                               ast_log(LOG_WARNING, "Whoa, fdopen failed: %s!\n", strerror(errno));
+                               close(fd);
+                               fd = -1;
+                       }
+               }
                
-               if (option_cache_record_files && fd >= 0) {
+               if (option_cache_record_files && (fd > -1)) {
                        char *c;
 
-                       close(fd);
+                       fclose(bfile);
                        /*
                          We touch orig_fn just as a place-holder so other things (like vmail) see the file is there.
                          What we are really doing is writing to record_cache_dir until we are done then we will mv the file into place.
@@ -897,16 +924,25 @@ struct ast_filestream *ast_writefile(const char *filename, const char *type, con
 
                        size = strlen(fn) + strlen(record_cache_dir) + 2;
                        buf = alloca(size);
-                       memset(buf, 0, size);
-                       snprintf(buf, size, "%s/%s", record_cache_dir, fn);
+                       strcpy(buf, record_cache_dir);
+                       strcat(buf, "/");
+                       strcat(buf, fn);
                        free(fn);
                        fn = buf;
                        fd = open(fn, flags | myflags, mode);
+                       if (fd > -1) {
+                               /* fdopen() the resulting file stream */
+                               bfile = fdopen(fd, ((flags | myflags) & O_RDWR) ? "w+" : "w");
+                               if (!bfile) {
+                                       ast_log(LOG_WARNING, "Whoa, fdopen failed: %s!\n", strerror(errno));
+                                       close(fd);
+                                       fd = -1;
+                               }
+                       }
                }
-               if (fd >= 0) {
+               if (fd > -1) {
                        errno = 0;
-
-                       if ((fs = f->rewrite(fd, comment))) {
+                       if ((fs = f->rewrite(bfile, comment))) {
                                fs->trans = NULL;
                                fs->fmt = f;
                                fs->flags = flags;
@@ -986,6 +1022,7 @@ int ast_waitstream(struct ast_channel *c, const char *breakon)
                                        return -1;
                                case AST_CONTROL_RINGING:
                                case AST_CONTROL_ANSWER:
+                               case AST_CONTROL_VIDUPDATE:
                                        /* Unimportant */
                                        break;
                                default:
@@ -1140,11 +1177,74 @@ int ast_waitstream_full(struct ast_channel *c, const char *breakon, int audiofd,
        return (c->_softhangup ? -1 : 0);
 }
 
+int ast_waitstream_exten(struct ast_channel *c, const char *context)
+{
+       /* Waitstream, with return in the case of a valid 1 digit extension */
+       /* in the current or specified context being pressed */
+       /* XXX Maybe I should just front-end ast_waitstream_full ? XXX */
+       int res;
+       struct ast_frame *fr;
+       char exten[AST_MAX_EXTENSION];
+
+       if (!context) context = c->context;
+       while(c->stream) {
+               res = ast_sched_wait(c->sched);
+               if ((res < 0) && !c->timingfunc) {
+                       ast_stopstream(c);
+                       break;
+               }
+               if (res < 0)
+                       res = 1000;
+               res = ast_waitfor(c, res);
+               if (res < 0) {
+                       ast_log(LOG_WARNING, "Select failed (%s)\n", strerror(errno));
+                       return res;
+               } else if (res > 0) {
+                       fr = ast_read(c);
+                       if (!fr) {
+#if 0
+                               ast_log(LOG_DEBUG, "Got hung up\n");
+#endif
+                               return -1;
+                       }
+                       
+                       switch(fr->frametype) {
+                       case AST_FRAME_DTMF:
+                               res = fr->subclass;
+                               snprintf(exten, sizeof(exten), "%c", res);
+                               if (ast_exists_extension(c, context, exten, 1, c->cid.cid_num)) {
+                                       ast_frfree(fr);
+                                       return res;
+                               }
+                               break;
+                       case AST_FRAME_CONTROL:
+                               switch(fr->subclass) {
+                               case AST_CONTROL_HANGUP:
+                                       ast_frfree(fr);
+                                       return -1;
+                               case AST_CONTROL_RINGING:
+                               case AST_CONTROL_ANSWER:
+                                       /* Unimportant */
+                                       break;
+                               default:
+                                       ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", fr->subclass);
+                               }
+                       }
+                       /* Ignore */
+                       ast_frfree(fr);
+               }
+               ast_sched_runq(c->sched);
+       }
+       return (c->_softhangup ? -1 : 0);
+}
+
 static int show_file_formats(int fd, int argc, char *argv[])
 {
 #define FORMAT "%-10s %-10s %-20s\n"
 #define FORMAT2 "%-10s %-10s %-20s\n"
        struct ast_format *f;
+       int count_fmt = 0;
+
        if (argc != 3)
                return RESULT_SHOWUSAGE;
        ast_cli(fd, FORMAT, "Format", "Name", "Extensions");
@@ -1158,9 +1258,14 @@ static int show_file_formats(int fd, int argc, char *argv[])
        while(f) {
                ast_cli(fd, FORMAT2, ast_getformatname(f->format), f->name, f->exts);
                f = f->next;
+               count_fmt++;
        };
        ast_mutex_unlock(&formatlock);
+       ast_cli(fd, "%d file formats registered.\n", count_fmt);
        return RESULT_SUCCESS;
+#undef FORMAT
+#undef FORMAT2
+       
 }
 
 struct ast_cli_entry show_file =