← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/load_file.cc

  • Committer: Stewart Smith
  • Date: 2009-08-20 17:15:54 UTC
  • mto: (1119.2.2 merge)
  • mto: This revision was merged to the branch mainline in revision 1124.
  • Revision ID: stewart@flamingspork.com-20090820171554-72eo1tqlc4n64rak
Valgrind 3.5 requires --alignment to be a power of 2 between 16 and 4096. The specifying --alignment is not important for us, so remove it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/load_file.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
21
22
#include <drizzled/function/str/strfunc.h>
22
23
#include <drizzled/function/str/load_file.h>
23
24
#include <drizzled/error.h>
24
25
#include <drizzled/data_home.h>
25
26
#include <drizzled/session.h>
26
 
#include "drizzled/internal/my_sys.h"
27
 
 
28
 
#include <fcntl.h>
29
 
#include <sys/stat.h>
30
 
 
31
 
namespace drizzled
32
 
{
33
27
 
34
28
String *Item_load_file::val_str(String *str)
35
29
{
36
30
  assert(fixed == 1);
37
31
  String *file_name;
38
 
  int file;
 
32
  File file;
39
33
  struct stat stat_info;
40
34
  char path[FN_REFLEN];
41
35
 
42
36
  if (!(file_name= args[0]->val_str(str)))
43
37
    goto err;
44
38
 
45
 
  (void) internal::fn_format(path, file_name->c_ptr(), drizzle_real_data_home, "",
 
39
  (void) fn_format(path, file_name->c_ptr(), drizzle_real_data_home, "",
46
40
                   MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
47
41
 
48
42
  /* Read only allowed from within dir specified by secure_file_priv */
68
62
  }
69
63
  if (tmp_value.alloc((size_t)stat_info.st_size))
70
64
    goto err;
71
 
  if ((file = internal::my_open(file_name->c_ptr(), O_RDONLY, MYF(0))) < 0)
 
65
  if ((file = my_open(file_name->c_ptr(), O_RDONLY, MYF(0))) < 0)
72
66
    goto err;
73
 
  if (internal::my_read(file, (unsigned char*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP)))
 
67
  if (my_read(file, (unsigned char*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP)))
74
68
  {
75
 
    internal::my_close(file, MYF(0));
 
69
    my_close(file, MYF(0));
76
70
    goto err;
77
71
  }
78
72
  tmp_value.length((size_t)stat_info.st_size);
79
 
  internal::my_close(file, MYF(0));
 
73
  my_close(file, MYF(0));
80
74
  null_value = 0;
81
75
  return(&tmp_value);
82
76
 
86
80
}
87
81
 
88
82
 
89
 
} /* namespace drizzled */