From: Vikas Kumar Agrawal Date: Thu, 22 Mar 2018 13:19:43 +0000 (+0530) Subject: Merge branch 'tizen_4.0' into tizen X-Git-Tag: submit/tizen/20180329.080913^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02bb4aa37a100ed64cc7b1182212a8c5f5a504f7;p=profile%2Fmobile%2Fapps%2Fnative%2Fmyfiles.git Merge branch 'tizen_4.0' into tizen Conflicts: src/common/file-operation/mf-request.c src/common/file-system/mf-file-attr.c src/common/mf-callback.c src/common/mf-detail.c src/common/mf-file-util.c src/common/mf-fm-svc-wrapper.c src/common/mf-launch.c src/common/mf-media-content.c src/common/mf-otg.c src/common/mf-storage-space.c src/common/mf-ug-detail-fs.c src/common/mf-util.c src/media-db/mf-media-db.c src/media-db/mf-media.c src/mf-main.c src/thumbnail/mf-thumb-gen.c src/widget/mf-category-view.c src/widget/mf-detail-view.c src/widget/mf-edit-view.c src/widget/mf-gengrid.c src/widget/mf-genlist.c src/widget/mf-navi-bar.c src/widget/mf-object-item.c src/widget/mf-object.c src/widget/mf-popup.c src/widget/mf-root-view.c src/widget/mf-search-bar.c src/widget/mf-search-view.c src/widget/mf-tray-item.c src/widget/mf-view.c Change-Id: I081420aa5631a02b00402b93f1fdb859805ec743 --- 02bb4aa37a100ed64cc7b1182212a8c5f5a504f7 diff --cc src/common/file-system/mf-file-attr.c index ef5aeac,f0276b4..f0276b4 mode 100644,100644..100755 --- a/src/common/file-system/mf-file-attr.c +++ b/src/common/file-system/mf-file-attr.c diff --cc src/common/mf-callback.c index 9a65057,988bf71..988bf71 mode 100644,100644..100755 --- a/src/common/mf-callback.c +++ b/src/common/mf-callback.c diff --cc src/common/mf-detail.c index 63f698a,949d0cf..949d0cf mode 100644,100644..100755 --- a/src/common/mf-detail.c +++ b/src/common/mf-detail.c diff --cc src/common/mf-file-util.c index c9b3a02,86cb366..23c4ecf mode 100644,100644..100755 --- a/src/common/mf-file-util.c +++ b/src/common/mf-file-util.c @@@ -207,16 -268,16 +268,18 @@@ int mf_file_cp(const char *src, const c FILE *f1 = NULL; FILE *f2 = NULL; char buf[BUF_MAX] = { 0, }; //TODO: How about moving buf to heap instead of stack -- char realpath1[PATH_MAX_SIZE] = { 0, }; -- char realpath2[PATH_MAX_SIZE] = { 0, }; ++ char *src_real_path = NULL; ++ char *dest_real_path = NULL; size_t num; int ret = 1; -- if (!realpath(src, realpath1)) { -- return 0; -- } -- -- if (realpath(dst, realpath2) && !strcmp(realpath1, realpath2)) { ++ src_real_path = realpath(src, NULL); ++ dest_real_path = realpath(dst, NULL); ++ if (!src_real_path || !dest_real_path || !strcmp(src_real_path, dest_real_path)) { ++ if (src_real_path) ++ free(src_real_path); ++ if (dest_real_path) ++ free(dest_real_path); return 0; } @@@ -239,7 -300,7 +302,8 @@@ fclose(f1); fclose(f2); -- ++ free(src_real_path); ++ free(dest_real_path); return ret; } diff --cc src/common/mf-fm-svc-wrapper.c index bc0dbf2,27f782a..27f782a mode 100644,100644..100755 --- a/src/common/mf-fm-svc-wrapper.c +++ b/src/common/mf-fm-svc-wrapper.c diff --cc src/common/mf-launch.c index 63df3c5,bbab703..bbab703 mode 100644,100644..100755 --- a/src/common/mf-launch.c +++ b/src/common/mf-launch.c diff --cc src/common/mf-media-content.c index 18b7541,727ce66..727ce66 mode 100644,100644..100755 --- a/src/common/mf-media-content.c +++ b/src/common/mf-media-content.c diff --cc src/common/mf-otg.c index 9acb713,c799f9c..c799f9c mode 100644,100644..100755 --- a/src/common/mf-otg.c +++ b/src/common/mf-otg.c diff --cc src/common/mf-storage-space.c index fd8de7e,ca2cfe7..ca2cfe7 mode 100644,100644..100755 --- a/src/common/mf-storage-space.c +++ b/src/common/mf-storage-space.c diff --cc src/common/mf-ug-detail-fs.c index 57137ee,b13e40e..b13e40e mode 100644,100644..100755 --- a/src/common/mf-ug-detail-fs.c +++ b/src/common/mf-ug-detail-fs.c diff --cc src/common/mf-util.c index 4a3fa69,5a7922e..5a7922e mode 100644,100644..100755 --- a/src/common/mf-util.c +++ b/src/common/mf-util.c diff --cc src/media-db/mf-media-db.c index 8463979,374e41a..374e41a mode 100644,100644..100755 --- a/src/media-db/mf-media-db.c +++ b/src/media-db/mf-media-db.c diff --cc src/media-db/mf-media.c index 90c9356,efd8d4a..efd8d4a mode 100644,100644..100755 --- a/src/media-db/mf-media.c +++ b/src/media-db/mf-media.c diff --cc src/mf-main.c index 34944f8,3d5f1b2..3d5f1b2 mode 100644,100644..100755 --- a/src/mf-main.c +++ b/src/mf-main.c diff --cc src/thumbnail/mf-thumb-gen.c index 292ab8a,7917928..7917928 mode 100644,100644..100755 --- a/src/thumbnail/mf-thumb-gen.c +++ b/src/thumbnail/mf-thumb-gen.c diff --cc src/widget/mf-category-view.c index ec403d9,76849ca..76849ca mode 100644,100644..100755 --- a/src/widget/mf-category-view.c +++ b/src/widget/mf-category-view.c diff --cc src/widget/mf-detail-view.c index e6c6351,6ab20f4..6ab20f4 mode 100644,100644..100755 --- a/src/widget/mf-detail-view.c +++ b/src/widget/mf-detail-view.c diff --cc src/widget/mf-edit-view.c index 834db9d,89b66b6..89b66b6 mode 100644,100644..100755 --- a/src/widget/mf-edit-view.c +++ b/src/widget/mf-edit-view.c diff --cc src/widget/mf-gengrid.c index cb6c619,7dec25b..7dec25b mode 100644,100644..100755 --- a/src/widget/mf-gengrid.c +++ b/src/widget/mf-gengrid.c diff --cc src/widget/mf-genlist.c index b26c679,aaac7e3..aaac7e3 mode 100644,100644..100755 --- a/src/widget/mf-genlist.c +++ b/src/widget/mf-genlist.c diff --cc src/widget/mf-navi-bar.c index 83896e4,4412b51..4412b51 mode 100644,100644..100755 --- a/src/widget/mf-navi-bar.c +++ b/src/widget/mf-navi-bar.c diff --cc src/widget/mf-object-item.c index 992d617,173395b..173395b mode 100644,100644..100755 --- a/src/widget/mf-object-item.c +++ b/src/widget/mf-object-item.c diff --cc src/widget/mf-object.c index 2c529ed,e1bb245..e1bb245 mode 100644,100644..100755 --- a/src/widget/mf-object.c +++ b/src/widget/mf-object.c diff --cc src/widget/mf-popup.c index dc5c21b,b73b487..b73b487 mode 100644,100644..100755 --- a/src/widget/mf-popup.c +++ b/src/widget/mf-popup.c diff --cc src/widget/mf-root-view.c index a64a411,38d364a..38d364a mode 100644,100644..100755 --- a/src/widget/mf-root-view.c +++ b/src/widget/mf-root-view.c diff --cc src/widget/mf-search-bar.c index 0f57716,92434fd..92434fd mode 100644,100644..100755 --- a/src/widget/mf-search-bar.c +++ b/src/widget/mf-search-bar.c diff --cc src/widget/mf-search-view.c index 921e25d,d85e1a2..d85e1a2 mode 100644,100644..100755 --- a/src/widget/mf-search-view.c +++ b/src/widget/mf-search-view.c diff --cc src/widget/mf-tray-item.c index 72e97bf,08aaf8e..08aaf8e mode 100644,100644..100755 --- a/src/widget/mf-tray-item.c +++ b/src/widget/mf-tray-item.c diff --cc src/widget/mf-view.c index bd95e47,96688a1..96688a1 mode 100644,100644..100755 --- a/src/widget/mf-view.c +++ b/src/widget/mf-view.c