Linux: segfaultの修正
このコミットが含まれているのは:
コミット
eaccc846f6
5
main.c
5
main.c
|
@ -103,10 +103,7 @@ int main(int argc, char *argv[]) {
|
|||
if (!winman) minsize--;
|
||||
else free((void *)winman);
|
||||
const char *clang = display_libc();
|
||||
if (clang) {
|
||||
minsize++;
|
||||
free((void *)clang);
|
||||
}
|
||||
if (clang) minsize++;
|
||||
|
||||
const char *reset = RESET;
|
||||
size_t ls = logosize <= (size_t)minsize ? (size_t)minsize : logosize;
|
||||
|
|
|
@ -16,8 +16,9 @@ const char *display_storage() {
|
|||
"internal error: failed to initialize ZFS library",
|
||||
strlen("internal error: failed to initialize ZFS library")
|
||||
) == 0 ||
|
||||
strncmp(iszfs, "sh: zpool: not found", strlen("sh: zpool: not found")
|
||||
) == 0) {
|
||||
strncmp(iszfs, "sh: zpool: not found", strlen("sh: zpool: not found")) == 0 ||
|
||||
strncmp(iszfs, "sh: 1: zpool: not found", strlen("sh: 1: zpool: not found")) == 0
|
||||
) {
|
||||
return run_command_s("df -h | "
|
||||
"awk '/^\\/dev\\// {printf \"%s: %s / %s, \", $1, $3, $2}' | "
|
||||
"awk '{sub(/, $/, \"\"); print}'");
|
||||
|
|
読み込み中…
新しいイシューから参照