← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_lib.c

Giant merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_lib.c
17
17
/*       Convert MSDOS-TIME to standar time_t (still needed?) */
18
18
 
19
19
#include        "mysys_priv.h"
20
 
#include        <m_string.h>
 
20
#include        <mystrings/m_string.h>
21
21
#include        <my_dir.h>      /* Structs used by my_dir,includes sys/types */
22
22
#include        "mysys_err.h"
23
23
#if defined(HAVE_DIRENT_H)
133
133
                                               sizeof(struct stat))))
134
134
        goto error;
135
135
      
136
 
      bzero(finfo.mystat, sizeof(struct stat));
 
136
      memset(finfo.mystat, 0, sizeof(struct stat));
137
137
      VOID(strmov(tmp_file,dp->d_name));
138
138
      VOID(stat(tmp_path, finfo.mystat));
139
 
      if (!(finfo.mystat->st_mode & MY_S_IREAD))
 
139
      if (!(finfo.mystat->st_mode & S_IREAD))
140
140
        continue;
141
141
    }
142
142
    else