← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Brian Aker
  • Date: 2008-09-28 03:20:53 UTC
  • mto: This revision was merged to the branch mainline in revision 413.
  • Revision ID: brian@tangent.org-20080928032053-rclc4iiwmwedsf73
Work on removing GNU specific calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
258
258
 
259
259
  fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */
260
260
  if (!opt_local_file)
261
 
    stpcpy(hard_path,filename);
 
261
    my_stpcpy(hard_path,filename);
262
262
  else
263
263
    my_load_path(hard_path, filename, NULL); /* filename includes the path */
264
264
 
292
292
    opt_local_file ? "LOCAL" : "", hard_path);
293
293
  end= strchr(sql_statement, '\0');
294
294
  if (opt_replace)
295
 
    end= stpcpy(end, " REPLACE");
 
295
    end= my_stpcpy(end, " REPLACE");
296
296
  if (ignore)
297
 
    end= stpcpy(end, " IGNORE");
298
 
  end= stpcpy(stpcpy(end, " INTO TABLE "), tablename);
 
297
    end= my_stpcpy(end, " IGNORE");
 
298
  end= my_stpcpy(my_stpcpy(end, " INTO TABLE "), tablename);
299
299
 
300
300
  if (fields_terminated || enclosed || opt_enclosed || escaped)
301
 
      end= stpcpy(end, " FIELDS");
 
301
      end= my_stpcpy(end, " FIELDS");
302
302
  end= add_load_option(end, fields_terminated, " TERMINATED BY");
303
303
  end= add_load_option(end, enclosed, " ENCLOSED BY");
304
304
  end= add_load_option(end, opt_enclosed,
306
306
  end= add_load_option(end, escaped, " ESCAPED BY");
307
307
  end= add_load_option(end, lines_terminated, " LINES TERMINATED BY");
308
308
  if (opt_ignore_lines >= 0)
309
 
    end= stpcpy(int64_t10_to_str(opt_ignore_lines,
310
 
          stpcpy(end, " IGNORE "),10), " LINES");
 
309
    end= my_stpcpy(int64_t10_to_str(opt_ignore_lines,
 
310
          my_stpcpy(end, " IGNORE "),10), " LINES");
311
311
  if (opt_columns)
312
 
    end= stpcpy(stpcpy(stpcpy(end, " ("), opt_columns), ")");
 
312
    end= my_stpcpy(my_stpcpy(my_stpcpy(end, " ("), opt_columns), ")");
313
313
  *end= '\0';
314
314
 
315
315
  if (drizzle_query(drizzle, sql_statement))