Differences From Artifact [458af69b3f]:
- File
src/OFString_UTF8.m
— part of check-in
[a0b63a8df4]
at
2013-12-01 02:08:43
on branch trunk
— Port to DOS/DJGPP.
The port was much easier than expected. The only changes that were
required were defining the missing lrint() and useconds_t, the rest was
optional (like using backslashes for paths, even though slashes work
fine). (user: js, size: 28773) [annotate] [blame] [check-ins using]
To Artifact [cb1d0ad5b1]:
- File src/OFString_UTF8.m — part of check-in [00dbb47969] at 2013-12-01 11:50:57 on branch trunk — Clean up the path delimiter mess. (user: js, size: 27861) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
1092 1093 1094 1095 1096 1097 1098 | ret = [OFMutableArray array]; if (pathCStringLength == 0) return ret; pool = objc_autoreleasePoolPush(); | < < < < | < < | < < < | 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 | ret = [OFMutableArray array]; if (pathCStringLength == 0) return ret; pool = objc_autoreleasePoolPush(); if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1])) pathCStringLength--; for (i = 0; i < pathCStringLength; i++) { if (OF_IS_PATH_DELIMITER(_s->cString[i])) { [ret addObject: [OFString stringWithUTF8String: _s->cString + last length: i - last]]; last = i + 1; } } |
︙ | ︙ | |||
1131 1132 1133 1134 1135 1136 1137 | { size_t pathCStringLength = _s->cStringLength; ssize_t i; if (pathCStringLength == 0) return @""; | < < < < | < < | < < < | 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 | { size_t pathCStringLength = _s->cStringLength; ssize_t i; if (pathCStringLength == 0) return @""; if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1])) pathCStringLength--; for (i = pathCStringLength - 1; i >= 0; i--) { if (OF_IS_PATH_DELIMITER(_s->cString[i])) { i++; break; } } /* * Only one component, but the trailing delimiter might have been |
︙ | ︙ | |||
1168 1169 1170 1171 1172 1173 1174 | - (OFString*)stringByDeletingLastPathComponent { size_t i, pathCStringLength = _s->cStringLength; if (pathCStringLength == 0) return @""; | < < < < | < < | < < < < | < < < | 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 | - (OFString*)stringByDeletingLastPathComponent { size_t i, pathCStringLength = _s->cStringLength; if (pathCStringLength == 0) return @""; if (OF_IS_PATH_DELIMITER(_s->cString[pathCStringLength - 1])) pathCStringLength--; if (pathCStringLength == 0) return [OFString stringWithUTF8String: _s->cString length: 1]; for (i = pathCStringLength - 1; i >= 1; i--) if (OF_IS_PATH_DELIMITER(_s->cString[i])) return [OFString stringWithUTF8String: _s->cString length: i]; if (OF_IS_PATH_DELIMITER(_s->cString[0])) return [OFString stringWithUTF8String: _s->cString length: 1]; return @"."; } - (const of_unichar_t*)characters |
︙ | ︙ |