← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/local_infile.c

  • Committer: Brian Aker
  • Date: 2008-08-18 04:35:40 UTC
  • mfrom: (342 codestyle)
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: brian@tangent.org-20080818043540-numg7vydi7b0bzcd
Mering Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/local_infile.c
19
19
 
20
20
 
21
21
#include <drizzled/global.h>
22
 
#include <mysys/my_sys.h>
23
22
#include "my_time.h"
24
 
#include <mysys/mysys_err.h>
25
 
#include <mystrings/m_string.h>
26
 
#include <mystrings/m_ctype.h>
27
23
#include "drizzle.h"
28
24
#include "errmsg.h"
29
25
#include <vio/violite.h>
183
179
  data->error_num=    0;
184
180
  data->filename= filename;
185
181
 
186
 
  fn_format(tmp_name, filename, "", "", MY_UNPACK_FILENAME);
187
 
  if ((data->fd = my_open(tmp_name, O_RDONLY, MYF(0))) < 0)
 
182
  if ((data->fd = open(tmp_name, O_RDONLY)) < 0)
188
183
  {
189
 
    data->error_num= my_errno;
 
184
    data->error_num= errno;
190
185
    snprintf(data->error_msg, sizeof(data->error_msg)-1,
191
 
             EE(EE_FILENOTFOUND), tmp_name, data->error_num);
 
186
             _("File '%s' not found (Errcode: %d)"), tmp_name, data->error_num);
192
187
    return 1;
193
188
  }
194
189
  return 0; /* ok */
215
210
  int count;
216
211
  default_local_infile_data*data = (default_local_infile_data *) ptr;
217
212
 
218
 
  if ((count= (int) my_read(data->fd, (uchar *) buf, buf_len, MYF(0))) < 0)
 
213
  if ((count= (int) read(data->fd, (uchar *) buf, buf_len)) < 0)
219
214
  {
220
 
    data->error_num= EE_READ; /* the errmsg for not entire file read */
 
215
    data->error_num= 2; /* the errmsg for not entire file read */
221
216
    snprintf(data->error_msg, sizeof(data->error_msg)-1,
222
 
             EE(EE_READ),
223
 
             data->filename, my_errno);
 
217
             _("Error reading file '%s' (Errcode: %d)"),
 
218
             data->filename, errno);
224
219
  }
225
220
  return count;
226
221
}
243
238
  if (data)          /* If not error on open */
244
239
  {
245
240
    if (data->fd >= 0)
246
 
      my_close(data->fd, MYF(MY_WME));
 
241
      close(data->fd);
247
242
    free(ptr);
248
243
  }
249
244
}