Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

app_voicemail, say: Fix various leading whitespace problems

Browse Source 
In af90afd90c, Japanese language support
was added to app_voicemail and main/say.c, but the leading whitespace
is not consistent with Asterisk coding guidelines. This patch fixes
that.

Whitespace only, no functional change.

ASTERISK~23324
Reported by: Kevin McCoy

Change-Id: I72c725f5930084673749bd7c9cc426a987f08e87
17.2
Sean Bright 5 years ago
parent 8cad8db7d3
commit cb6f106d76
2 changed files with 654 additions and 653 deletions
Show Stats Download Patch File Download Diff File

351
apps/app_voicemail.c
Unescape View File

@ -7889,29 +7889,29 @@ static int get_folder(struct ast_channel *chan, int start)
/* Japanese Syntax */ /* Japanese Syntax */
static int get_folder_ja(struct ast_channel *chan, int start) static int get_folder_ja(struct ast_channel *chan, int start)
{ {
int x; int x;
int d; int d;
char fn[256]; char fn[256];
for (x = start; x< 5; x++) { /* For all folders */ for (x = start; x < 5; x++) { /* For all folders */
if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, ast_channel_language(chan), (char *) NULL))) { if ((d = ast_say_number(chan, x, AST_DIGIT_ANY, ast_channel_language(chan), (char *) NULL))) {
return d; return d;
} }
snprintf(fn, sizeof(fn), "vm-%s", mbox(NULL, x)); /* Folder name */ snprintf(fn, sizeof(fn), "vm-%s", mbox(NULL, x)); /* Folder name */
d = vm_play_folder_name(chan, fn); d = vm_play_folder_name(chan, fn);
if (d) { if (d) {
return d; return d;
} }
d = ast_waitfordigit(chan, 500); d = ast_waitfordigit(chan, 500);
if (d) { if (d) {
return d; return d;
} }
}
d = ast_play_and_wait(chan, "vm-tocancel"); /* "or pound to cancel" */
if (d) {
return d;
} }
d = ast_waitfordigit(chan, 4000); d = ast_play_and_wait(chan, "vm-tocancel"); /* "or pound to cancel" */
return d; if (d) {
return d;
}
d = ast_waitfordigit(chan, 4000);
return d;
} }
/*! /*!
@ -7933,13 +7933,13 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start)
res = ast_play_and_wait(chan, fn); /* Folder name */ res = ast_play_and_wait(chan, fn); /* Folder name */
while (((res < '0') || (res > '9')) && while (((res < '0') || (res > '9')) &&
(res != '#') && (res >= 0) && (res != '#') && (res >= 0) &&
loops < 4) { loops < 4) {
/* res = get_folder(chan, 0); */ /* res = get_folder(chan, 0); */
if (!strcasecmp(ast_channel_language(chan),"ja")) { /* Japanese syntax */ if (!strcasecmp(ast_channel_language(chan), "ja")) { /* Japanese syntax */
res = get_folder_ja(chan, 0); res = get_folder_ja(chan, 0);
} else { /* Default syntax */ } else { /* Default syntax */
res = get_folder(chan, 0); res = get_folder(chan, 0);
} }
loops++; loops++;
} }
@ -9309,15 +9309,15 @@ static int vm_play_folder_name_gr(struct ast_channel *chan, char *box)
static int vm_play_folder_name_ja(struct ast_channel *chan, char *box) static int vm_play_folder_name_ja(struct ast_channel *chan, char *box)
{ {
int cmd; int cmd;
if (!strcasecmp(box, "vm-INBOX") || !strcasecmp(box, "vm-Old")) { if (!strcasecmp(box, "vm-INBOX") || !strcasecmp(box, "vm-Old")) {
cmd = ast_play_and_wait(chan, box); cmd = ast_play_and_wait(chan, box);
return cmd ? cmd : ast_play_and_wait(chan, "vm-messages"); return cmd ? cmd : ast_play_and_wait(chan, "vm-messages");
} else { } else {
cmd = ast_play_and_wait(chan, box); cmd = ast_play_and_wait(chan, box);
return cmd; return cmd;
} }
} }
static int vm_play_folder_name_pl(struct ast_channel *chan, char *box) static int vm_play_folder_name_pl(struct ast_channel *chan, char *box)
@ -9362,8 +9362,8 @@ static int vm_play_folder_name(struct ast_channel *chan, char *box)
return vm_play_folder_name_gr(chan, box); return vm_play_folder_name_gr(chan, box);
} else if (!strncasecmp(ast_channel_language(chan), "he", 2)) { /* Hebrew syntax */ } else if (!strncasecmp(ast_channel_language(chan), "he", 2)) { /* Hebrew syntax */
return ast_play_and_wait(chan, box); return ast_play_and_wait(chan, box);
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */ } else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
return vm_play_folder_name_ja(chan, box); return vm_play_folder_name_ja(chan, box);
} else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) { } else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) {
return vm_play_folder_name_pl(chan, box); return vm_play_folder_name_pl(chan, box);
} else if (!strncasecmp(ast_channel_language(chan), "ua", 2)) { /* Ukrainian syntax */ } else if (!strncasecmp(ast_channel_language(chan), "ua", 2)) { /* Ukrainian syntax */
@ -9591,40 +9591,40 @@ static int vm_intro_he(struct ast_channel *chan, struct vm_state *vms)
/* Japanese syntax */ /* Japanese syntax */
static int vm_intro_ja(struct ast_channel *chan,struct vm_state *vms) static int vm_intro_ja(struct ast_channel *chan,struct vm_state *vms)
{ {
/* Introduce messages they have */ /* Introduce messages they have */
int res; int res;
if (vms->newmessages) { if (vms->newmessages) {
res = ast_play_and_wait(chan, "vm-INBOX"); res = ast_play_and_wait(chan, "vm-INBOX");
if (!res) if (!res)
res = ast_play_and_wait(chan, "vm-message"); res = ast_play_and_wait(chan, "vm-message");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-ga"); res = ast_play_and_wait(chan, "jp-ga");
if (!res) if (!res)
res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan)); res = say_and_wait(chan, vms->newmessages, ast_channel_language(chan));
if (vms->oldmessages && !res) if (vms->oldmessages && !res)
res = ast_play_and_wait(chan, "silence/1"); res = ast_play_and_wait(chan, "silence/1");
} }
if (vms->oldmessages) { if (vms->oldmessages) {
res = ast_play_and_wait(chan, "vm-Old"); res = ast_play_and_wait(chan, "vm-Old");
if (!res) if (!res)
res = ast_play_and_wait(chan, "vm-message"); res = ast_play_and_wait(chan, "vm-message");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-ga"); res = ast_play_and_wait(chan, "jp-ga");
if (!res) if (!res)
res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan));
} }
if (!vms->oldmessages && !vms->newmessages) { if (!vms->oldmessages && !vms->newmessages) {
res = ast_play_and_wait(chan, "vm-messages"); res = ast_play_and_wait(chan, "vm-messages");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-wa"); res = ast_play_and_wait(chan, "jp-wa");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-arimasen"); res = ast_play_and_wait(chan, "jp-arimasen");
} }
else { else {
res = ast_play_and_wait(chan, "jp-arimasu"); res = ast_play_and_wait(chan, "jp-arimasu");
} }
return res; return res;
} /* Japanese */ } /* Japanese */
/* Default English syntax */ /* Default English syntax */
@ -10538,82 +10538,82 @@ static int vm_instructions_en(struct ast_channel *chan, struct ast_vm_user *vmu,
static int vm_instructions_ja(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) static int vm_instructions_ja(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
{ {
int res = 0; int res = 0;
/* Play instructions and wait for new command */ /* Play instructions and wait for new command */
while (!res) { while (!res) {
if (vms->starting) { if (vms->starting) {
if (vms->lastmsg > -1) { if (vms->lastmsg > -1) {
res = vm_play_folder_name(chan, vms->vmbox); res = vm_play_folder_name(chan, vms->vmbox);
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-wa"); res = ast_play_and_wait(chan, "jp-wa");
if (!res) if (!res)
res = ast_play_and_wait(chan, "digits/1"); res = ast_play_and_wait(chan, "digits/1");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-wo"); res = ast_play_and_wait(chan, "jp-wo");
if (!res) if (!res)
res = ast_play_and_wait(chan, "silence/1"); res = ast_play_and_wait(chan, "silence/1");
} }
if (!res) if (!res)
res = ast_play_and_wait(chan, "vm-opts"); res = ast_play_and_wait(chan, "vm-opts");
} else { } else {
/* Added for additional help */ /* Added for additional help */
if (skipadvanced) { if (skipadvanced) {
res = vm_play_folder_name(chan, vms->vmbox); res = vm_play_folder_name(chan, vms->vmbox);
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-wa"); res = ast_play_and_wait(chan, "jp-wa");
if (!res) if (!res)
res = ast_play_and_wait(chan, "digits/1"); res = ast_play_and_wait(chan, "digits/1");
if (!res) if (!res)
res = ast_play_and_wait(chan, "jp-wo"); res = ast_play_and_wait(chan, "jp-wo");
if (!res) if (!res)
res = ast_play_and_wait(chan, "silence/1"); res = ast_play_and_wait(chan, "silence/1");
res = ast_play_and_wait(chan, "vm-opts-full"); res = ast_play_and_wait(chan, "vm-opts-full");
} }
/* Logic: /* Logic:
* If the current message is not the first OR * If the current message is not the first OR
* if we're listening to the first new message and there are * if we're listening to the first new message and there are
* also urgent messages, then prompt for navigation to the * also urgent messages, then prompt for navigation to the
* previous message * previous message
*/ */
if (vms->curmsg || (!in_urgent && vms->urgentmessages > 0) || (ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0)) { if (vms->curmsg || (!in_urgent && vms->urgentmessages > 0) || (ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0)) {
res = ast_play_and_wait(chan, "vm-prev"); res = ast_play_and_wait(chan, "vm-prev");
} }
if (!res && !skipadvanced) if (!res && !skipadvanced)
res = ast_play_and_wait(chan, "vm-advopts"); res = ast_play_and_wait(chan, "vm-advopts");
if (!res) if (!res)
res = ast_play_and_wait(chan, "vm-repeat"); res = ast_play_and_wait(chan, "vm-repeat");
/* Logic: /* Logic:
* If we're not listening to the last message OR * If we're not listening to the last message OR
* we're listening to the last urgent message and there are * we're listening to the last urgent message and there are
* also new non-urgent messages, then prompt for navigation * also new non-urgent messages, then prompt for navigation
* to the next message * to the next message
*/ */
if (!res && ((vms->curmsg != vms->lastmsg) || (in_urgent && vms->newmessages > 0) || if (!res && ((vms->curmsg != vms->lastmsg) || (in_urgent && vms->newmessages > 0) ||
(ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0) )) { (ast_test_flag(vmu, VM_MESSAGEWRAP) && vms->lastmsg > 0) )) {
res = ast_play_and_wait(chan, "vm-next"); res = ast_play_and_wait(chan, "vm-next");
} }
if (!res) { if (!res) {
int curmsg_deleted; int curmsg_deleted;
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
ast_mutex_lock(&vms->lock); ast_mutex_lock(&vms->lock);
#endif #endif
curmsg_deleted = vms->deleted[vms->curmsg]; curmsg_deleted = vms->deleted[vms->curmsg];
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
ast_mutex_unlock(&vms->lock); ast_mutex_unlock(&vms->lock);
#endif #endif
if (!curmsg_deleted) { if (!curmsg_deleted) {
res = ast_play_and_wait(chan, "vm-delete"); res = ast_play_and_wait(chan, "vm-delete");
} else { } else {
res = ast_play_and_wait(chan, "vm-undelete"); res = ast_play_and_wait(chan, "vm-undelete");
} }
if (!res) { if (!res) {
res = ast_play_and_wait(chan, "vm-toforward"); res = ast_play_and_wait(chan, "vm-toforward");
} }
if (!res) { if (!res) {
res = ast_play_and_wait(chan, "vm-savemessage"); res = ast_play_and_wait(chan, "vm-savemessage");
} }
} }
} }
if (!res) { if (!res) {
res = ast_play_and_wait(chan, "vm-helpexit"); res = ast_play_and_wait(chan, "vm-helpexit");
@ -10629,7 +10629,7 @@ static int vm_instructions_ja(struct ast_channel *chan, struct ast_vm_user *vmu,
} }
return res; return res;
} }
static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
@ -10658,16 +10658,15 @@ static int vm_instructions_zh(struct ast_channel *chan, struct ast_vm_user *vmu,
static int vm_instructions(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent) static int vm_instructions(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int skipadvanced, int in_urgent)
{ {
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */ if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* Japanese syntax */
return vm_instructions_ja(chan, vmu, vms, skipadvanced, in_urgent); return vm_instructions_ja(chan, vmu, vms, skipadvanced, in_urgent);
} else if (vms->starting && !strncasecmp(ast_channel_language(chan), "zh", 2)) { /* CHINESE (Taiwan) syntax */ } else if (vms->starting && !strncasecmp(ast_channel_language(chan), "zh", 2)) { /* CHINESE (Taiwan) syntax */
return vm_instructions_zh(chan, vmu, vms, skipadvanced, in_urgent); return vm_instructions_zh(chan, vmu, vms, skipadvanced, in_urgent);
} else { /* Default to ENGLISH */ } else { /* Default to ENGLISH */
return vm_instructions_en(chan, vmu, vms, skipadvanced, in_urgent); return vm_instructions_en(chan, vmu, vms, skipadvanced, in_urgent);
} }
} }
static int vm_newuser_setup(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain) static int vm_newuser_setup(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain)
{ {
int cmd = 0; int cmd = 0;
@ -11093,21 +11092,21 @@ static int vm_browse_messages_it(struct ast_channel *chan, struct vm_state *vms,
*/ */
static int vm_browse_messages_ja(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu) static int vm_browse_messages_ja(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu)
{ {
int cmd = 0; int cmd = 0;
if (vms->lastmsg > -1) { if (vms->lastmsg > -1) {
cmd = play_message(chan, vmu, vms); cmd = play_message(chan, vmu, vms);
} else { } else {
snprintf(vms->fn, sizeof(vms->fn), "vm-%s", vms->curbox); snprintf(vms->fn, sizeof(vms->fn), "vm-%s", vms->curbox);
cmd = ast_play_and_wait(chan, vms->fn); cmd = ast_play_and_wait(chan, vms->fn);
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "vm-messages"); cmd = ast_play_and_wait(chan, "vm-messages");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "jp-wa"); cmd = ast_play_and_wait(chan, "jp-wa");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "jp-arimasen"); cmd = ast_play_and_wait(chan, "jp-arimasen");
} }
return cmd; return cmd;
} }
/*! /*!
@ -11235,8 +11234,8 @@ static int vm_browse_messages(struct ast_channel *chan, struct vm_state *vms, st
return vm_browse_messages_he(chan, vms, vmu); return vm_browse_messages_he(chan, vms, vmu);
} else if (!strncasecmp(ast_channel_language(chan), "it", 2)) { /* ITALIAN */ } else if (!strncasecmp(ast_channel_language(chan), "it", 2)) { /* ITALIAN */
return vm_browse_messages_it(chan, vms, vmu); return vm_browse_messages_it(chan, vms, vmu);
} else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* JAPANESE */ } else if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { /* JAPANESE */
return vm_browse_messages_ja(chan, vms, vmu); return vm_browse_messages_ja(chan, vms, vmu);
} else if (!strncasecmp(ast_channel_language(chan), "pt", 2)) { /* PORTUGUESE */ } else if (!strncasecmp(ast_channel_language(chan), "pt", 2)) { /* PORTUGUESE */
return vm_browse_messages_pt(chan, vms, vmu); return vm_browse_messages_pt(chan, vms, vmu);
} else if (!strncasecmp(ast_channel_language(chan), "vi", 2)) { /* VIETNAMESE */ } else if (!strncasecmp(ast_channel_language(chan), "vi", 2)) { /* VIETNAMESE */
@ -12192,22 +12191,22 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
break; break;
case '*': /* Help */ case '*': /* Help */
if (!vms.starting) { if (!vms.starting) {
if (!strncasecmp(ast_channel_language(chan), "ja", 2)) { if (!strncasecmp(ast_channel_language(chan), "ja", 2)) {
cmd = vm_play_folder_name(chan, vms.vmbox); cmd = vm_play_folder_name(chan, vms.vmbox);
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "jp-wa"); cmd = ast_play_and_wait(chan, "jp-wa");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "digits/1"); cmd = ast_play_and_wait(chan, "digits/1");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "jp-wo"); cmd = ast_play_and_wait(chan, "jp-wo");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "silence/1"); cmd = ast_play_and_wait(chan, "silence/1");
if (!cmd) if (!cmd)
cmd = ast_play_and_wait(chan, "vm-opts"); cmd = ast_play_and_wait(chan, "vm-opts");
if (!cmd) if (!cmd)
cmd = vm_instructions(chan, vmu, &vms, 1, in_urgent); cmd = vm_instructions(chan, vmu, &vms, 1, in_urgent);
break; break;
} }
cmd = ast_play_and_wait(chan, "vm-onefor"); cmd = ast_play_and_wait(chan, "vm-onefor");
if (!strncasecmp(ast_channel_language(chan), "he", 2)) { if (!strncasecmp(ast_channel_language(chan), "he", 2)) {
cmd = ast_play_and_wait(chan, "vm-for"); cmd = ast_play_and_wait(chan, "vm-for");

956
main/say.c
Unescape View File

@ -2040,31 +2040,31 @@ static void powiedz(struct ast_channel *chan, const char *language, int audiofd,
m100 = m1000 % 100; m100 = m1000 % 100;
i100 = m1000 / 100; i100 = m1000 / 100;
if (i100>0) if (i100>0)
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->setki[i100]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->setki[i100]);
if (m100 > 0 && m100 <= 9) { if (m100 > 0 && m100 <= 9) {
if (m1000 > 0) if (m1000 > 0)
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100]);
else else
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry[m100]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry[m100]);
} else if (m100 % 10 == 0 && m100 != 0) { } else if (m100 % 10 == 0 && m100 != 0) {
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
} else if (m100 > 10 && m100 <= 19) { } else if (m100 > 10 && m100 <= 19) {
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->nastki[m100 % 10]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->nastki[m100 % 10]);
} else if (m100 > 20) { } else if (m100 > 20) {
if (odm->separator_dziesiatek[0] == ' ') { if (odm->separator_dziesiatek[0] == ' ') {
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->dziesiatki[m100 / 10]);
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100 % 10]); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, odm->cyfry2[m100 % 10]);
} else { } else {
char buf[10]; char buf[10];
char *b = buf; char *b = buf;
b = pl_append(b, odm->dziesiatki[m100 / 10]); b = pl_append(b, odm->dziesiatki[m100 / 10]);
b = pl_append(b, odm->separator_dziesiatek); b = pl_append(b, odm->separator_dziesiatek);
pl_append(b, odm->cyfry2[m100 % 10]); pl_append(b, odm->cyfry2[m100 % 10]);
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, buf); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, buf);
} }
} }
if (rzad > 0) { if (rzad > 0) {
pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, pl_rzad_na_tekst(odm, i, rzad)); pl_odtworz_plik(chan, language, audiofd, ctrlfd, ints, pl_rzad_na_tekst(odm, i, rzad));
@ -7913,66 +7913,67 @@ static int ast_say_number_full_gr(struct ast_channel *chan, int num, const char
/* Japanese syntax */ /* Japanese syntax */
static int ast_say_number_full_ja(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd) static int ast_say_number_full_ja(struct ast_channel *chan, int num, const char *ints, const char *language, int audiofd, int ctrlfd)
{ {
int res = 0; int res = 0;
int playh = 0; int playh = 0;
char fn[256] = ""; char fn[256] = "";
if (!num)
return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd); if (!num)
return ast_say_digits_full(chan, 0, ints, language, audiofd, ctrlfd);
while (!res && (num || playh)) {
if (num < 0) { while (!res && (num || playh)) {
ast_copy_string(fn, "digits/minus", sizeof(fn)); if (num < 0) {
if ( num > INT_MIN ) { ast_copy_string(fn, "digits/minus", sizeof(fn));
num = -num; if ( num > INT_MIN ) {
} else { num = -num;
num = 0; } else {
} num = 0;
} else if (playh) { }
ast_copy_string(fn, "digits/hundred", sizeof(fn)); } else if (playh) {
playh = 0; ast_copy_string(fn, "digits/hundred", sizeof(fn));
} else if (num < 20) { playh = 0;
snprintf(fn, sizeof(fn), "digits/%d", num); } else if (num < 20) {
num = 0; snprintf(fn, sizeof(fn), "digits/%d", num);
} else if (num < 100) { num = 0;
snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10); } else if (num < 100) {
num %= 10; snprintf(fn, sizeof(fn), "digits/%d", (num /10) * 10);
} else { num %= 10;
if (num < 1000){ } else {
snprintf(fn, sizeof(fn), "digits/%d", (num/100)); if (num < 1000){
playh++; snprintf(fn, sizeof(fn), "digits/%d", (num/100));
num %= 100; playh++;
} else { num %= 100;
if (num < 1000000) { /* 1,000,000 */ } else {
res = ast_say_number_full_en(chan, num / 1000, ints, language, audiofd, ctrlfd); if (num < 1000000) { /* 1,000,000 */
if (res) res = ast_say_number_full_en(chan, num / 1000, ints, language, audiofd, ctrlfd);
return res; if (res)
num %= 1000; return res;
snprintf(fn, sizeof(fn), "digits/thousand"); num %= 1000;
} else { snprintf(fn, sizeof(fn), "digits/thousand");
if (num < 1000000000) { /* 1,000,000,000 */ } else {
res = ast_say_number_full_en(chan, num / 1000000, ints, language, audiofd, ctrlfd); if (num < 1000000000) { /* 1,000,000,000 */
if (res) res = ast_say_number_full_en(chan, num / 1000000, ints, language, audiofd, ctrlfd);
return res; if (res)
num %= 1000000; return res;
ast_copy_string(fn, "digits/million", sizeof(fn)); num %= 1000000;
} else { ast_copy_string(fn, "digits/million", sizeof(fn));
ast_debug(1, "Number '%d' is too big for me\n", num); } else {
res = -1; ast_debug(1, "Number '%d' is too big for me\n", num);
} res = -1;
} }
} }
} }
if (!res) { }
if (!ast_streamfile(chan, fn, language)) { if (!res) {
if ((audiofd > -1) && (ctrlfd > -1)) if (!ast_streamfile(chan, fn, language)) {
res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); if ((audiofd > -1) && (ctrlfd > -1))
else res = ast_waitstream_full(chan, ints, audiofd, ctrlfd);
res = ast_waitstream(chan, ints); else
} res = ast_waitstream(chan, ints);
ast_stopstream(chan); }
} ast_stopstream(chan);
} }
return res; }
return res;
} }
@ -8023,34 +8024,36 @@ static int ast_say_date_gr(struct ast_channel *chan, time_t t, const char *ints,
/* Japanese syntax */ /* Japanese syntax */
int ast_say_date_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang) int ast_say_date_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
{ {
struct ast_tm tm; struct ast_tm tm;
struct timeval tv = { t, 0 }; struct timeval tv = { t, 0 };
char fn[256]; char fn[256];
int res = 0; int res = 0;
ast_localtime(&tv, &tm, NULL);
if (!res) ast_localtime(&tv, &tm, NULL);
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/nen", lang); res = ast_waitstream(chan, ints);
if (!res) { if (!res)
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon); res = ast_streamfile(chan, "digits/nen", lang);
res = ast_streamfile(chan, fn, lang); if (!res) {
if (!res) snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = ast_waitstream(chan, ints); res = ast_streamfile(chan, fn, lang);
} if (!res)
if (!res) res = ast_waitstream(chan, ints);
res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL); }
if (!res) if (!res)
res = ast_streamfile(chan, "digits/nichi", lang); res = ast_say_number(chan, tm.tm_mday, ints, lang, (char * ) NULL);
if (!res) { if (!res)
snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday); res = ast_streamfile(chan, "digits/nichi", lang);
res = ast_streamfile(chan, fn, lang); if (!res) {
if (!res) snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
res = ast_waitstream(chan, ints); res = ast_streamfile(chan, fn, lang);
} if (!res)
return res; res = ast_waitstream(chan, ints);
}
return res;
} }
@ -8113,47 +8116,46 @@ static int ast_say_time_gr(struct ast_channel *chan, time_t t, const char *ints,
/* Japanese */ /* Japanese */
static int ast_say_time_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang) static int ast_say_time_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
{ {
struct timeval tv = { t, 0 };
struct ast_tm tm;
int res = 0;
int hour, pm=0;
ast_localtime(&tv, &tm, NULL);
hour = tm.tm_hour;
if (!hour)
hour = 12;
else if (hour == 12)
pm = 1;
else if (hour > 12) {
hour -= 12;
pm = 1;
}
struct timeval tv = { t, 0 }; if (pm) {
struct ast_tm tm; if (!res)
int res = 0; res = ast_streamfile(chan, "digits/p-m", lang);
int hour, pm=0; } else {
if (!res)
ast_localtime(&tv, &tm, NULL); res = ast_streamfile(chan, "digits/a-m", lang);
hour = tm.tm_hour; }
if (hour == 9 || hour == 21) {
if (!hour) if (!res)
hour = 12; res = ast_streamfile(chan, "digits/9_2", lang);
else if (hour == 12) } else {
pm = 1; if (!res)
else if (hour > 12) { res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
hour -= 12; }
pm = 1; if (!res)
} res = ast_streamfile(chan, "digits/ji", lang);
if (!res)
if (pm) { res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/p-m", lang); res = ast_streamfile(chan, "digits/fun", lang);
} else { if (!res)
if (!res) res = ast_waitstream(chan, ints);
res = ast_streamfile(chan, "digits/a-m", lang); return res;
}
if (hour == 9 || hour == 21) {
if (!res)
res = ast_streamfile(chan, "digits/9_2", lang);
} else {
if (!res)
res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
}
if (!res)
res = ast_streamfile(chan, "digits/ji", lang);
if (!res)
res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res)
res = ast_streamfile(chan, "digits/fun", lang);
if (!res)
res = ast_waitstream(chan, ints);
return res;
} }
@ -8194,67 +8196,67 @@ static int ast_say_datetime_gr(struct ast_channel *chan, time_t t, const char *i
/* Japanese syntax */ /* Japanese syntax */
int ast_say_datetime_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang) int ast_say_datetime_ja(struct ast_channel *chan, time_t t, const char *ints, const char *lang)
{ {
struct timeval tv = { t, 0 }; struct timeval tv = { t, 0 };
struct ast_tm tm; struct ast_tm tm;
char fn[256]; char fn[256];
int res = 0; int res = 0;
int hour, pm=0; int hour, pm = 0;
ast_localtime(&tv, &tm, NULL); ast_localtime(&tv, &tm, NULL);
if (!res) if (!res)
res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_year + 1900, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/nen", lang); res = ast_streamfile(chan, "digits/nen", lang);
if (!res) { if (!res) {
snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon); snprintf(fn, sizeof(fn), "digits/mon-%d", tm.tm_mon);
res = ast_streamfile(chan, fn, lang); res = ast_streamfile(chan, fn, lang);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
} }
if (!res) if (!res)
res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_mday, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/nichi", lang); res = ast_streamfile(chan, "digits/nichi", lang);
if (!res) { if (!res) {
snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday); snprintf(fn, sizeof(fn), "digits/day-%d", tm.tm_wday);
res = ast_streamfile(chan, fn, lang); res = ast_streamfile(chan, fn, lang);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
} }
hour = tm.tm_hour; hour = tm.tm_hour;
if (!hour) if (!hour)
hour = 12; hour = 12;
else if (hour == 12) else if (hour == 12)
pm = 1; pm = 1;
else if (hour > 12) { else if (hour > 12) {
hour -= 12; hour -= 12;
pm = 1; pm = 1;
} }
if (pm) { if (pm) {
if (!res) if (!res)
res = ast_streamfile(chan, "digits/p-m", lang); res = ast_streamfile(chan, "digits/p-m", lang);
} else { } else {
if (!res) if (!res)
res = ast_streamfile(chan, "digits/a-m", lang); res = ast_streamfile(chan, "digits/a-m", lang);
} }
if (hour == 9 || hour == 21) { if (hour == 9 || hour == 21) {
if (!res) if (!res)
res = ast_streamfile(chan, "digits/9_2", lang); res = ast_streamfile(chan, "digits/9_2", lang);
} else { } else {
if (!res) if (!res)
res = ast_say_number(chan, hour, ints, lang, (char *) NULL); res = ast_say_number(chan, hour, ints, lang, (char *) NULL);
} }
if (!res) if (!res)
res = ast_streamfile(chan, "digits/ji", lang); res = ast_streamfile(chan, "digits/ji", lang);
if (!res) if (!res)
res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL); res = ast_say_number(chan, tm.tm_min, ints, lang, (char *) NULL);
if (!res) if (!res)
res = ast_streamfile(chan, "digits/fun", lang); res = ast_streamfile(chan, "digits/fun", lang);
if (!res) if (!res)
res = ast_waitstream(chan, ints); res = ast_waitstream(chan, ints);
return res; return res;
} }
/*! \brief Greek support /*! \brief Greek support
@ -8433,269 +8435,269 @@ static int ast_say_date_with_format_gr(struct ast_channel *chan, time_t t, const
/* Japanese syntax */ /* Japanese syntax */
int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone) int ast_say_date_with_format_ja(struct ast_channel *chan, time_t time, const char *ints, const char *lang, const char *format, const char *timezone)
{ {
struct timeval tv = { time, 0 }; struct timeval tv = { time, 0 };
struct ast_tm tm; struct ast_tm tm;
int res=0, offset, sndoffset; int res = 0, offset, sndoffset;
char sndfile[256], nextmsg[256]; char sndfile[256], nextmsg[256];
if (!format) if (!format)
format = "YbdAPIMS"; format = "YbdAPIMS";
ast_localtime(&tv, &tm, timezone); ast_localtime(&tv, &tm, timezone);
for (offset=0 ; format[offset] != '\0' ; offset++) { for (offset = 0; format[offset] != '\0'; offset++) {
ast_log(LOG_DEBUG, "Parsing %c (offset %d) in %s\n", format[offset], offset, format); ast_log(LOG_DEBUG, "Parsing %c (offset %d) in %s\n", format[offset], offset, format);
switch (format[offset]) { switch (format[offset]) {
/* NOTE: if you add more options here, please try to be consistent with strftime(3) */ /* NOTE: if you add more options here, please try to be consistent with strftime(3) */
case '\'': case '\'':
/* Literal name of a sound file */ /* Literal name of a sound file */
for (sndoffset = 0 ; (format[++offset] != '\'') && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) { for (sndoffset = 0; (format[++offset] != '\'') && (sndoffset < sizeof(sndfile) - 1) ; sndoffset++) {
sndfile[sndoffset] = format[offset]; sndfile[sndoffset] = format[offset];
} }
sndfile[sndoffset] = '\0'; sndfile[sndoffset] = '\0';
res = wait_file(chan,ints,sndfile,lang); res = wait_file(chan,ints,sndfile,lang);
break; break;
case 'A': case 'A':
case 'a': case 'a':
/* Sunday - Saturday */ /* Sunday - Saturday */
snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday); snprintf(nextmsg,sizeof(nextmsg), "digits/day-%d", tm.tm_wday);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
break; break;
case 'B': case 'B':
case 'b': case 'b':
case 'h': case 'h':
/* January - December */ /* January - December */
snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon); snprintf(nextmsg,sizeof(nextmsg), "digits/mon-%d", tm.tm_mon);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
break; break;
case 'd': case 'd':
case 'e': case 'e':
/* First - Thirtyfirst */ /* First - Thirtyfirst */
if (tm.tm_mday < 21) { if (tm.tm_mday < 21) {
snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d_2", tm.tm_mday); snprintf(nextmsg,sizeof(nextmsg), "digits/h-%d_2", tm.tm_mday);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} else if (tm.tm_mday < 30) { } else if (tm.tm_mday < 30) {
/* Between 21 and 29 - two sounds */ /* Between 21 and 29 - two sounds */
res = wait_file(chan,ints, "digits/20",lang); res = wait_file(chan,ints, "digits/20",lang);
if (!res) { if (!res) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_mday - 20); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_mday - 20);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
res = wait_file(chan,ints, "digits/nichi",lang); res = wait_file(chan,ints, "digits/nichi",lang);
} else if (tm.tm_mday == 30) { } else if (tm.tm_mday == 30) {
/* 30 */ /* 30 */
res = wait_file(chan,ints, "digits/h-30_2",lang); res = wait_file(chan,ints, "digits/h-30_2",lang);
} else { } else {
/* 31 */ /* 31 */
res = wait_file(chan,ints, "digits/30",lang); res = wait_file(chan,ints, "digits/30",lang);
res = wait_file(chan,ints, "digits/1",lang); res = wait_file(chan,ints, "digits/1",lang);
res = wait_file(chan,ints, "digits/nichi",lang); res = wait_file(chan,ints, "digits/nichi",lang);
} }
break; break;
case 'Y': case 'Y':
/* Year */ /* Year */
if (tm.tm_year > 99) { if (tm.tm_year > 99) {
res = wait_file(chan,ints, "digits/2",lang); res = wait_file(chan,ints, "digits/2",lang);
if (!res) { if (!res) {
res = wait_file(chan,ints, "digits/thousand",lang); res = wait_file(chan,ints, "digits/thousand",lang);
} }
if (tm.tm_year > 100) { if (tm.tm_year > 100) {
if (!res) { if (!res) {
/* This works until the end of 2020 */ /* This works until the end of 2020 */
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year - 100); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year - 100);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} }
} else { } else {
if (tm.tm_year < 1) { if (tm.tm_year < 1) {
/* I'm not going to handle 1900 and prior */ /* I'm not going to handle 1900 and prior */
/* We'll just be silent on the year, instead of bombing out. */ /* We'll just be silent on the year, instead of bombing out. */
} else { } else {
res = wait_file(chan,ints, "digits/19",lang); res = wait_file(chan,ints, "digits/19",lang);
if (!res) { if (!res) {
if (tm.tm_year <= 9) { if (tm.tm_year <= 9) {
/* 1901 - 1909 */ /* 1901 - 1909 */
res = wait_file(chan,ints, "digits/oh",lang); res = wait_file(chan,ints, "digits/oh",lang);
if (!res) { if (!res) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} else if (tm.tm_year <= 20) { } else if (tm.tm_year <= 20) {
/* 1910 - 1920 */ /* 1910 - 1920 */
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_year);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} else { } else {
/* 1921 - 1999 */ /* 1921 - 1999 */
int ten, one; int ten, one;
ten = tm.tm_year / 10; ten = tm.tm_year / 10;
one = tm.tm_year % 10; one = tm.tm_year % 10;
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten * 10); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten * 10);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
if (!res) { if (!res) {
if (one != 0) { if (one != 0) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} }
} }
} }
} }
} }
res = wait_file(chan,ints, "digits/nen",lang); res = wait_file(chan,ints, "digits/nen",lang);
break; break;
case 'P': case 'P':
case 'p': case 'p':
/* AM/PM */ /* AM/PM */
if (tm.tm_hour > 11) if (tm.tm_hour > 11)
snprintf(nextmsg,sizeof(nextmsg), "digits/p-m"); snprintf(nextmsg,sizeof(nextmsg), "digits/p-m");
else else
snprintf(nextmsg,sizeof(nextmsg), "digits/a-m"); snprintf(nextmsg,sizeof(nextmsg), "digits/a-m");
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
break; break;
case 'I': case 'I':
case 'l': case 'l':
/* 12-Hour */ /* 12-Hour */
if (tm.tm_hour == 0) if (tm.tm_hour == 0)
snprintf(nextmsg,sizeof(nextmsg), "digits/12"); snprintf(nextmsg,sizeof(nextmsg), "digits/12");
else if (tm.tm_hour == 9 || tm.tm_hour == 21) else if (tm.tm_hour == 9 || tm.tm_hour == 21)
snprintf(nextmsg,sizeof(nextmsg), "digits/9_2"); snprintf(nextmsg,sizeof(nextmsg), "digits/9_2");
else if (tm.tm_hour > 12) else if (tm.tm_hour > 12)
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour - 12);
else else
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_hour);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
if(!res) res = wait_file(chan,ints, "digits/ji",lang); if(!res) res = wait_file(chan,ints, "digits/ji",lang);
break; break;
case 'H': case 'H':
case 'k': case 'k':
if (!res) { if (!res) {
if (tm.tm_hour != 0) { if (tm.tm_hour != 0) {
int remainder = tm.tm_hour; int remainder = tm.tm_hour;
if (tm.tm_hour > 20) { if (tm.tm_hour > 20) {
res = wait_file(chan,ints, "digits/20",lang); res = wait_file(chan,ints, "digits/20",lang);
remainder -= 20; remainder -= 20;
} }
if (!res) { if (!res) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", remainder);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} }
} }
res = wait_file(chan,ints, "digits/ji",lang); res = wait_file(chan,ints, "digits/ji",lang);
break; break;
case 'M': case 'M':
/* Minute */ /* Minute */
if ((tm.tm_min < 21) || (tm.tm_min % 10 == 0)) { if ((tm.tm_min < 21) || (tm.tm_min % 10 == 0)) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_min);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} else { } else {
int ten, one; int ten, one;
ten = (tm.tm_min / 10) * 10; ten = (tm.tm_min / 10) * 10;
one = (tm.tm_min % 10); one = (tm.tm_min % 10);
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
if (!res) { if (!res) {
/* Fifty, not fifty-zero */ /* Fifty, not fifty-zero */
if (one != 0) { if (one != 0) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} }
} }
res = wait_file(chan,ints, "digits/fun",lang); res = wait_file(chan,ints, "digits/fun",lang);
break; break;
case 'Q': case 'Q':
/* Shorthand for "Today", "Yesterday", or ABdY */ /* Shorthand for "Today", "Yesterday", or ABdY */
{ {
struct timeval now; struct timeval now;
struct ast_tm tmnow; struct ast_tm tmnow;
time_t beg_today; time_t beg_today;
gettimeofday(&now,NULL); gettimeofday(&now,NULL);
ast_localtime(&now,&tmnow,timezone); ast_localtime(&now,&tmnow,timezone);
/* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
/* In any case, it saves not having to do ast_mktime() */ /* In any case, it saves not having to do ast_mktime() */
beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
if (beg_today < time) { if (beg_today < time) {
/* Today */ /* Today */
res = wait_file(chan,ints, "digits/today",lang); res = wait_file(chan,ints, "digits/today",lang);
} else if (beg_today - 86400 < time) { } else if (beg_today - 86400 < time) {
/* Yesterday */ /* Yesterday */
res = wait_file(chan,ints, "digits/yesterday",lang); res = wait_file(chan,ints, "digits/yesterday",lang);
} else { } else {
res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone); res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone);
} }
} }
break; break;
case 'q': case 'q':
/* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */ /* Shorthand for "" (today), "Yesterday", A (weekday), or ABdY */
{ {
struct timeval now; struct timeval now;
struct ast_tm tmnow; struct ast_tm tmnow;
time_t beg_today; time_t beg_today;
gettimeofday(&now,NULL); gettimeofday(&now,NULL);
ast_localtime(&now,&tmnow,timezone); ast_localtime(&now,&tmnow,timezone);
/* This might be slightly off, if we transcend a leap second, but never more off than 1 second */ /* This might be slightly off, if we transcend a leap second, but never more off than 1 second */
/* In any case, it saves not having to do ast_mktime() */ /* In any case, it saves not having to do ast_mktime() */
beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec); beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
if (beg_today < time) { if (beg_today < time) {
/* Today */ /* Today */
} else if ((beg_today - 86400) < time) { } else if ((beg_today - 86400) < time) {
/* Yesterday */ /* Yesterday */
res = wait_file(chan,ints, "digits/yesterday",lang); res = wait_file(chan,ints, "digits/yesterday",lang);
} else if (beg_today - 86400 * 6 < time) { } else if (beg_today - 86400 * 6 < time) {
/* Within the last week */ /* Within the last week */
res = ast_say_date_with_format(chan, time, ints, lang, "A", timezone); res = ast_say_date_with_format(chan, time, ints, lang, "A", timezone);
} else { } else {
res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone); res = ast_say_date_with_format(chan, time, ints, lang, "ABdY", timezone);
} }
} }
break; break;
case 'R': case 'R':
res = ast_say_date_with_format(chan, time, ints, lang, "HM", timezone); res = ast_say_date_with_format(chan, time, ints, lang, "HM", timezone);
break; break;
case 'S': case 'S':
/* Seconds */ /* Seconds */
if (tm.tm_sec == 0) { if (tm.tm_sec == 0) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) { } else if ((tm.tm_sec < 21) || (tm.tm_sec % 10 == 0)) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", tm.tm_sec);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} else { } else {
int ten, one; int ten, one;
ten = (tm.tm_sec / 10) * 10; ten = (tm.tm_sec / 10) * 10;
one = (tm.tm_sec % 10); one = (tm.tm_sec % 10);
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", ten);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
if (!res) { if (!res) {
/* Fifty, not fifty-zero */ /* Fifty, not fifty-zero */
if (one != 0) { if (one != 0) {
snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one); snprintf(nextmsg,sizeof(nextmsg), "digits/%d", one);
res = wait_file(chan,ints,nextmsg,lang); res = wait_file(chan,ints,nextmsg,lang);
} }
} }
} }
res = wait_file(chan,ints, "digits/byou",lang); res = wait_file(chan,ints, "digits/byou",lang);
break; break;
case 'T': case 'T':
res = ast_say_date_with_format(chan, time, ints, lang, "HMS", timezone); res = ast_say_date_with_format(chan, time, ints, lang, "HMS", timezone);
break; break;
case ' ': case ' ':
case ' ': case ' ':
/* Just ignore spaces and tabs */ /* Just ignore spaces and tabs */
break; break;
default: default:
/* Unknown character */ /* Unknown character */
ast_log(LOG_WARNING, "Unknown character in datetime format %s: %c at pos %d\n", format, format[offset], offset); ast_log(LOG_WARNING, "Unknown character in datetime format %s: %c at pos %d\n", format, format[offset], offset);
} }
/* Jump out on DTMF */ /* Jump out on DTMF */
if (res) { if (res) {
break; break;
} }
} }
return res; return res;
} }
/*! \brief Vietnamese syntax */ /*! \brief Vietnamese syntax */

Write Preview
Loading…
Cancel
Save