← 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-05-27 01:25:56 UTC
  • mfrom: (1567.1.4 new-staging)
  • Revision ID: brian@gaz-20100527012556-5zgkirkl7swbigd6
Merge of Brian, Paul. PBXT compile issue, and test framework cleanup. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/mf_fn_ext.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
 
17
 
#include "mysys_priv.h"
18
 
#include <mystrings/m_string.h>
 
16
#include "config.h"
 
17
 
 
18
#include "drizzled/internal/my_sys.h"
 
19
#include "drizzled/internal/m_string.h"
 
20
 
 
21
namespace drizzled
 
22
{
 
23
namespace internal
 
24
{
19
25
 
20
26
/*
21
27
  Return a pointer to the extension of the filename.
37
43
{
38
44
  register const char *pos, *gpos;
39
45
 
40
 
#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR) || defined(BASKSLASH_MBTAIL)
 
46
#if defined(FN_DEVCHAR)
41
47
  {
42
48
    char buff[FN_REFLEN];
43
49
    size_t res_length;
48
54
    gpos= name;
49
55
#endif
50
56
  pos=strchr(gpos,FN_EXTCHAR);
51
 
  return((char*) (pos ? pos : strend(gpos)));
 
57
  return((char*) (pos ? pos : strchr(gpos, '\0')));
52
58
} /* fn_ext */
 
59
 
 
60
} /* namespace internal */
 
61
} /* namespace drizzled */