← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix into lp:ubuntu-filemanager-app

 

Carlos Jose Mazieri has proposed merging lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix into lp:ubuntu-filemanager-app.

Commit message:
Fixes Samba browsing crash on he phone related to the "struct stat" addressing files using 32 bits only instead of 64 bits

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix/+merge/273000

Fixes Samba browsing crash on he phone related to the "struct stat" addressing files using 32 bits only instead of 64 bits
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~carlos-mazieri/ubuntu-filemanager-app/samba-crash-fix into lp:ubuntu-filemanager-app.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-08 10:45:41 +0000
+++ CMakeLists.txt	2015-09-30 23:42:20 +0000
@@ -21,6 +21,10 @@
 set(CONTENT_HUB_EXPORTER hub-exporter.json)
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
 
+# global FILE definitions for stat system call, it works for any sub module
+add_definitions(-D_LARGEFILE_SOURCE)
+add_definitions(-D_FILE_OFFSET_BITS=64)
+
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
         set(BZR_SOURCE "lp:${LP_PROJECT}")

=== modified file 'src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri'
--- src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri	2015-07-15 17:42:37 +0000
+++ src/plugin/folderlistmodel/smb/qsambaclient/qsambaclient.pri	2015-09-30 23:42:20 +0000
@@ -24,4 +24,6 @@
 CONFIG    *= link_pkgconfig
 PKGCONFIG *= smbclient
 
+DEFINES *= _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
+
 INCLUDEPATH += $$PWD/src


Follow ups