diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-22 17:22:37 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-22 17:22:37 +0000 |
| commit | cfc369cefa6309a56a2eb9f42ab1d72910b2aa95 (patch) | |
| tree | 4753867bb95e326a09f1f7af1720bb4040854acd /stdtime | |
| parent | 9e4e3861f451d004c7a4cc881375d2ad304f6ab6 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@51403 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'stdtime')
| -rw-r--r-- | stdtime/localtime.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stdtime/localtime.c b/stdtime/localtime.c index db125d9e6..e620d27be 100644 --- a/stdtime/localtime.c +++ b/stdtime/localtime.c @@ -56,6 +56,7 @@ #include "tzfile.h" #include "asterisk/lock.h" #include "asterisk/localtime.h" +#include "asterisk/strings.h" #ifndef lint @@ -1051,7 +1052,7 @@ const char * const zone; #ifdef _THREAD_SAFE ast_mutex_lock(&lcl_mutex); #endif - ast_tzset(zone); + ast_tzset(ast_strlen_zero(zone) ? "/etc/localtime" : zone); localsub(timep, 0L, p_tm, zone); #ifdef _THREAD_SAFE ast_mutex_unlock(&lcl_mutex); @@ -1495,8 +1496,8 @@ const char * const zone; #ifdef _THREAD_SAFE ast_mutex_lock(&lcl_mutex); #endif - ast_tzset(zone); - mktime_return_value = time1(tmp, localsub, 0L, zone); + ast_tzset(!ast_strlen_zero(zone) ? zone : "/etc/localtime"); + mktime_return_value = time1(tmp, localsub, 0L, !ast_strlen_zero(zone) ? zone : "/etc/localtime"); #ifdef _THREAD_SAFE ast_mutex_unlock(&lcl_mutex); #endif |