← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/archive_reader.c

  • Committer: Andy Lester
  • Date: 2008-08-10 02:15:48 UTC
  • mto: (266.1.31 use-replace-funcs)
  • mto: This revision was merged to the branch mainline in revision 295.
  • Revision ID: andy@petdance.com-20080810021548-0zx8nhzva6al10k3
Added a proper const qualifer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/archive_reader.c
7
7
#include <mystrings/m_string.h>
8
8
#include <mysys/my_getopt.h>
9
9
 
 
10
#define BUFFER_LEN 1024
 
11
#define ARCHIVE_ROW_HEADER_SIZE 4
 
12
 
10
13
#define SHOW_VERSION "0.1"
11
14
 
12
15
static void get_options(int *argc,char * * *argv);
35
38
    return 0;
36
39
  }
37
40
 
38
 
  if (!(ret= azopen(&reader_handle, argv[0], O_RDONLY, AZ_METHOD_BLOCK)))
 
41
  if (!(ret= azopen(&reader_handle, argv[0], O_RDONLY|O_BINARY, AZ_METHOD_BLOCK)))
39
42
  {
40
43
    printf("Could not open Archive file\n");
41
44
    return 0;
58
61
      new_auto_increment_value= reader_handle.auto_increment + 1;
59
62
    }
60
63
 
61
 
    if (!(ret= azopen(&writer_handle, argv[0], O_CREAT|O_RDWR, 
 
64
    if (!(ret= azopen(&writer_handle, argv[0], O_CREAT|O_RDWR|O_BINARY, 
62
65
                      AZ_METHOD_BLOCK)))
63
66
    {
64
67
      printf("Could not open file for update: %s\n", argv[0]);
149
152
    }
150
153
 
151
154
 
152
 
    if (!(ret= azopen(&writer_handle, argv[1], O_CREAT|O_RDWR,
 
155
    if (!(ret= azopen(&writer_handle, argv[1], O_CREAT|O_RDWR|O_BINARY,
153
156
                      AZ_METHOD_BLOCK)))
154
157
    {
155
158
      printf("Could not open file for backup: %s\n", argv[1]);
163
166
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
164
167
      azread_frm(&reader_handle, ptr);
165
168
      azwrite_frm(&writer_handle, ptr, reader_handle.frm_length);
166
 
      free(ptr);
 
169
      my_free(ptr, MYF(0));
167
170
    }
168
171
 
169
172
    if (reader_handle.comment_length)
172
175
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.comment_length, MYF(0));
173
176
      azread_comment(&reader_handle, ptr);
174
177
      azwrite_comment(&writer_handle, ptr, reader_handle.comment_length);
175
 
      free(ptr);
 
178
      my_free(ptr, MYF(0));
176
179
    }
177
180
 
178
181
    while ((read= azread_row(&reader_handle, &error)))
204
207
  {
205
208
    File frm_file;
206
209
    char *ptr;
207
 
    frm_file= my_open(argv[1], O_CREAT|O_RDWR, MYF(0));
 
210
    frm_file= my_open(argv[1], O_CREAT|O_RDWR|O_BINARY, MYF(0));
208
211
    ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
209
212
    azread_frm(&reader_handle, ptr);
210
 
    my_write(frm_file, (unsigned char*) ptr, reader_handle.frm_length, MYF(0));
 
213
    my_write(frm_file, (uchar*) ptr, reader_handle.frm_length, MYF(0));
211
214
    my_close(frm_file, MYF(0));
212
 
    free(ptr);
 
215
    my_free(ptr, MYF(0));
213
216
  }
214
217
 
215
218
end:
310
313
       license\n");
311
314
  puts("Read and modify Archive files directly\n");
312
315
  printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
313
 
  print_defaults("drizzle", load_default_groups);
 
316
  print_defaults("my", load_default_groups);
314
317
  my_print_help(my_long_options);
315
318
}
316
319
 
322
325
 
323
326
static void get_options(int *argc, char ***argv)
324
327
{
325
 
  load_defaults("drizzle", load_default_groups, argc, argv);
 
328
  load_defaults("my", load_default_groups, argc, argv);
326
329
  default_argv= *argv;
327
330
 
328
331
  handle_options(argc, argv, my_long_options, get_one_option);