← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/mf_fn_ext.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/mf_fn_ext.cc
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
 
17
 
#include "mysys_priv.h"
18
 
#include <mystrings/m_string.h>
 
17
#include "drizzled/internal/mysys_priv.h"
 
18
#include "drizzled/internal/m_string.h"
19
19
 
20
20
/*
21
21
  Return a pointer to the extension of the filename.
37
37
{
38
38
  register const char *pos, *gpos;
39
39
 
40
 
#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR) || defined(BASKSLASH_MBTAIL)
 
40
#if defined(FN_DEVCHAR)
41
41
  {
42
42
    char buff[FN_REFLEN];
43
43
    size_t res_length;
48
48
    gpos= name;
49
49
#endif
50
50
  pos=strchr(gpos,FN_EXTCHAR);
51
 
  return((char*) (pos ? pos : strend(gpos)));
 
51
  return((char*) (pos ? pos : strchr(gpos, '\0')));
52
52
} /* fn_ext */