← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_cache.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:
mysys/mf_cache.c
17
17
 
18
18
#include "mysys_priv.h"
19
19
#include <mystrings/m_string.h>
20
 
#include "my_static.h"
21
 
#include "mysys_err.h"
22
 
 
23
 
        /*
24
 
          Remove an open tempfile so that it doesn't survive
25
 
          if we crash;  If the operating system doesn't support
26
 
          this, just remember the file name for later removal
27
 
        */
28
 
 
29
 
static bool cache_remove_open_tmp(IO_CACHE *cache __attribute__((unused)),
30
 
                                     const char *name)
31
 
{
32
 
#if O_TEMPORARY == 0
33
 
#if !defined(CANT_DELETE_OPEN_FILES)
34
 
  /* The following should always succeed */
35
 
  (void) my_delete(name,MYF(MY_WME | ME_NOINPUT));
36
 
#else
37
 
  int length;
38
 
  if (!(cache->file_name=
39
 
        (char*) my_malloc((length=strlen(name)+1),MYF(MY_WME))))
40
 
  {
41
 
    my_close(cache->file,MYF(0));
42
 
    cache->file = -1;
43
 
    errno=my_errno=ENOMEM;
44
 
    return 1;
45
 
  }
46
 
  memcpy(cache->file_name,name,length);
47
 
#endif
48
 
#endif /* O_TEMPORARY == 0 */
49
 
  return 0;
50
 
}
 
20
#include <mysys/my_static.h>
 
21
#include <mysys/mysys_err.h>
 
22
#include <mysys/iocache.h>
 
23
 
51
24
 
52
25
        /*
53
26
        ** Open tempfile cached by IO_CACHE
70
43
  {
71
44
    return(0);
72
45
  }
73
 
  my_free(cache->dir,   MYF(MY_ALLOW_ZERO_PTR));
74
 
  my_free(cache->prefix,MYF(MY_ALLOW_ZERO_PTR));
 
46
  free(cache->dir);
 
47
  free(cache->prefix);
75
48
  return(1);
76
49
}
77
50
 
82
55
  char name_buff[FN_REFLEN];
83
56
  int error=1;
84
57
  if ((cache->file=create_temp_file(name_buff, cache->dir, cache->prefix,
85
 
                                    (O_RDWR | O_BINARY | O_TRUNC |
86
 
                                     O_TEMPORARY | O_SHORT_LIVED),
 
58
                                    (O_RDWR | O_TRUNC),
87
59
                                    MYF(MY_WME))) >= 0)
88
60
  {
89
61
    error=0;
90
 
    cache_remove_open_tmp(cache, name_buff);
 
62
    my_delete(name_buff,MYF(MY_WME | ME_NOINPUT));
91
63
  }
92
64
  return(error);
93
65
}
107
79
      if (cache->file_name)
108
80
      {
109
81
        (void) my_delete(cache->file_name,MYF(MY_WME | ME_NOINPUT));
110
 
        my_free(cache->file_name,MYF(0));
 
82
        free(cache->file_name);
111
83
      }
112
84
#endif
113
85
    }
114
 
    my_free(cache->dir,MYF(MY_ALLOW_ZERO_PTR));
115
 
    my_free(cache->prefix,MYF(MY_ALLOW_ZERO_PTR));
 
86
    free(cache->dir);
 
87
    free(cache->prefix);
116
88
  }
117
89
  return;
118
90
}