comparison src/parse.y @ 5747:b09d4d0f5b63

[project @ 2006-04-07 06:43:10 by jwe]
author jwe
date Fri, 07 Apr 2006 06:43:11 +0000
parents 1c36a2e82266
children 8d7162924bd3
comparison
equal deleted inserted replaced
5746:e4e93452fd3e 5747:b09d4d0f5b63
3641 3641
3642 if (arg == "fullpathext") 3642 if (arg == "fullpathext")
3643 retval = fname; 3643 retval = fname;
3644 else 3644 else
3645 { 3645 {
3646 size_t pos = fname.rfind ('.'); 3646 size_t dpos = fname.rfind (file_ops::dir_sep_char);
3647 3647 size_t epos = fname.rfind ('.');
3648 fname = (pos != NPOS) ? fname.substr (0, pos) : fname; 3648
3649 if (epos <= dpos)
3650 epos = NPOS;
3651
3652 fname = (epos != NPOS) ? fname.substr (0, epos) : fname;
3649 3653
3650 if (arg == "fullpath") 3654 if (arg == "fullpath")
3651 retval = fname; 3655 retval = fname;
3652 else 3656 else
3653 { 3657 retval = (dpos != NPOS) ? fname.substr (dpos+1) : fname;
3654 pos = fname.rfind (file_ops::dir_sep_char);
3655
3656 retval = (pos != NPOS) ? fname.substr (pos+1) : fname;
3657 }
3658 } 3658 }
3659 3659
3660 return retval; 3660 return retval;
3661 } 3661 }
3662 3662