← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_dirname.cc

  • Committer: Brian Aker
  • Date: 2009-10-15 18:32:22 UTC
  • mfrom: (1130.3.47 memory-file-moves)
  • Revision ID: brian@gaz-20091015183222-n79fjde41epz9u6g
Merge memory

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_dirname.cc
34
34
  gpos= pos++;
35
35
  for ( ; *pos ; pos++)                         /* Find last FN_LIBCHAR */
36
36
  {
37
 
    if (*pos == FN_LIBCHAR || *pos == '/'
38
 
#ifdef FN_C_AFTER_DIR
39
 
        || *pos == FN_C_AFTER_DIR || *pos == FN_C_AFTER_DIR_2
40
 
#endif
41
 
        )
 
37
    if (*pos == FN_LIBCHAR || *pos == '/')
42
38
      gpos=pos;
43
39
  }
44
40
  return gpos-name+1;
106
102
  if (!from_end || (from_end - from) > FN_REFLEN-2)
107
103
    from_end=from+FN_REFLEN -2;
108
104
 
109
 
#if FN_LIBCHAR != '/' || defined(FN_C_BEFORE_DIR_2)
 
105
#if FN_LIBCHAR != '/'
110
106
  {
111
107
    for (; from != from_end && *from ; from++)
112
108
    {
113
109
      if (*from == '/')
114
110
        *to++= FN_LIBCHAR;
115
 
#ifdef FN_C_BEFORE_DIR_2
116
 
      else if (*from == FN_C_BEFORE_DIR_2)
117
 
        *to++= FN_C_BEFORE_DIR;
118
 
      else if (*from == FN_C_AFTER_DIR_2)
119
 
        *to++= FN_C_AFTER_DIR;
120
 
#endif
121
111
      else
122
112
      {
123
113
        *to++= *from;