From 67d6a0a6195a72bce251891fccbd38929d5586dc Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 1 Dec 2009 20:28:28 +0000 Subject: fixes to compile on MacOSX (no fuse client) These changes are required to make GlusterFS compile on MacOSX (10.5). Currently glusterfs server component alone will work over Mac, and it has to be built with following options to ./configure. "bash$ ./configure --disable-fuse-client --disable-fusermount " Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 361 (GlusterFS 3.0 should work on Mac OS/X) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=361 --- xlators/features/trash/src/trash.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'xlators/features/trash') diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index 378c579b9..aa5cea0d1 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -111,7 +111,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -154,7 +154,7 @@ trash_unlink_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -410,7 +410,7 @@ trash_rename_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, tmp_dirname = strchr (tmp_str + count + 1, '/'); - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -866,7 +866,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -909,7 +909,7 @@ trash_truncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -1227,7 +1227,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } @@ -1271,7 +1271,7 @@ trash_ftruncate_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; tmp_dirname = strchr (tmp_str + count + 1, '/'); } - tmp_path = strndup (local->newpath, count); + tmp_path = memdup (local->newpath, count); if (!tmp_path) { gf_log (this->name, GF_LOG_DEBUG, "out of memory"); } -- cgit