diff --git a/Makefile b/Makefile index 4bffe9a..26c210b 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ CXX=gcc CXXFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99 -SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith -Wno-stringop-truncation +SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith SRC_COMMON=src/common/ COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h -ifneq ($(OS),Windows_NT) +ifneq ($(OS),Windows_NT) arch := $(shell uname -m) ifeq ($(arch), x86_64) SRC_DIR=src/x86/ @@ -21,8 +21,8 @@ ifneq ($(OS),Windows_NT) HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h CXXFLAGS += -DARCH_ARM -Wno-unused-parameter endif - - OUTPUT=cpufetch + + OUTPUT=cpufetch else # Assume x86_64 SRC_DIR=src/x86/ @@ -36,7 +36,7 @@ endif all: $(OUTPUT) debug: CXXFLAGS += -g -O0 -debug: $(OUTPUT) +debug: $(OUTPUT) release: CXXFLAGS += -static -O3 release: $(OUTPUT) @@ -49,7 +49,7 @@ run: $(OUTPUT) clean: @rm $(OUTPUT) - + install: $(OUTPUT) install -Dm755 "cpufetch" "/usr/bin/cpufetch" install -Dm644 "LICENSE" "/usr/share/licenses/cpufetch-git/LICENSE" diff --git a/src/arm/socs.h b/src/arm/socs.h index d410723..ef38310 100644 --- a/src/arm/socs.h +++ b/src/arm/socs.h @@ -242,7 +242,7 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) { else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN; else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS; else if(soc >= SOC_MTK_MT6873 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK; - else if(soc >= SOC_SNAPD_MSM7627A && soc <= SOC_SNAPD_SM8250_AB) return SOC_VENDOR_SNAPDRAGON; + else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8350) return SOC_VENDOR_SNAPDRAGON; return SOC_VENDOR_UNKNOWN; } diff --git a/src/common/printer.c b/src/common/printer.c index 945c547..593426d 100644 --- a/src/common/printer.c +++ b/src/common/printer.c @@ -326,7 +326,7 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) { #endif for(int i=0; i < NUMBER_OF_LINES; i++) - strncpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE); + memcpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE); return art; }