More string migrations

FossilOrigin-Name: 5659be76dbc70d7549e3a6b4ff2a1f6b01a56f58bd77097fdda53ead13ea435d
This commit is contained in:
Jonathan Schleifer 2025-03-15 00:24:34 +00:00
parent d4b7da3740
commit bc8e7c17cc
3 changed files with 21 additions and 17 deletions

View file

@ -12,29 +12,31 @@ backup(OFString *name, OFString *backupname)
static OFString *cgzname, *bakname, *pcfname, *mcfname;
static void
setnames(OFString *name_)
setnames(OFString *name)
{
@autoreleasepool {
const char *name = name_.UTF8String;
string pakname, mapname;
const char *slash = strpbrk(name, "/\\");
if (slash) {
strn0cpy(pakname, name, slash - name + 1);
strcpy_s(mapname, slash + 1);
OFCharacterSet *cs =
[OFCharacterSet characterSetWithCharactersInString:@"/\\"];
OFRange range = [name rangeOfCharacterFromSet:cs];
OFString *pakname, *mapname;
if (range.location != OFNotFound) {
pakname = [name substringToIndex:range.location];
mapname = [name substringFromIndex:range.location + 1];
} else {
strcpy_s(pakname, "base");
strcpy_s(mapname, name);
pakname = @"base";
mapname = name;
}
cgzname = [[OFString alloc]
initWithFormat:@"packages/%s/%s.cgz", pakname, mapname];
initWithFormat:@"packages/%@/%@.cgz", pakname, mapname];
bakname =
[[OFString alloc] initWithFormat:@"packages/%s/%s_%d.BAK",
[[OFString alloc] initWithFormat:@"packages/%@/%@_%d.BAK",
pakname, mapname, lastmillis];
pcfname = [[OFString alloc]
initWithFormat:@"packages/%s/package.cfg", pakname];
initWithFormat:@"packages/%@/package.cfg", pakname];
mcfname = [[OFString alloc]
initWithFormat:@"packages/%s/%s.cfg", pakname, mapname];
initWithFormat:@"packages/%@/%@.cfg", pakname, mapname];
}
}