From c083ac57b17ee9b110778bc642a7631f41f27487 Mon Sep 17 00:00:00 2001 From: Minseok Choi Date: Mon, 16 May 2016 00:43:26 -0700 Subject: [PATCH] Revert "Sync with tizen_2.4, 201601" - Fix bug of file name contain 2 more '.' - Fix mime type and extension bug - Fix smack issue for usb drive This reverts commit d190ef2fd09507881dbc45f9875774138ad85d9f. Change-Id: I6d309f791b4c67218eb2f8b6958f2461be85787a --- agent/download-agent-file.c | 59 +++++++++++++------------------------- packaging/download-provider.spec | 2 +- provider/download-provider-smack.c | 25 ++++++---------- 3 files changed, 30 insertions(+), 56 deletions(-) diff --git a/agent/download-agent-file.c b/agent/download-agent-file.c index 05866ac..ca794c0 100755 --- a/agent/download-agent-file.c +++ b/agent/download-agent-file.c @@ -68,7 +68,7 @@ ERR: return ret; } -da_ret_t __divide_file_name_into_pure_name_N_extesion(const char *in_file_name, char *url, char **out_pure_file_name, char **out_extension) +da_ret_t __divide_file_name_into_pure_name_N_extesion(const char *in_file_name, char **out_pure_file_name, char **out_extension) { char *file_name = DA_NULL; char *tmp_ptr = DA_NULL; @@ -83,32 +83,13 @@ da_ret_t __divide_file_name_into_pure_name_N_extesion(const char *in_file_name, return DA_ERR_INVALID_ARGUMENT; file_name = (char *)in_file_name; - - if(url) { - char *extension = DA_NULL; - da_bool_t b_ret = da_get_extension_name_from_url(url, &extension); - if (b_ret && !extension) { -#if 0 - tmp_ptr = strrchr(file_name, '.'); - if (tmp_ptr) - tmp_ptr++; - if (tmp_ptr && out_extension) { - strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1); - *out_extension = strdup((const char*) tmp_ext); - DA_SECURE_LOGD("extension [%s]", *out_extension); - } -#endif - *out_extension = NULL; - } - } else { - tmp_ptr = strrchr(file_name, '.'); - if (tmp_ptr) - tmp_ptr++; - if (tmp_ptr && out_extension) { - strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1); - *out_extension = strdup((const char*) tmp_ext); - DA_SECURE_LOGD("extension [%s]", *out_extension); - } + tmp_ptr = strrchr(file_name, '.'); + if (tmp_ptr) + tmp_ptr++; + if (tmp_ptr && out_extension) { + strncpy((char*) tmp_ext, tmp_ptr, sizeof(tmp_ext) - 1); + *out_extension = strdup((const char*) tmp_ext); + DA_SECURE_LOGD("extension [%s]", *out_extension); } if (!out_pure_file_name) @@ -136,7 +117,7 @@ da_ret_t __divide_file_name_into_pure_name_N_extesion(const char *in_file_name, (const char*) temp_file); } - DA_LOGD( "pure file name [%s]", *out_pure_file_name); + DA_LOGV( "pure file name [%s]", *out_pure_file_name); return ret; } @@ -303,12 +284,12 @@ char *__get_extension_name(char *mime_type, } /* Priority 2-1 */ if (file_name_from_header) { - char *extension = DA_NULL; - DA_SECURE_LOGI("Content-Disposition :[%s]", file_name_from_header); - __divide_file_name_into_pure_name_N_extesion(file_name_from_header, DA_NULL, - DA_NULL, &extension); - if (extension) - return extension; + char *extension = DA_NULL; + DA_SECURE_LOGI("Content-Disposition :[%s]", file_name_from_header); + __divide_file_name_into_pure_name_N_extesion(file_name_from_header, + DA_NULL, &extension); + if (extension) + return extension; } /* Priority 2-2 */ if (url) { @@ -336,16 +317,16 @@ da_ret_t __get_candidate_file_name(char *user_file_name, char *url, /* Priority 1 */ if (user_file_name) { - __divide_file_name_into_pure_name_N_extesion( - user_file_name, url, out_pure_file_name, out_extension); + __divide_file_name_into_pure_name_N_extesion( + user_file_name, out_pure_file_name, out_extension); } if (*out_pure_file_name) return ret; /* Priority 2 */ if (file_name_from_header) { - DA_SECURE_LOGI("Content-Disposition:[%s]", file_name_from_header); - __divide_file_name_into_pure_name_N_extesion(file_name_from_header, DA_NULL, - out_pure_file_name, DA_NULL); + DA_SECURE_LOGI("Content-Disposition:[%s]", file_name_from_header); + __divide_file_name_into_pure_name_N_extesion(file_name_from_header, + out_pure_file_name, DA_NULL); } if (*out_pure_file_name) return ret ; diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec index ea47df0..435fa41 100755 --- a/packaging/download-provider.spec +++ b/packaging/download-provider.spec @@ -1,7 +1,7 @@ %define _ux_define tizen2.3 Name: download-provider Summary: Download the contents in background -Version: 2.1.40 +Version: 2.1.30 Release: 0 Group: Development/Libraries License: Apache-2.0 diff --git a/provider/download-provider-smack.c b/provider/download-provider-smack.c index 9128a58..216822e 100644 --- a/provider/download-provider-smack.c +++ b/provider/download-provider-smack.c @@ -32,22 +32,15 @@ static int __dp_smack_is_transmute(char *path) { - char *dir_label = NULL; - int ret = -1; - if (smack_getlabel(path, &dir_label, SMACK_LABEL_TRANSMUTE) == 0 && dir_label != NULL) { - if (strncmp(dir_label, "TRUE", strlen(dir_label)) == 0) { - ret = 0; - } - } - - if (smack_getlabel(path, &dir_label, SMACK_LABEL_ACCESS) == 0 && dir_label != NULL) { - if (strncmp(dir_label, "*", strlen(dir_label)) == 0) { - ret = 0; - } - } - - free(dir_label); - return ret; + char *dir_label = NULL; + int ret = -1; + if (smack_getlabel(path, &dir_label, SMACK_LABEL_TRANSMUTE) == 0 && + dir_label != NULL) { + if (strncmp(dir_label, "TRUE", strlen(dir_label)) == 0) + ret = 0; + } + free(dir_label); + return ret; } int dp_smack_is_mounted() -- 2.7.4