← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_tempfile.cc

  • Committer: Brian Aker
  • Date: 2008-12-02 16:33:43 UTC
  • mfrom: (632.1.19 devel)
  • Revision ID: brian@tangent.org-20081202163343-007ifg17p0lvjga7
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_tempfile.cc
53
53
*/
54
54
 
55
55
File create_temp_file(char *to, const char *dir, const char *prefix,
56
 
                      int mode __attribute__((unused)),
57
 
                      myf MyFlags __attribute__((unused)))
 
56
                      int,
 
57
                      myf MyFlags)
58
58
{
59
59
  File file= -1;
60
60
 
63
63
    dir=getenv("TMPDIR");
64
64
  if ((res=tempnam((char*) dir,(char *) prefix)))
65
65
  {
66
 
    strmake(to,res,FN_REFLEN-1);
 
66
    strncpy(to,res,FN_REFLEN-1);
67
67
    (*free)(res);
68
68
    file=my_create(to, 0, mode | O_EXCL, MyFlags);
69
69
  }
104
104
  }
105
105
#elif defined(HAVE_TEMPNAM)
106
106
  {
 
107
    (void)MyFlags;
107
108
    char *res,**old_env,*temp_env[1];
108
109
    if (dir && !dir[0])
109
110
    {                           /* Change empty string to current dir */
119
120
    }
120
121
    if ((res=tempnam((char*) dir, (char*) prefix)))
121
122
    {
122
 
      strmake(to,res,FN_REFLEN-1);
 
123
      strncpy(to,res,FN_REFLEN-1);
123
124
      (*free)(res);
124
125
      file=my_create(to,0,
125
126
                     (int) (O_RDWR | O_TRUNC | O_EXCL),