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

add API function for parsing strings to time_t (issue #6320, with mods)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-02-15 00:24:24 +00:00
parent 124b00c4a4
commit 4662d58b01
8 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/app_sayunixtime.c
View File

@@ -76,45 +76,26 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
struct localuser *u;
char *s,*zone=NULL,*timec,*format;
time_t unixtime;
struct timeval tv;
s = ast_strdupa(data);
if (!s)
return data ? -1 : 0;
LOCAL_USER_ADD(u);
tv = ast_tvnow();
unixtime = (time_t)tv.tv_sec;
format = "c"; /* default datetime */
if( !strcasecmp(chan->language, "da" ) ) {
format = "A dBY HMS";
} else if ( !strcasecmp(chan->language, "de" ) ) {
format = "A dBY HMS";
} else {
format = "ABdY 'digits/at' IMp";
}
if (data) {
s = data;
if ((s = ast_strdupa(s))) {
timec = strsep(&s,"|");
if ((timec) && (*timec != '\0')) {
long timein;
if (sscanf(timec,"%ld",&timein) == 1) {
unixtime = (time_t)timein;
}
}
if (s) {
zone = strsep(&s,"|");
if (zone && (*zone == '\0'))
zone = NULL;
if (s) {
format = s;
}
}
}
timec = strsep(&s,"|");
ast_get_time_t(timec, &unixtime, time(NULL));
if (s) {
zone = strsep(&s,"|");
if (ast_strlen_zero(zone))
zone = NULL;
}
if (s) /* override format */
format = s;
if (chan->_state != AST_STATE_UP) {
if (chan->_state != AST_STATE_UP)
res = ast_answer(chan);
}
if (!res)
res = ast_say_date_with_format(chan, unixtime, AST_DIGIT_ANY, chan->language, format, zone);

8
apps/app_voicemail.c
View File

@@ -3608,25 +3608,21 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
int res = 0;
struct vm_zone *the_zone = NULL;
time_t t;
long tin;
if (sscanf(origtime,"%ld",&tin) < 1) {
if (ast_get_time_t(origtime, &t, 0)) {
ast_log(LOG_WARNING, "Couldn't find origtime in %s\n", filename);
return 0;
}
t = tin;
/* Does this user have a timezone specified? */
if (!ast_strlen_zero(vmu->zonetag)) {
/* Find the zone in the list */
struct vm_zone *z;
z = zones;
while (z) {
for (z = zones; z; z = z->next) {
if (!strcmp(z->name, vmu->zonetag)) {
the_zone = z;
break;
}
z = z->next;
}
}