← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/archive_reader.c

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

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