Haiku: fix building
Some checks are pending
CI / spellcheck (push) Waiting to run
CI / No-features-test (push) Waiting to run
CI / Linux-amd64 (push) Waiting to run
CI / Linux-aarch64 (push) Waiting to run
CI / Linux-armv7l (push) Waiting to run
CI / Linux-armv6l (push) Waiting to run
CI / Linux-riscv64 (push) Waiting to run
CI / Linux-ppc64le (push) Waiting to run
CI / Linux-s390x (push) Waiting to run
CI / Musl-amd64 (push) Waiting to run
CI / macOS-universal (push) Waiting to run
CI / SunOS-amd64 (push) Waiting to run
CI / FreeBSD-amd64 (push) Waiting to run
CI / DragonFly-amd64 (push) Waiting to run
CI / OpenBSD-amd64 (push) Waiting to run
CI / NetBSD-amd64 (push) Waiting to run
CI / Windows-amd64 (push) Waiting to run
CI / Release (push) Blocked by required conditions

This commit is contained in:
李通洲 2025-02-18 15:49:39 +08:00
parent 7aceb1072a
commit b8b2fab499
No known key found for this signature in database
GPG Key ID: 269AD4F5325A22A3
2 changed files with 5 additions and 5 deletions

View File

@ -327,12 +327,12 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
{
// args = "/bin/bash -l"
// argc = 2
int argc = info.argc - 1; // 1
const char* arg0End = strchr(p, ' '); // " -l"
int argc = info.argc - 1;
const char* arg0End = strchr(info.args, ' ');
for (const char* p = arg0End + 1; (p = strchr(p, ' ')); ++p)
--argc;
if (argc == 1)
ffStrbufSetNS(exe, info.args, arg0End - info.args /* /bin/bash */);
if (argc == 1) // No whitespace in the file path
ffStrbufSetNS(exe, (uint32_t) (arg0End - info.args), info.args);
}
}
}

View File

@ -34,7 +34,7 @@ static const char* detectDisk(FFstrbuf* path, const char* diskType, FFlist* resu
device->type = FF_PHYSICALDISK_TYPE_NONE;
device->type |= (geometry.read_only ? FF_PHYSICALDISK_TYPE_READONLY : FF_PHYSICALDISK_TYPE_READWRITE) |
(geometry.removable ? FF_PHYSICALDISK_TYPE_REMOVABLE : FF_PHYSICALDISK_TYPE_FIXED);
device->size = (uint64_t) geometry.cylinder_count *geometry.heads * geometry.sectors_per_track * geometry.bytes_per_sector;
device->size = (uint64_t) geometry.cylinder_count * geometry.head_count * geometry.sectors_per_track * geometry.bytes_per_sector;
return NULL;
}