kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility fix for OpenBSD

Browse Source 
Report and fix by: mvanbaak
(Closes issue #11669)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-03 01:59:27 +00:00
parent b7f3b78031
commit 77ecc4a46a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_ices.c
View File

@@ -86,11 +86,11 @@ static int icesencode(char *filename, int fd)
close(x); close(x);
} }
/* Most commonly installed in /usr/local/bin */ /* Most commonly installed in /usr/local/bin */
execl(ICES, "ices", filename, NULL); execl(ICES, "ices", filename, (char *)NULL);
/* But many places has it in /usr/bin */ /* But many places has it in /usr/bin */
execl(LOCAL_ICES, "ices", filename, NULL); execl(LOCAL_ICES, "ices", filename, (char *)NULL);
/* As a last-ditch effort, try to use PATH */ /* As a last-ditch effort, try to use PATH */
execlp("ices", "ices", filename, NULL); execlp("ices", "ices", filename, (char *)NULL);
ast_log(LOG_WARNING, "Execute of ices failed\n"); ast_log(LOG_WARNING, "Execute of ices failed\n");
_exit(0); _exit(0);
} }

12
apps/app_mp3.c
View File

@@ -82,19 +82,19 @@ static int mp3play(char *filename, int fd)
/* Execute mpg123, but buffer if it's a net connection */ /* Execute mpg123, but buffer if it's a net connection */
if (!strncasecmp(filename, "http://", 7)) { if (!strncasecmp(filename, "http://", 7)) {
/* Most commonly installed in /usr/local/bin */ /* Most commonly installed in /usr/local/bin */
execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, NULL); execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
/* But many places has it in /usr/bin */ /* But many places has it in /usr/bin */
execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, NULL); execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
/* As a last-ditch effort, try to use PATH */ /* As a last-ditch effort, try to use PATH */
execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, NULL); execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
} }
else { else {
/* Most commonly installed in /usr/local/bin */ /* Most commonly installed in /usr/local/bin */
execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL); execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
/* But many places has it in /usr/bin */ /* But many places has it in /usr/bin */
execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL); execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
/* As a last-ditch effort, try to use PATH */ /* As a last-ditch effort, try to use PATH */
execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, NULL); execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
} }
ast_log(LOG_WARNING, "Execute of mpg123 failed\n"); ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
_exit(0); _exit(0);

4
main/asterisk.c
View File

@@ -2894,13 +2894,13 @@ int main(int argc, char *argv[])
for (fd = 0; fd < 100; fd++) for (fd = 0; fd < 100; fd++)
close(fd); close(fd);
execlp("astcanary", "astcanary", canary_filename, NULL); execlp("astcanary", "astcanary", canary_filename, (char *)NULL);
/* If not found, try the same path as used to execute asterisk */ /* If not found, try the same path as used to execute asterisk */
ast_copy_string(canary_binary, argv[0], sizeof(canary_binary)); ast_copy_string(canary_binary, argv[0], sizeof(canary_binary));
if ((lastslash = strrchr(canary_binary, '/'))) { if ((lastslash = strrchr(canary_binary, '/'))) {
ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1)); ast_copy_string(lastslash + 1, "astcanary", sizeof(canary_binary) + canary_binary - (lastslash + 1));
execl(canary_binary, "astcanary", canary_filename, NULL); execl(canary_binary, "astcanary", canary_filename, (char *)NULL);
} }
/* Should never happen */ /* Should never happen */