diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-31 16:36:06 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-06-01 04:06:12 +0200 |
| commit | c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde (patch) | |
| tree | 21939b3dee3e786c9ec4c00eb6b832f2560bd371 /source3/modules | |
| parent | 1cee71713f75dbee653ea86bd4e7c87efe677cf6 (diff) | |
| download | samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.gz samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.bz2 samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.zip | |
Remove the char * argument from the SMB_VFS_GETWD() call. Now always
returns malloc'ed memory.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jun 1 04:06:12 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_default.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 8 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index faacf25599..2dc7ec75b8 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -748,16 +748,14 @@ static int vfswrap_chdir(vfs_handle_struct *handle, const char *path) return result; } -static char *vfswrap_getwd(vfs_handle_struct *handle, char *path) +static char *vfswrap_getwd(vfs_handle_struct *handle) { char *result; START_PROFILE(syscall_getwd); result = sys_getwd(); END_PROFILE(syscall_getwd); - /* FIXME - with a VFS change. JRA !! */ - strlcpy(path, result, PATH_MAX); - return path; + return result; } /********************************************************************* diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 3b9c20a16b..bf7dacdc1f 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1208,14 +1208,14 @@ static int smb_full_audit_chdir(vfs_handle_struct *handle, return result; } -static char *smb_full_audit_getwd(vfs_handle_struct *handle, - char *path) +static char *smb_full_audit_getwd(vfs_handle_struct *handle) { char *result; - result = SMB_VFS_NEXT_GETWD(handle, path); + result = SMB_VFS_NEXT_GETWD(handle); - do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", path); + do_log(SMB_VFS_OP_GETWD, (result != NULL), handle, "%s", + result == NULL? "" : result); return result; } diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index d21542ca79..0f32619458 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -869,14 +869,14 @@ static int smb_time_audit_chdir(vfs_handle_struct *handle, const char *path) return result; } -static char *smb_time_audit_getwd(vfs_handle_struct *handle, char *path) +static char *smb_time_audit_getwd(vfs_handle_struct *handle) { char *result; struct timespec ts1,ts2; double timediff; clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_GETWD(handle, path); + result = SMB_VFS_NEXT_GETWD(handle); clock_gettime_mono(&ts2); timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; |